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

diff --git a/debian/changelog b/debian/changelog
index f6595cc..dc4c68f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hcoop-admin-common-config (5) unstable; urgency=medium
+
+  * Upgrade to config-package-dev 5.x
+  * Fix build-depends
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 01 May 2014 15:52:14 -0400
+
 hcoop-admin-common-config (4) unstable; urgency=medium
 
   * Grant aizak_admin and sastry_admin access to admin machines

diff --git a/debian/control b/debian/control
index 26ec4e5..a8308c6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,7 @@ Source: hcoop-admin-common-config
 Section: hcoop-config/admin
 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), openssh-server
 Standards-Version: 3.9.2
 Homepage: http://hcoop.net/
 Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-admin-common-config.git
@@ -13,7 +10,7 @@ Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-admin-common-config.git;
 
 Package: hcoop-admin-common-config
 Architecture: all
-Depends: hcoop-common-config (>= 1), cdbs, sudo, openssh-server, ${misc:Depends}
+Depends: hcoop-common-config (>= 1), sudo, openssh-server, ${misc:Depends}
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: HCoop admin access configuration

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

diff --git a/debian/hcoop-admin-common-config.transform b/debian/hcoop-admin-common-config.transform
new file mode 100644 (file)
index 0000000..ba9a584
--- /dev/null
+++ b/debian/hcoop-admin-common-config.transform
@@ -0,0 +1,2 @@
+/etc/pam.d/login.hcoop debian/prepend-listfile-rules.pl
+/etc/pam.d/sshd.hcoop debian/prepend-listfile-rules.pl
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 01d0618..ecae1ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,17 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_DIVERT_EXTENSION =.hcoop
-DEB_DIVERT_FILES_hcoop-admin-common-config += \
-       /etc/login.restrict.hcoop
-
-DEB_TRANSFORM_FILES_hcoop-admin-common-config += \
-       /etc/pam.d/login.hcoop \
-       /etc/pam.d/sshd.hcoop
-
-#DEB_REMOVE_FILES_hcoop-admin-common-config += \
-#      /etc/sudoers.d/admins \
-#      /etc/sudoers.d/domtool
-
-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_login.hcoop b/debian/transform_login.hcoop
deleted file mode 120000 (symlink)
index cc35f32..0000000
--- a/debian/transform_login.hcoop
+++ /dev/null
@@ -1 +0,0 @@
-prepend-listfile-rules.pl
\ No newline at end of file

diff --git a/debian/transform_sshd.hcoop b/debian/transform_sshd.hcoop
deleted file mode 120000 (symlink)
index cc35f32..0000000
--- a/debian/transform_sshd.hcoop
+++ /dev/null
@@ -1 +0,0 @@
-prepend-listfile-rules.pl
\ No newline at end of file