Update debian package.

6 files changed, 13 insertions, 45 deletions

diff --git a/openbsc/debian/changelog b/openbsc/debian/changelog
index ec5cf1fd1..42c06f8f2 100644
--- a/openbsc/debian/changelog
+++ b/openbsc/debian/changelog
@@ -1,3 +1,9 @@
+openbsc (0.12.0+git26) precise; urgency=low
+
+  * Updated ubuntu package.
+
+ -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 17:36:51 -0700
+
 openbsc (0.9.13.115.eb113-1) natty; urgency=low
 
   * New upstream release
diff --git a/openbsc/debian/control b/openbsc/debian/control
index e7d1f6ec6..301004567 100644
--- a/openbsc/debian/control
+++ b/openbsc/debian/control
@@ -2,7 +2,7 @@ Source: openbsc
 Section: net
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, libgtp, libosmocore-dev, libosmo-sccp-dev, libdbi0-dev
+Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, libgtp-dev, libosmocore-dev, libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, libosmo-abis-dev
 Standards-Version: 3.8.4
 Homepage: http://openbsc.osmocom.org/
 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git
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
diff --git a/openbsc/debian/rules b/openbsc/debian/rules
index 8de0ecc48..4331d02a3 100755
--- a/openbsc/debian/rules
+++ b/openbsc/debian/rules
@@ -13,19 +13,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# this requires debhelper 7.0.50 or above, which lenny doesn't have yet!
-#override_dh_auto_configure:
-#	dh_auto_configure -- --enable-nat --enable-osmo-bsc
+%:
+	dh --with autoreconf $@ 
 
-build: build-stamp
-build-stamp:
-	dh build --before configure
+override_dh_auto_configure:
 	dh_auto_configure -- --enable-nat --enable-osmo-bsc
-	dh build --after configure
-	touch build-stamp
 
-%:
-	dh $@ 
+override_dh_auto_test:
+#	tests are broken...
diff --git a/openbsc/debian/source/format b/openbsc/debian/source/format
index 163aaf8d8..89ae9db8f 100644
--- a/openbsc/debian/source/format
+++ b/openbsc/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)