From e119901c5141b28ccba84a0619f501017815918b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Sat, 14 Mar 2015 19:42:23 +0100
Subject: debian: Move to multi-arch support

---
 debian/compat                   | 2 +-
 debian/control                  | 7 +++++--
 debian/libosmo-sccp-dev.install | 7 ++-----
 debian/libosmo-sccp1.install    | 2 +-
 debian/rules                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'debian')

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 dec5939..3df33a0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libosmo-sccp
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, libosmocore-dev, autoconf, automake, libtool, dh-autoreconf, git, libdpkg-perl
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libosmocore-dev, autoconf, automake, libtool, dh-autoreconf, git, libdpkg-perl
+Standards-Version: 3.9.6
 Section: libs
 #Homepage: <insert the upstream URL, if relevant>
 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git
@@ -12,16 +12,19 @@ Package: libosmo-sccp-dev
 Section: libdevel
 Architecture: any
 Depends: libosmo-sccp (= ${binary:Version})
+Multi-Arch: same
 Description: Development files for Osmcoom SCCP library
 
 Package: libosmo-sccp
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Osmocom SCCP library
 
 Package: libosmo-sccp-dbg
 Section: debug
 Architecture: any
 Depends: libosmo-sccp (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Debug symbols for Osmocom SCCP library
diff --git a/debian/libosmo-sccp-dev.install b/debian/libosmo-sccp-dev.install
index 320c598..1eff329 100644
--- a/debian/libosmo-sccp-dev.install
+++ b/debian/libosmo-sccp-dev.install
@@ -1,6 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-#usr/lib/lib*.so
-usr/lib/pkgconfig/*
-#usr/lib/*.la
-#usr/share/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*
diff --git a/debian/libosmo-sccp1.install b/debian/libosmo-sccp1.install
index d0dbfd1..3ddde58 100644
--- a/debian/libosmo-sccp1.install
+++ b/debian/libosmo-sccp1.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 58407d8..0c58a42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
 export DEB_BUILD_HARDENING=1
 
 %:
-	dh --with autoreconf $@ 
+	dh $@ --with autoreconf
 
 override_dh_strip:
 	dh_strip --dbg-package=libosmo-sccp-dbg
-- 
cgit v1.2.3