Upgrade to config-package-dev 5.x

diff --git a/debian/control b/debian/control
index 3cd15c7..b0ebb38 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hcoop-common-config
 Section: hcoop-config/admin
 Priority: extra
 Maintainer: Clinton Ebadi <clinton@unknownlamer.org>
-Build-Depends: debhelper (>= 8.0.0), cdbs, config-package-dev
+Build-Depends: debhelper (>= 8.0.0), config-package-dev (>= 5.0)
 Standards-Version: 3.9.3
 Homepage: http://hcoop.net
 #Vcs-Git: git://git.debian.org/collab-maint/hcoop-common-config.git
@@ -13,6 +13,8 @@ Architecture: all
 Depends: openafs-client, nscd, hcoop-openssh-server-config, sudo,
  hcoop-nsswitch-config, hcoop-krb5-config, hcoop-firewall-config,
  ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Breaks: hcoop-admin-common-config (<< 3)
 Replaces: hcoop-admin-common-config (<< 3)
 Description: Common HCoop node config

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