[SCM] opencore-amr/master: Multiarch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit aae18c35e8114585b8e5d8c901fa82249c08e8cf
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 15 10:51:52 2012 +0100

    Multiarch support.

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 5f412b2..350aef9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
  Andres Mejia <amejia at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
  autotools-dev
 Standards-Version: 3.8.3
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/opencore-amr.git
@@ -16,6 +16,7 @@ Homepage: https://sourceforge.net/projects/opencore-amr/
 
 Package: libopencore-amrnb-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
  libopencore-amrnb0 (= ${binary:Version}),
@@ -29,6 +30,8 @@ Description: Adaptive Multi Rate speech codec - development files
 
 Package: libopencore-amrnb0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -41,6 +44,7 @@ Description: Adaptive Multi Rate speech codec - shared library
 
 Package: libopencore-amrnb0-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends:
@@ -55,6 +59,7 @@ Description: Adaptive Multi Rate speech codec - debugging symbols
 
 Package: libopencore-amrwb-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends:
  libopencore-amrwb0 (= ${binary:Version}),
@@ -68,6 +73,8 @@ Description: Adaptive Multi-Rate - Wideband speech codec - development files
 
 Package: libopencore-amrwb0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -80,6 +87,7 @@ Description: Adaptive Multi-Rate - Wideband speech codec - shared library
 
 Package: libopencore-amrwb0-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends:
diff --git a/debian/libopencore-amrnb-dev.install b/debian/libopencore-amrnb-dev.install
index 3aad0cb..ae129e6 100644
--- a/debian/libopencore-amrnb-dev.install
+++ b/debian/libopencore-amrnb-dev.install
@@ -1,4 +1,4 @@
 usr/include/opencore-amrnb
-usr/lib/libopencore-amrnb.a
-usr/lib/libopencore-amrnb.so
-usr/lib/pkgconfig/opencore-amrnb.pc
+usr/lib/*/libopencore-amrnb.a
+usr/lib/*/libopencore-amrnb.so
+usr/lib/*/pkgconfig/opencore-amrnb.pc
diff --git a/debian/libopencore-amrnb0.install b/debian/libopencore-amrnb0.install
index e582193..d27f3e5 100644
--- a/debian/libopencore-amrnb0.install
+++ b/debian/libopencore-amrnb0.install
@@ -1 +1 @@
-usr/lib/libopencore-amrnb.so.*
+usr/lib/*/libopencore-amrnb.so.*
diff --git a/debian/libopencore-amrwb-dev.install b/debian/libopencore-amrwb-dev.install
index c26cebe..c8646b9 100644
--- a/debian/libopencore-amrwb-dev.install
+++ b/debian/libopencore-amrwb-dev.install
@@ -1,4 +1,4 @@
 usr/include/opencore-amrwb
-usr/lib/libopencore-amrwb.a
-usr/lib/libopencore-amrwb.so
-usr/lib/pkgconfig/opencore-amrwb.pc
+usr/lib/*/libopencore-amrwb.a
+usr/lib/*/libopencore-amrwb.so
+usr/lib/*/pkgconfig/opencore-amrwb.pc
diff --git a/debian/libopencore-amrwb0.install b/debian/libopencore-amrwb0.install
index d0a9b24..6e42c77 100644
--- a/debian/libopencore-amrwb0.install
+++ b/debian/libopencore-amrwb0.install
@@ -1 +1 @@
-usr/lib/libopencore-amrwb.so.*
+usr/lib/*/libopencore-amrwb.so.*
diff --git a/debian/rules b/debian/rules
index 183753a..9b40939 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,7 @@ endif
 	dh $@ --with autotools_dev
 
 override_dh_auto_configure:
-	./configure --prefix=/usr $(confflags)
-
-override_dh_auto_install:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
+	dh_auto_configure -- $(confflags)
 
 override_dh_strip:
 	dh_strip -plibopencore-amrnb0 --dbg-package=libopencore-amrnb0-dbg

-- 
opencore-amr packaging