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

diff --git a/debian/changelog b/debian/changelog
index e38b960..d545e32 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hcoop-openssh-server-config (5) unstable; urgency=medium
+
+  * Upgrade to config-package-dev 5.x
+  * Fix build-depends
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 01 May 2014 16:03:25 -0400
+

 hcoop-openssh-server-config (4) stable; urgency=low
 
   * Disable root login
 hcoop-openssh-server-config (4) stable; urgency=low
 
   * Disable root login

diff --git a/debian/control b/debian/control
index 8286084..9cabb15 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,10 @@ Source: hcoop-openssh-server-config
 Section: hcoop-config/net
 Priority: extra
 Maintainer: Clinton Ebadi <clinton@unknownlamer.org>
 Section: hcoop-config/net
 Priority: extra
 Maintainer: Clinton Ebadi <clinton@unknownlamer.org>

-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), config-package-dev (>= 5.0), openssh-server

 Standards-Version: 3.9.2
 Standards-Version: 3.9.2

-Homepage: <insert the upstream URL, if relevant>
-#Vcs-Git: git://git.debian.org/collab-maint/hcoop-openssh-server-config.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/hcoop-openssh-server-config.git;a=summary
+Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-openssh-server-config.git
+Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-openssh-server-config.git;a=summary

 
 Package: hcoop-openssh-server-config
 Architecture: all
 
 Package: hcoop-openssh-server-config
 Architecture: all

diff --git a/debian/hcoop-openssh-server-config.displace b/debian/hcoop-openssh-server-config.displace
new file mode 100644 (file)
index 0000000..53ea870
--- /dev/null
+++ b/debian/hcoop-openssh-server-config.displace
@@ -0,0 +1 @@
+/etc/ssh/sshd_config.hcoop
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index d2ef3f5..ecae1ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

-DEB_DIVERT_EXTENSION = .hcoop
-
-# unfortunately, sshd_config is generated by postinst and there is no
-# canonical version we can use for DEB_TRANSFORM_FILES. I guess it's
-# not such a pita to merge three lines every stable release...
-DEB_DIVERT_FILES_hcoop-openssh-server-config += \
-       /etc/ssh/sshd_config
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
\ No newline at end of file
+%:
+       dh $@ --with=config-package