[Pkg-opt-media-team] [SCM] cdparanoia packaging branch, master, updated. debian/3.10.2+debian-10-5-gd415f2c

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit d415f2cb35fdc0e822a7b25f7640bbdcdc49b378
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Wed Apr 11 10:38:17 2012 +0900

    Apply multiarch patch (Closes: #650988)

diff --git a/debian/control b/debian/control
index e00f369..72db2a0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
 	Rogério Brito <rbrito at ime.usp.br>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 8.1.3~),
  autotools-dev,
  libcam-dev [kfreebsd-any]
 Standards-Version: 3.8.3
@@ -39,6 +39,8 @@ Description: audio extraction tool for sampling CDs (debug)
 Package: libcdparanoia0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: audio extraction tool for sampling CDs (library)
  An audio extraction tool for sampling CDs. Unlike similar programs such as
@@ -51,6 +53,7 @@ Description: audio extraction tool for sampling CDs (library)
 Package: libcdparanoia-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${arch-os-dev}, libcdparanoia0 (= ${binary:Version})
 Provides: libcdparanoia0-dev
 Description: audio extraction tool for sampling CDs (development)
diff --git a/debian/libcdparanoia-dev.install b/debian/libcdparanoia-dev.install
index 016572f..34185b4 100644
--- a/debian/libcdparanoia-dev.install
+++ b/debian/libcdparanoia-dev.install
@@ -1,3 +1,3 @@
 /usr/include
-/usr/lib/*.a
-/usr/lib/*.so
+/usr/lib/*/*.a
+/usr/lib/*/*.so
diff --git a/debian/libcdparanoia0.install b/debian/libcdparanoia0.install
index 49cc562..a451edd 100644
--- a/debian/libcdparanoia0.install
+++ b/debian/libcdparanoia0.install
@@ -1 +1 @@
-/usr/lib/*.so.*
+/usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index f6f0c9b..3455033 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH      ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export CFLAGS += -Wall
 export LDFLAGS += -Wl,--as-needed -Wl,-O1 -Wl,-z,defs
@@ -34,7 +35,7 @@ ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub configure.sub
 endif
 
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)"
+	./configure $(CROSS) --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)"
 
 build: build-stamp
 build-stamp: config.status

-- 
cdparanoia packaging