Upgrade to config-package-dev 5.x and fix build-depends

diff --git a/debian/changelog b/debian/changelog
index ac42d83..be2fbce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hcoop-krb5-config (3) unstable; urgency=medium
+
+  * Upgrade to config-package-dev 5.x
+  * Fix build-depends
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 01 May 2014 18:57:56 -0400
+
 hcoop-krb5-config (2) stable; urgency=low
 
   * Upload to stable

diff --git a/debian/control b/debian/control
index 07b44f5..12041da 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,14 @@ Source: hcoop-krb5-config
 Section: hcoop-config/net
 Priority: extra
 Maintainer: Clinton Ebadi <clinton@unknownlamer.org>
-Build-Depends: debhelper (>= 8.0.0),
- cdbs (>= 0.4.85~),
- config-package-dev (>= 4.5~)
+Build-Depends: debhelper (>= 8.0.0), config-package-dev (>= 5.0), krb5-config
 Standards-Version: 3.9.2
-Homepage: <insert the upstream URL, if relevant>
-#Vcs-Git: git://git.debian.org/collab-maint/hcoop-krb5-config.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/hcoop-krb5-config.git;a=summary
+Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-krb5-config.git
+Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-krb5-config.git;a=summary
 
 Package: hcoop-krb5-config
 Architecture: all
-Depends: cdbs, krb5-config, ${misc:Depends}
+Depends: krb5-config, ${misc:Depends}
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: HCoop Kerberos configuration for services machines

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

diff --git a/debian/rules b/debian/rules
index 538efad..7ebeae9 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-krb5-config += \
-       /etc/krb5.conf.hcoop
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
\ No newline at end of file
+dh %:
+       dh $@ --with=config-package