[SCM] faad2/master: Multi-Archify.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a573aa51f2ad3cf18a4c145a5d2cc4e21d2d0c7
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Feb 7 15:56:15 2012 +0100

    Multi-Archify.

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 7e25da0..928d7b6 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Matthew W. S. Bell <matthew at bells23.org.uk>,
            Fabian Greffrath <fabian+debian at greffrath.com>
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
  dh-autoreconf
 Homepage: http://www.audiocoding.com/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/faad2.git
@@ -29,6 +29,8 @@ Description: freeware Advanced Audio Decoder - development files
 
 Package: libfaad2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libfaad2-0
 Replaces: libfaad2-0
diff --git a/debian/libfaad-dev.install b/debian/libfaad-dev.install
index 3f9f269..200d628 100644
--- a/debian/libfaad-dev.install
+++ b/debian/libfaad-dev.install
@@ -1,4 +1,3 @@
-usr/include/faad.h
-usr/include/neaacdec.h
-usr/lib/libfaad.a
-usr/lib/libfaad.so
+usr/include
+usr/lib/*/libfaad.a
+usr/lib/*/libfaad.so
diff --git a/debian/libfaad2.install b/debian/libfaad2.install
index 94fc846..31352eb 100644
--- a/debian/libfaad2.install
+++ b/debian/libfaad2.install
@@ -1 +1 @@
-usr/lib/libfaad.so.*
+usr/lib/*/libfaad.so.*
diff --git a/debian/rules b/debian/rules
index a6a3bca..f18c644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-CXXFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
 %:
 	dh $@ --with autoreconf
 

-- 
faad2 packaging