aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stokes <adam.stokes@ubuntu.com>2013-07-31 06:59:41 -0700
committerAdam Stokes <adam.stokes@ubuntu.com>2013-07-31 06:59:41 -0700
commit57e120b3ab5be7af7165de8ca94f467c0de155fc (patch)
treec70b5299307cdfedac9b7ea69d6613d6d5c22fa3
parent1b3fc3f029ed3ab1dcbfeaaaa8fe1616dbc3744f (diff)
parent30ed1beb6a4217072117a3735844e3ec4f1bac92 (diff)
downloadsos-57e120b3ab5be7af7165de8ca94f467c0de155fc.tar.gz
Merge pull request #178 from battlemidget/patch-debian-updates
Update debian changelog and watch file
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/watch2
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ca70525b..109b5e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,17 @@ sosreport (3.0-1) unstable; urgency=low
- Cross distribution support for Debian, Ubuntu, Fedora, and
Red Hat Enterprise Linux
- Increase execution speed of plugins
+ * Fixes traceback error in the utilities log (Closes: #717401)
+ * debian/copyright:
+ - Add Company contributions notices in AUTHORS file.
+ * setup.py:
+ - Added to support packaging python modules via distutils.
+ * debian/rules:
+ - Fix build instructions to package sosreport as a private module.
+ * debian/control:
+ - Use XS-Python-Version and remove debian/pyversions.
+ * tests/archive_tests.py:
+ - Update unittests to work with latest api changes in the new release.
-- Adam Stokes <adam.stokes@ubuntu.com> Sun, 21 Jul 2013 20:35:04 -0400
diff --git a/debian/control b/debian/control
index b00bbad5..7311b646 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sosreport
Maintainer: Adam Stokes <adam.stokes@ubuntu.com>
Section: admin
Priority: optional
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Build-Depends: debhelper (>= 9), python (>=2.7), gettext, python-nose
Homepage: https://github.com/sosreport/sosreport
XS-Python-Version: 2.7
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..519e0814
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/sosreport/sosreport/releases/tag/r3.0 /sosreport/sosreport/archive/r(.+).tar.gz