Update packaging to dh7

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..a82703f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,9 @@
+all: xend-config.sxp.invirt.mako
+
+xend-config.sxp.invirt.mako:
+       ./templatize-xend-config < /etc/xen/xend-config.sxp > $@
+
+clean:
+       rm -f xend-config.sxp.invirt.mako
+
+.PHONY: clean

diff --git a/debian/changelog b/debian/changelog
index 05bf318..ea3b8bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-xen-config (0.0.38~glasgall14achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 21:16:20 -0400
+
 invirt-xen-config (0.0.38~glasgall14) precise; urgency=low
 
   * /usr/lib/xen moved to /usr/lib/xen-4.1. teach invirt-database this.

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 a9af10e..3bb1dd0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: invirt-xen-config
 Section: base
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, xen-utils-4.1
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), xen-utils-4.1
+Standards-Version: 3.9.3
 
 Package: invirt-xen-config
 Architecture: all

diff --git a/debian/invirt-xen-config.displace b/debian/invirt-xen-config.displace
new file mode 100644 (file)
index 0000000..fa7ab7f
--- /dev/null
+++ b/debian/invirt-xen-config.displace
@@ -0,0 +1,2 @@
+/etc/xen/qemu-ifup.invirt
+/etc/xen/xend-config.sxp.invirt

diff --git a/debian/invirt-xen-config.install b/debian/invirt-xen-config.install
index c1d0e25..05ad6a7 100644 (file)
--- a/debian/invirt-xen-config.install
+++ b/debian/invirt-xen-config.install
@@ -2,5 +2,4 @@ qemu-dm-invirt usr/sbin
 qemu-ifup.invirt etc/xen
 invirt-database etc/xen
 vif-invirtroute etc/xen/scripts
-
-debian/xend-config.sxp.invirt.mako etc/xen
+xend-config.sxp.invirt.mako etc/xen

diff --git a/debian/invirt-xen-config.undisplace b/debian/invirt-xen-config.undisplace
new file mode 100644 (file)
index 0000000..de75fc2
--- /dev/null
+++ b/debian/invirt-xen-config.undisplace
@@ -0,0 +1 @@
+/etc/apt/preferences.invirt

diff --git a/debian/rules b/debian/rules
index cb20bf8..cbe925d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_DIVERT_EXTENSION = .invirt
-
-DEB_DIVERT_FILES_invirt-xen-config += \
-       /etc/xen/qemu-ifup.invirt \
-       /etc/xen/xend-config.sxp.invirt
-
-DEB_UNDIVERT_FILES_invirt-xen-config += \
-       /etc/apt/preferences.invirt
-
-DEB_UNDIVERT_VERSION_/etc/apt/preferences.invirt = 0.0.27~
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
-
-common-build-indep:: debian/xend-config.sxp.invirt.mako
-
-debian/xend-config.sxp.invirt.mako: $(call debian_check_files,/etc/xen/xend-config.sxp)
-       debian/transform_xend-config.sxp.invirt.mako < $< > $@
-
-clean::
-       rm -f debian/xend-config.sxp.invirt.mako
+%:
+       dh $@

diff --git a/debian/transform_xend-config.sxp.invirt.mako b/templatize-xend-config
similarity index 100%
rename from debian/transform_xend-config.sxp.invirt.mako
rename to templatize-xend-config