debian: Move to multi-arch support

5 files changed, 13 insertions, 14 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 018f2c2..986ed6c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: openggsn
 Section: net
 Priority: optional
 Maintainer: Harald Welte <laforge@gnumonks.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, pkg-config, libdpkg-perl, git, dh-autoreconf
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libdpkg-perl, git, dh-autoreconf
+Standards-Version: 3.9.6
 Homepage: http://sourceforge.net/projects/ggsn/
 Vcs-Git: git://ggsn.git.sourceforge.net/gitroot/ggsn/ggsn
 Vcs-Browser: http://ggsn.git.sourceforge.net/git/gitweb.cgi?p=ggsn/ggsn;a=summary
@@ -17,10 +17,12 @@ Package: libgtp0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: library implementing the GTP protocol between SGSN and GGSN
 
 Package: libgtp0-dev
 Depends: ${misc:Depends}, libgtp0 (= ${binary:Version})
+Multi-Arch: same
 Architecture: any
 Section: libdevel
 Description: Development files for libgtp
@@ -30,4 +32,5 @@ Section: debug
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Debug symbols for OpenGGSN
diff --git a/debian/libgtp0-dev.install b/debian/libgtp0-dev.install
index eec0e15..465f933 100644
--- a/debian/libgtp0-dev.install
+++ b/debian/libgtp0-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/libgtp0.install b/debian/libgtp0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libgtp0.install
+++ b/debian/libgtp0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 981fa51..62f5236 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,15 +14,11 @@
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS
+#export DH_OPTIONS
 export DEB_BUILD_HARDENING=1
 
-CFLAGS = -Wall -g
-
 %:
-	dh --with autoreconf $@
-
-override_dh_auto_clean:
+	dh $@ --with autoreconf
 
 override_dh_strip:
 	dh_strip --dbg-package=openggsn-dbg