Upgrade to config-package-dev 5.0

diff --git a/debian/control b/debian/control
index f86ab81..41695ff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,7 @@ Source: hcoop-firewall-config
 Section: hcoop-config/net
 Priority: extra
 Maintainer: Clinton Ebadi <clinton@unknownlamer.org>
-Build-Depends: cdbs (>= 0.4.85~),
- debhelper (>= 8~),
- dh-buildinfo,
- config-package-dev (>= 4.5~)
+Build-Depends: debhelper (>= 8~), config-package-dev (>= 5.0), ferm
 Standards-Version: 3.9.2
 Homepage: http://hcoop.net/
 Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-firewall-config.git
@@ -13,7 +10,7 @@ Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-firewall-config.git;a=su
 
 Package: hcoop-firewall-config
 Architecture: all
-Depends: cdbs, sudo, ferm, ${misc:Depends}
+Depends: ferm, ${misc:Depends}
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: HCoop admin access configuration

diff --git a/debian/hcoop-firewall-config.displace b/debian/hcoop-firewall-config.displace
new file mode 100644 (file)
index 0000000..2035608
--- /dev/null
+++ b/debian/hcoop-firewall-config.displace
@@ -0,0 +1 @@
+/etc/ferm/ferm.conf.hcoop
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 5219b17..ecae1ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_DIVERT_EXTENSION =.hcoop
-DEB_DIVERT_FILES_hcoop-firewall-config += \
-       /etc/ferm/ferm.conf.hcoop
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+%:
+       dh $@ --with=config-package