From: Alexander Chernyakhovsky <achernya@mit.edu>
Date: Sat, 1 Jun 2013 18:38:27 +0000 (-0400)
Subject: Update packaging to dh7
X-Git-Tag: 0.0.13~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-mail-config.git/commitdiff_plain/1cef4ba307cc58d6f04df4064f8c542f7a03aae5?ds=inline

Update packaging to dh7
---

diff --git a/debian/changelog b/debian/changelog
index 245cc6f..ebd8554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-mail-config (0.0.12~glasgall1achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Sat, 01 Jun 2013 14:37:28 -0400
+
 xvm-mail-config (0.0.12~glasgall1) precise; urgency=low
 
   * Bump version for precise
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 560c1e4..4fece86 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xvm-mail-config
 Section: servers
 Priority: extra
 Maintainer: SIPB XVM Project <xvm@mit.edu>
-Build-Depends: cdbs, debhelper (>= 5), config-package-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~)
+Standards-Version: 3.9.3
 
 Package: xvm-mail-config
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 376b783..3c8e24d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_DIVERT_EXTENSION = .xvm
-
-DEB_DIVERT_FILES_xvm-mail-config += \
-	/etc/postfix/main.cf.xvm \
-	/etc/aliases.xvm
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+%:
+	dh $@ --with config-package
diff --git a/debian/xvm-mail-config.displace b/debian/xvm-mail-config.displace
new file mode 100644
index 0000000..9068547
--- /dev/null
+++ b/debian/xvm-mail-config.displace
@@ -0,0 +1,2 @@
+/etc/postfix/main.cf.xvm
+/etc/aliases.xvm