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

diff --git a/debian/changelog b/debian/changelog
index f12f842..50b279d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hcoop-apache2-config (9) unstable; urgency=medium
+
+  * Upgrade to config-package-dev 5.x
+  * Fix build-depends
+
+ -- Clinton Ebadi <clinton@unknownlamer.org>  Thu, 01 May 2014 18:33:36 -0400
+
 hcoop-apache2-config (8) stable; urgency=low
 
   * Fix log rotation for member vhosts. Missed this from mire (apache2

diff --git a/debian/control b/debian/control
index e39c30f..ef0a60f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: hcoop-apache2-config
 Section: hcoop-config/httpd
 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), libapache2-mod-waklog, apache2-mpm-prefork, apache2.2-common,
+ apache2-suexec-custom, libapache2-mod-suphp, libapache2-mod-auth-kerb
 Standards-Version: 3.9.3
 Homepage: http://hcoop.net
-#Vcs-Git: git://git.debian.org/collab-maint/hcoop-apache2-config.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/hcoop-apache2-config.git;a=summary
+Vcs-Git: git://git.hcoop.net/git/hcoop/debian/hcoop-apache2-config.git
+Vcs-Browser: http://git.hcoop.net/?p=hcoop/debian/hcoop-apache2-config.git;a=summary
 
 Package: hcoop-apache2-config
 Architecture: all

diff --git a/debian/hcoop-apache2-config.displace b/debian/hcoop-apache2-config.displace
new file mode 100644 (file)
index 0000000..2196412
--- /dev/null
+++ b/debian/hcoop-apache2-config.displace
@@ -0,0 +1,4 @@
+/etc/apache2/suexec/www-data.hcoop
+/etc/suphp/suphp.conf.hcoop
+/etc/apache2/mods-available/suphp.conf.hcoop
+/etc/apache2/mods-available/status.conf.hcoop

diff --git a/debian/rules b/debian/rules
index eaed235..b8f94e9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_DIVERT_EXTENSION =.hcoop
-DEB_DIVERT_FILES_hcoop-apache2-config += \
-       /etc/apache2/suexec/www-data.hcoop \
-       /etc/suphp/suphp.conf.hcoop \
-       /etc/apache2/mods-available/suphp.conf.hcoop \
-       /etc/apache2/mods-available/status.conf.hcoop
+%:
+       dh $@ --with=config-package
 
-DEB_DH_INSTALL_CRON_ARGS_DEFAULT = --name=hcoop-apache-sync-logs
+override_dh_installcron:
+       dh_installcron --name=hcoop-apache-sync-logs
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk