debian: Switch to multi-arch support

6 files changed, 18 insertions, 13 deletions

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b42246f..86e6f80 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: libosmo-abis
 Section: libs
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev
+Standards-Version: 3.9.6
 Homepage: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
 Vcs-Git: git://git.osmocom.org/libosmo-abis.git
 Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-abis.git;a=summary
@@ -11,7 +11,8 @@ Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-abis.git;a=summary
 Package: libosmo-abis
 Section: oldlibs
 Architecture: any
-Depends: libosmoabis4, libosmotrau0, ${misc:Depends}
+Depends: libosmoabis4 (= ${binary:Version}), libosmotrau0 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Legacy package for libosmo-abis
  libosmo-abis is an empty package helping in the transition to one
  package per DSO.
@@ -20,18 +21,21 @@ Package: libosmoabis4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: GSM A-bis handling
 
 Package: libosmotrau0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: GSM trau handling
 
 Package: libosmo-abis-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libosmotrau0, libosmoabis4
+Depends: ${misc:Depends}, libosmotrau0 (= ${binary:Version}), libosmoabis4 (= ${binary:Version})
+Multi-Arch: same
 Description: Development headers for A-bis interface.
 
 Package: libosmo-abis-dbg
@@ -39,4 +43,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: libosmoabis4 (= ${binary:Version}), libosmotrau0 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Debug symbols for A-bis interface.
diff --git a/debian/libosmo-abis-dev.install b/debian/libosmo-abis-dev.install
index eec0e15..465f933 100644
--- a/debian/libosmo-abis-dev.install
+++ b/debian/libosmo-abis-dev.install
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/lib*.la
+usr/lib/*/pkgconfig/*
diff --git a/debian/libosmoabis4.install b/debian/libosmoabis4.install
index 7811e36..79c51a9 100644
--- a/debian/libosmoabis4.install
+++ b/debian/libosmoabis4.install
@@ -1 +1 @@
-usr/lib/libosmoabis.so.*
+usr/lib/*/libosmoabis.so.*
diff --git a/debian/libosmotrau0.install b/debian/libosmotrau0.install
index cef0740..5a25619 100644
--- a/debian/libosmotrau0.install
+++ b/debian/libosmotrau0.install
@@ -1 +1 @@
-usr/lib/libosmotrau.so.*
+usr/lib/*/libosmotrau.so.*
diff --git a/debian/rules b/debian/rules
index 89e1a86..d3f1534 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,11 @@ DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
 
 %:
-	dh --with autoreconf $@ --fail-missing
+	dh $@ --with autoreconf --fail-missing
 
 override_dh_strip:
 	dh_strip --dbg-package=libosmo-abis-dbg