Permalink
Browse files

Update debian packaging to use pybuild and prep for 3.1 release.

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
  • Loading branch information...
1 parent fac1f1f commit 55b48fa4c5e625c74b1ffd80213b3cd72809365a @battlemidget battlemidget committed Jan 16, 2014
Showing with 23 additions and 17 deletions.
  1. +14 −0 debian/changelog
  2. +2 −2 debian/control
  3. +5 −13 debian/rules
  4. +1 −1 sos.spec
  5. +1 −1 sos/__init__.py
View
@@ -1,3 +1,17 @@
+sosreport (3.1-1) unstable; urgency=low
+
+ * New upstream release v3.1
+ Features include:
+ - Full Python 3 support
+ - Further modularized openstack plugins
+ * debian/rules:
+ - Use pybuild
+ * debian/control:
+ - Use X-Python-Version: >= 3.3
+ - This drops support for Python 2 as we move forward.
+
+ -- Adam Stokes <adam.stokes@ubuntu.com> Wed, 15 Jan 2014 16:58:54 -0500
+
sosreport (3.0-1) unstable; urgency=low
* New upstream release v3.0
View
@@ -3,9 +3,9 @@ Maintainer: Adam Stokes <adam.stokes@ubuntu.com>
Section: admin
Priority: optional
Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), python3 (>=3.3), gettext, python3-nose, python3-six
+Build-Depends: debhelper (>= 9), dh-python, python3-all, gettext, python3-nose, python3-six
Homepage: https://github.com/sosreport/sosreport
-XS-Python3-Version: 3.3
+X-Python3-Version: >= 3.3
Package: sosreport
Architecture: any
View
@@ -1,21 +1,13 @@
#!/usr/bin/make -f
DH_ALWAYS_EXCLUDE=.git
-
-%:
- dh $@ --with python3
-
-override_dh_auto_install:
- python setup.py \
- install \
- --install-lib=usr/share/sosreport/ \
+export PYBUILD_NAME=sosreport
+export PYBUILD_DISABLE_python2=1
+export PYBUILD_INSTALL_ARGS_python3=--install-lib=usr/share/sosreport/ \
--install-data=usr/ \
--install-scripts=usr/share/sosreport/ \
--root=$(CURDIR)/debian/sosreport/ \
--no-compile -O0
-override_dh_clean:
- rm -rf build/
- rm -rf dist/
- find . -name '*.pyc' -delete
-
+%:
+ dh $@ --with python3 --buildsystem=pybuild
View
@@ -2,7 +2,7 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
-Version: 3.0
+Version: 3.1
Release: 1%{?dist}
Group: Applications/System
Source0: http://people.redhat.com/breeves/sos/releases/sos-%{version}.tar.gz
View
@@ -20,7 +20,7 @@
gettext to internationalize messages.
"""
-__version__ = "3.0"
+__version__ = "3.1"
import gettext
gettext_dir = "/usr/share/locale"

0 comments on commit 55b48fa

Please sign in to comment.