Upgrade to config-package-dev 5.x

diff --git a/debian/changelog b/debian/changelog
index 0ba78cb..0b326a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
+hcoop-nsswitch-config (2) unstable; urgency=medium
+
+  * Upgrade to config-package-dev 5.x
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 01 May 2014 19:03:13 -0400
+
 hcoop-nsswitch-config (1) stable; urgency=low
 
-  * Clean up packaging a bit * It turns out CDBS control.in is considered broken, let's not use it * Empty copyright file * Include homepage and Git / Gitweb in control (why not?)
+  * Clean up packaging a bit 
+  * It turns out CDBS control.in is considered broken, let's not use it
+  * Empty copyright file 
+  * Include homepage and Git / Gitweb in control (why not?)
 
  -- Clinton Ebadi <clinton@unknownlamer.org>  Sun, 25 Mar 2012 22:34:51 -0400
 

diff --git a/debian/control b/debian/control
index b5cfeb6..b5f1c65 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,7 @@ Source: hcoop-nsswitch-config
 Section: hcoop-config/base
 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)
 Standards-Version: 3.9.2
 Homepage: http://hcoop.net/
 Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-nsswitch-config.git
@@ -13,7 +10,7 @@ Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-nsswitch-config.git;a=su
 
 Package: hcoop-nsswitch-config
 Architecture: all
-Depends: cdbs, libnss-afs, ${misc:Depends}
+Depends: libnss-afs, ${misc:Depends}
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: HCoop nsswitch config

diff --git a/debian/hcoop-nsswitch-config.transform b/debian/hcoop-nsswitch-config.transform
new file mode 100644 (file)
index 0000000..2847ebb
--- /dev/null
+++ b/debian/hcoop-nsswitch-config.transform
@@ -0,0 +1 @@
+/etc/nsswitch.conf.hcoop </usr/share/base-files/nsswitch.conf perl -0p -e 's/^passwd: (.*)$/passwd: afs $1/m or die; s/^group: (.*)$/group: afs $1/m or die;'

diff --git a/debian/rules b/debian/rules
index 98ae059..ecae1ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_DIVERT_EXTENSION =.hcoop
-DEB_TRANSFORM_FILES_hcoop-nsswitch-config += \
-       /etc/nsswitch.conf.hcoop
-
-# nsswitch.conf doesn't have an md5sum or something
-ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
-    DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.hcoop = \
-       /usr/share/base-files/nsswitch.conf
-endif
-
-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/transform_nsswitch.conf.hcoop b/debian/transform_nsswitch.conf.hcoop
deleted file mode 100755 (executable)
index 8684c42..0000000
--- a/debian/transform_nsswitch.conf.hcoop
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl -0p
-
-# consult afs before all other sources
-s/^passwd: (.*)$/passwd: afs $1/m or die;
-s/^group: (.*)$/group: afs $1/m or die;
-