Update packaging to dh7

diff --git a/debian/changelog b/debian/changelog
index 9b70359..3bcec0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-web (0.1.32~glasgall1achernya1) precise; urgency=low
+
+  * Switch to dh7
+  * Bump standards version
+
+ -- Alexander Chernyakhovsky <achernya@mit.edu>  Fri, 31 May 2013 22:17:45 -0400
+
 invirt-web (0.1.32~glasgall1) precise; urgency=low
 
   * Merge in changes from prod and bump version

diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7

diff --git a/debian/control b/debian/control
index 61ae81d..be460f3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: invirt-web
 Section: base
 Priority: extra
 Maintainer: Invirt project <invirt@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), config-package-dev, git-core, invirt-base
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7), config-package-dev (>= 5.0~), git-core, invirt-base
+Standards-Version: 3.9.3
 
 Package: invirt-web
 Architecture: all

diff --git a/debian/invirt-web.dirs b/debian/invirt-web.dirs
new file mode 100644 (file)
index 0000000..2a3a28e
--- /dev/null
+++ b/debian/invirt-web.dirs
@@ -0,0 +1 @@
+/var/www/invirt-web/

diff --git a/debian/invirt-web.displace b/debian/invirt-web.displace
new file mode 100644 (file)
index 0000000..dc6154c
--- /dev/null
+++ b/debian/invirt-web.displace
@@ -0,0 +1,3 @@
+/etc/apache2/conf.d/gitweb.invirt
+/etc/init.d/apache2.invirt
+/etc/gitweb.conf.invirt

diff --git a/debian/invirt-web.install b/debian/invirt-web.install
index a06ff56..0f3c827 100644 (file)
--- a/debian/invirt-web.install
+++ b/debian/invirt-web.install
@@ -1,2 +1,3 @@
 files/* .
 invirt-cache-acls /usr/bin/
+code/* /var/www/invirt-web/
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 473ad29..8a293e3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,6 @@
 #!/usr/bin/make -f
+%:
+       dh $@
 
-DEB_DIVERT_EXTENSION = .invirt
-DEB_DIVERT_FILES_invirt-web += \
-    /etc/apache2/conf.d/gitweb \
-    /etc/init.d/apache2 \
-    /etc/gitweb.conf \
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
-
-DEB_UPDATE_RCD_PARAMS_invirt-web += defaults 91 9
-
-binary-fixup/invirt-web::
-       mkdir -p $(DEB_DESTDIR)/var/www/
-       mv code/ $(DEB_DESTDIR)/var/www/invirt-web/
-
-clean/invirt-web::
-       mv $(DEB_DESTDIR)/var/www/invirt-web/ code/
+override_dh_installinit:
+       dh_installinit -- defaults 91 9