debian: Add a gbp.conf to start using git-buildpackage

On Bdale Garbee's recommendation I'm switching from gitpkg, (which
constructed a source tree but still required me to go run debuild), to
git-buildpackage. I hadn't originally used git-buildpackage because it
didn't seem to work without a configuration file, (where gitpkg was
fine).

Bdale was kind enough to point me to his fw/altos source at
git.gag.com where I found an example gpb.conf file as well as a target
in debian/rules to automatically update debian/changelog with the new
version number.

diff --git a/.gitignore b/.gitignore
index 217440d50fd2487094d3d769b1f067052c523e0c..e00355ca2d0673801dc1d30f86b4a568104c7863 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ libnotmuch.so*
 .*.swp
 *.elc
 releases
+debian-build

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..4c8ce7f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,16 @@
+# Configuration file for git-buildpackage
+
+[DEFAULT]
+cleaner = debian/rules prebuild && debuild clean
+
+# The default branch for upstream sources
+upstream-branch = master
+
+# The default branch for the debian patch (no patch in our case)
+debian-branch = master
+
+# Directory for performing the build
+export-dir = ./debian-build
+
+# Format for the debian tag
+debian-tag = debian-%(version)s

diff --git a/debian/rules b/debian/rules
index 3b44e0f12ae182261ca92d06ee0868a2a5684804..4dae6583e4d4e4cf56fd9d46a97357330f457242 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
+
+# This target invoked by git-buildpackage using a clean hook, see gbp.conf
+prebuild:
+       git-dch --release --new-version=$(VERSION)
+       git commit -n debian/changelog \
+               -m "Automatically update debian/changelog for $(VERSION)"
+
 %:
        dh $@