Update packaging to dh7

diff --git a/debian/changelog b/debian/changelog
index d5fad7a..2a10d00 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-devconfig (0.78~glasgall10achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 01 Jun 2013 14:22:49 -0400
+
 xvm-devconfig (0.78~glasgall10) precise; urgency=low
 
   * oops, leading whitespace

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

diff --git a/debian/control b/debian/control
index b091fb6..1495c86 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xvm-devconfig
 Section: servers
 Priority: important
 Maintainer: SIPB XVM Project <xvm@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.3
 
 Package: xvm-devconfig
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 74f3404..b3399e5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
+%:
+       dh $@
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-binary-install/xvm-devconfig::
-       # Versions of CDBS newer than ours do this for us
-       dh_lintian -pxvm-devconfig
-       install -m 0644 -D k5login $(DEB_DESTDIR)/root/.k5login
+override_dh_install:
+       dh_install
+       mv debian/xvm-devconfig/root/k5login debian/xvm-devconfig/root/.k5login

diff --git a/debian/xvm-devconfig.install b/debian/xvm-devconfig.install
index b667c49..b2cf6ef 100644 (file)
--- a/debian/xvm-devconfig.install
+++ b/debian/xvm-devconfig.install
@@ -2,3 +2,4 @@ master.yaml etc/invirt
 zone etc/invirt
 sysvms etc/xen
 invirt.list etc/apt/sources.list.d
+k5login /root