Convert packaging to Debhelper 7 / config-package-dev 5 format.

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..4c927f2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+# A normal kerberos-config package would just create and package an
+# /etc/krb5.conf.invirt file (using config-packag-dev's 'transform').
+# However, we want to generate that file dynamically, based on the realm
+# setting in /etc/master/invirt.yaml. So, instead of packaging
+# krb5.conf.invirt, we build a mako template and install it as
+# /etc/krb5.conf.invirt.mako, and our initscript renders it to
+# /etc/krb5.conf.invirt. In order to get the mako template right, we
+# generate it by running a filter on the base krb5.conf to add mako
+# template tags specifying the default realm.
+
+all: krb5.conf.invirt.mako
+
+krb5.conf.invirt.mako: 
+       ./templatize-krb5-conf < /usr/share/kerberos-configs/krb5.conf.template > $@
+
+clean::
+       rm -f krb5.conf.invirt.mako
+
+.PHONY: clean

diff --git a/debian/changelog b/debian/changelog
index e4d7255..a3e0c82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-kerberos-config (1.3) precise; urgency=low
+
+  * Convert packaging to Debhelper 7 / config-package-dev 5 format.
+
+ -- Geoffrey Thomas <geofft@mit.edu>  Fri, 31 May 2013 01:23:36 -0700
+
 invirt-kerberos-config (1.2) precise; urgency=low
 
   * Build for Precise.

diff --git a/debian/control b/debian/control
index 0787d62..2a076bc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: invirt-kerberos-config
 Section: net
 Priority: extra
 Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~), krb5-config
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5.0~), krb5-config
+Standards-Version: 3.9.3
 
 Package: invirt-kerberos-config
 Architecture: all

diff --git a/debian/invirt-kerberos-config.displace b/debian/invirt-kerberos-config.displace
new file mode 100644 (file)
index 0000000..1bceded
--- /dev/null
+++ b/debian/invirt-kerberos-config.displace
@@ -0,0 +1 @@
+/etc/krb5.conf.invirt

diff --git a/debian/invirt-kerberos-config.install b/debian/invirt-kerberos-config.install
index a020db9..d3fdf12 100644 (file)
--- a/debian/invirt-kerberos-config.install
+++ b/debian/invirt-kerberos-config.install
@@ -1 +1 @@
-debian/krb5.conf.invirt.mako etc
+krb5.conf.invirt.mako etc

diff --git a/debian/rules b/debian/rules
index 19b65f1..fb88cc4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_DIVERT_EXTENSION = .invirt
-DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.invirt = \
-        /usr/share/kerberos-configs/krb5.conf.template
-DEB_DIVERT_FILES_invirt-kerberos-config += \
-        /etc/krb5.conf.invirt
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
-
-common-build-indep:: debian/krb5.conf.invirt.mako
-
-# A normal kerberos-config package would just create an
-# /etc/krb5.conf.invirt file (probably using the DEB_TRANSFORM_FILES
-# syntactic sugar, instead of calling the transform script directly).
-# However, we want to generate that file dynamically, based on the realm
-# setting in /etc/master/invirt.yaml. So, instead of packaging
-# krb5.conf.invirt, we build a mako template in
-# /etc/krb5.conf.invirt.mako, and our initscript renders it to
-# /etc/krb5.conf.invirt. In order to get the mako template right, we
-# generate it by transforming the base krb5.conf to add a mako template
-# tags specifying the default realm.
-debian/krb5.conf.invirt.mako: $(call debian_check_files,/etc/krb5.conf.invirt)
-       debian/transform_krb5.conf.invirt.mako < $< > $@
-
-clean::
-       rm -f debian/krb5.conf.invirt.mako
+%:
+       dh $@ --with=config-package

diff --git a/debian/transform_krb5.conf.invirt.mako b/templatize-krb5-conf
similarity index 100%
rename from debian/transform_krb5.conf.invirt.mako
rename to templatize-krb5-conf