Update debian packaging

21 files changed, 28 insertions, 33 deletions

diff --git a/openbsc/debian/changelog b/debian/changelog
index ec5cf1fd1..ec5cf1fd1 100644
--- a/openbsc/debian/changelog
+++ b/debian/changelog
diff --git a/openbsc/debian/compat b/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/openbsc/debian/compat
+++ b/debian/compat
diff --git a/openbsc/debian/control b/debian/control
index e7d1f6ec6..e7d1f6ec6 100644
--- a/openbsc/debian/control
+++ b/debian/control
diff --git a/openbsc/debian/copyright b/debian/copyright
index 09693c94d..09693c94d 100644
--- a/openbsc/debian/copyright
+++ b/debian/copyright
diff --git a/openbsc/debian/docs b/debian/docs
index e845566c0..e845566c0 100644
--- a/openbsc/debian/docs
+++ b/debian/docs
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000000000..79085c524
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,19 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+# point to non-existing default 'upstream' to only build from tagged versions
+upstream-branch = upstream
+debian-branch = debian
+upstream-tag = %(version)s
+debian-tag = debian/%(version)s
+pristine-tar = False
+
+# Options only affecting git-buildpackage
+[git-buildpackage]
+prebuild = GIT_DIR=$GBP_GIT_DIR debian/rules tarball-version
+export-dir = ../gbp-build-area/
+# compress with bzip2
+compression = bzip2
+# use best compression
+compression-level = 9
+
diff --git a/openbsc/debian/osmocom-bs11-utils.install b/debian/osmocom-bs11-utils.install
index 757a8542b..757a8542b 100644
--- a/openbsc/debian/osmocom-bs11-utils.install
+++ b/debian/osmocom-bs11-utils.install
diff --git a/openbsc/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install
index b561a7e11..b561a7e11 100644
--- a/openbsc/debian/osmocom-bsc-nat.install
+++ b/debian/osmocom-bsc-nat.install
diff --git a/openbsc/debian/osmocom-bsc.examples b/debian/osmocom-bsc.examples
index 2eec6ba54..2eec6ba54 100644
--- a/openbsc/debian/osmocom-bsc.examples
+++ b/debian/osmocom-bsc.examples
diff --git a/openbsc/debian/osmocom-bsc.install b/debian/osmocom-bsc.install
index d330cc4fc..d330cc4fc 100644
--- a/openbsc/debian/osmocom-bsc.install
+++ b/debian/osmocom-bsc.install
diff --git a/openbsc/debian/osmocom-gbproxy.install b/debian/osmocom-gbproxy.install
index ba3f6eedb..ba3f6eedb 100644
--- a/openbsc/debian/osmocom-gbproxy.install
+++ b/debian/osmocom-gbproxy.install
diff --git a/openbsc/debian/osmocom-ipaccess-utils.install b/debian/osmocom-ipaccess-utils.install
index 750641ede..750641ede 100644
--- a/openbsc/debian/osmocom-ipaccess-utils.install
+++ b/debian/osmocom-ipaccess-utils.install
diff --git a/openbsc/debian/osmocom-nitb.default b/debian/osmocom-nitb.default
index b9281983f..b9281983f 100644
--- a/openbsc/debian/osmocom-nitb.default
+++ b/debian/osmocom-nitb.default
diff --git a/openbsc/debian/osmocom-nitb.examples b/debian/osmocom-nitb.examples
index 2d410e7d6..2d410e7d6 100644
--- a/openbsc/debian/osmocom-nitb.examples
+++ b/debian/osmocom-nitb.examples
diff --git a/openbsc/debian/osmocom-nitb.init b/debian/osmocom-nitb.init
index 8373ce7cf..8373ce7cf 100755
--- a/openbsc/debian/osmocom-nitb.init
+++ b/debian/osmocom-nitb.init
diff --git a/openbsc/debian/osmocom-nitb.install b/debian/osmocom-nitb.install
index 6bb2171c2..6bb2171c2 100644
--- a/openbsc/debian/osmocom-nitb.install
+++ b/debian/osmocom-nitb.install
diff --git a/openbsc/debian/osmocom-sgsn.install b/debian/osmocom-sgsn.install
index d89c45672..d89c45672 100644
--- a/openbsc/debian/osmocom-sgsn.install
+++ b/debian/osmocom-sgsn.install
diff --git a/openbsc/debian/rules b/debian/rules
index 8de0ecc48..3784f7bc3 100755
--- a/openbsc/debian/rules
+++ b/debian/rules
@@ -14,7 +14,12 @@
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS
+export DH_OPTIONS=-Dopenbsc
+
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+
+%:
+	dh --with autoreconf $@ 
 
 # this requires debhelper 7.0.50 or above, which lenny doesn't have yet!
 #override_dh_auto_configure:
@@ -27,5 +32,6 @@ build-stamp:
 	dh build --after configure
 	touch build-stamp
 
-%:
-	dh $@ 
+tarball-version:
+	git describe --abbrev=4 --match '*.*.*' $(DEB_UPSTREAM_VERSION) | sed 's/-/./;s/\(.*\)-g/\1-/' > .tarball-version
+
diff --git a/openbsc/debian/source/format b/debian/source/format
index 163aaf8d8..163aaf8d8 100644
--- a/openbsc/debian/source/format
+++ b/debian/source/format
diff --git a/openbsc/debian/patches/debian-changes-0.9.4-1 b/openbsc/debian/patches/debian-changes-0.9.4-1
deleted file mode 100644
index d7e6d61bf..000000000
--- a/openbsc/debian/patches/debian-changes-0.9.4-1
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Upstream changes introduced in version 0.9.4-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- openbsc (0.9.4-1) unstable; urgency=low
- .
-   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Harald Welte <laforge@gnumonks.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ openbsc-0.9.4/.version
-@@ -0,0 +1 @@
-+0.9.4
diff --git a/openbsc/debian/patches/series b/openbsc/debian/patches/series
deleted file mode 100644
index c6d90ecb9..000000000
--- a/openbsc/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-0.9.4-1