Update packaging to dh7

diff --git a/debian/changelog b/debian/changelog
index b967021..2aa5a27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-vnc-server (0.0.14~glasgall2achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 20:52:42 -0400
+
 invirt-vnc-server (0.0.14~glasgall2) precise; urgency=low
 
   * Replace dependency on python-xen-3.3 with xen-utils-4.1, as the latter

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 2ad384d..d676026 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: invirt-vnc-server
 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 (>=2.6.6.3~), python-setuptools, python-debian,
+Build-Depends: debhelper (>= 7),
+ python-all-dev (>=2.6.6-3~), python-setuptools, python-debian,
  python-apt
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
 
 Package: invirt-vnc-server
 Architecture: all

diff --git a/debian/invirt-vnc-server.dirs b/debian/invirt-vnc-server.dirs
new file mode 100644 (file)
index 0000000..236670a
--- /dev/null
+++ b/debian/invirt-vnc-server.dirs
@@ -0,0 +1 @@
+usr/sbin

diff --git a/debian/rules b/debian/rules
index adac93c..6dd0626 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
+%:
+       dh $@ --with python2
 
-DEB_PYTHON2_MODULE_PACKAGES=invirt-vnc-server
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-binary-fixup/invirt-vnc-server::
-       mkdir -p $(DEB_DESTDIR)usr/sbin
-       mv $(DEB_DESTDIR)usr/bin/invirt-vnc-server $(DEB_DESTDIR)usr/sbin/invirt-vnc-server
-
-clean::
-       rm -rf invirt.vnc.egg-info
+override_dh_install:
+       dh_install
+       mv debian/invirt-vnc-server/usr/bin/invirt-vnc-server debian/invirt-vnc-server/usr/sbin/invirt-vnc-server