Update packaging to dh7

diff --git a/debian/changelog b/debian/changelog
index ee99e47..de184b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-cluster-config (0.0.14~glasgall1achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 01:34:06 -0400
+
 invirt-cluster-config (0.0.14~glasgall1) precise; urgency=low
 
   * Bump version for precise

diff --git a/debian/control b/debian/control
index 6abeb92..dfbc496 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: invirt-cluster-config
 Section: servers
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs, debhelper (>= 5), config-package-dev, lvm2
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), lvm2
+Standards-Version: 3.9.3
 
 Package: invirt-cluster-config
 Architecture: all

diff --git a/debian/invirt-cluster-config.displace b/debian/invirt-cluster-config.displace
new file mode 100644 (file)
index 0000000..1db0669
--- /dev/null
+++ b/debian/invirt-cluster-config.displace
@@ -0,0 +1,2 @@
+/etc/corosync/corosync.conf
+/etc/default/corosync
\ No newline at end of file

diff --git a/debian/invirt-cluster-config.transform b/debian/invirt-cluster-config.transform
new file mode 100644 (file)
index 0000000..27b3cc9
--- /dev/null
+++ b/debian/invirt-cluster-config.transform
@@ -0,0 +1 @@
+/etc/lvm/lvm.conf.invirt debian/transform_lvm.conf.invirt

diff --git a/debian/rules b/debian/rules
index c111e4a..563aa61 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,4 @@
 #!/usr/bin/make -f
+%:
+       dh $@ --with config-package
 
-DEB_DIVERT_EXTENSION = .invirt
-DEB_TRANSFORM_FILES_invirt-cluster-config += \
-       /etc/lvm/lvm.conf.invirt
-DEB_DIVERT_FILES_invirt-cluster-config += \
-       /etc/corosync/corosync.conf.invirt \
-       /etc/default/corosync
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk