Port packaging to dh_python2

diff --git a/debian/changelog b/debian/changelog
index 45acfb1..6a1ce8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-base (0.0.36~glasgall1) precise; urgency=low
+
+  * Port packaging to dh_python2
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 20 Mar 2013 22:29:45 -0700
+

 invirt-base (0.0.35) unstable; urgency=low
 
   * Patch from Austin Chu <eefi@mit.edu> to handle remctl results that are
 invirt-base (0.0.35) unstable; urgency=low
 
   * Patch from Austin Chu <eefi@mit.edu> to handle remctl results that are

diff --git a/debian/control b/debian/control
index cff265d..1ae6067 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: invirt-base
 Section: base
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
 Section: base
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>

-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), python-all-dev, python-support, python-setuptools, python-debian, python-apt
+Build-Depends: cdbs (>= 0.4.90), debhelper (>= 4.1.0), python-all-dev (>=2.6.6-3), python-setuptools, python-debian, python-apt

 Standards-Version: 3.8.0
 
 Package: invirt-base
 Standards-Version: 3.8.0
 
 Package: invirt-base

@@ -11,7 +11,6 @@ Depends: ${python:Depends}, ${misc:Depends},
  python-json (>= 3.4-2), python-yaml (>= 3.05), python-mako (>=
  0.2.2), python-pkg-resources, remctl-client, invirt-config
 Provides: ${python:Provides}
  python-json (>= 3.4-2), python-yaml (>= 3.05), python-mako (>=
  0.2.2), python-pkg-resources, remctl-client, invirt-config
 Provides: ${python:Provides}

-XB-Python-Version: ${python:Versions}

 Description: Base configuration required for all Invirt servers
  This package includes common files for the Invirt system.
   * apt configuration
 Description: Base configuration required for all Invirt servers
  This package includes common files for the Invirt system.
   * apt configuration

diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644 (file)
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2

diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644 (file)
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-

diff --git a/debian/rules b/debian/rules
index 96d7158..bedb3e3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

-DEB_PYTHON_SYSTEM=pysupport
+DEB_PYTHON2_MODULE_PACKAGES=invirt-base

 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk