[SCM] soundtouch/master: Build for Multiarch. Drop lib32*.

Thu Jul 28 10:43:37 UTC 2011

The following commit has been merged in the master branch:
commit 599ca26f3bb0489010d74788418c1145efe37a62
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jul 28 12:43:38 2011 +0200

    Build for Multiarch. Drop lib32*.
    
    Thanks to Gregory Hainaut for the patch.

diff --git a/debian/control b/debian/control
index 8e2751e..7d9284f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Section: libs
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio at debian.org>,
  Miguel Colon <debian.micove at gmail.com>
-Build-Depends: debhelper (>= 8.0.0~),
- dh-autoreconf,
- g++-multilib [amd64]
+Build-Depends: debhelper (>= 8.1.3),
+ dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://www.surina.net/soundtouch/
 Vcs-Git: git://git.debian.org/pkg-multimedia/soundtouch.git
@@ -30,6 +29,8 @@ Description: Development files for the sound stretching library
 
 Package: libsoundtouch0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Sound stretching library
@@ -42,6 +43,7 @@ Package: libsoundtouch0-dbg
 Priority: extra
 Section: debug
 Architecture: any
+Multi-Arch: same
 Depends: libsoundtouch0 (= ${binary:Version}),
  ${misc:Depends}
 Description: Debugging symbols for the sound stretching library
@@ -50,43 +52,6 @@ Description: Debugging symbols for the sound stretching library
  .
  This package contains the debugging symbols for libsoundtouch0.
 
-Package: lib32soundtouch-dev
-Section: libdevel
-Architecture: amd64
-Depends: libsoundtouch-dev (= ${binary:Version}),
- lib32soundtouch0 (= ${binary:Version}),
- ${misc:Depends}
-Provides: lib32soundtouch0-dev
-Description: Development files for the sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time of
- soundfiles independently.
- .
- This package contains the development files (32 bit) used to build programs
- that use lib32soundtouch0.
-
-Package: lib32soundtouch0
-Architecture: amd64
-Depends: libsoundtouch0 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time
- of soundfiles independently.
- .
- This package contains the libsoundtouch0 shared library (32 bit).
-
-Package: lib32soundtouch0-dbg
-Priority: extra
-Section: debug
-Architecture: amd64
-Depends: lib32soundtouch0 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for the sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time of
- soundfiles independently.
- .
- This package contains the debugging symbols (32 bit) for lib32soundtouch0.
-
 Package: soundstretch
 Section: sound
 Architecture: any
diff --git a/debian/lib32soundtouch-dev.install b/debian/lib32soundtouch-dev.install
deleted file mode 100644
index c9ab70e..0000000
--- a/debian/lib32soundtouch-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib32/lib*.so /usr/lib32/
-usr/lib32/pkgconfig/* /usr/lib32/pkgconfig/
diff --git a/debian/lib32soundtouch-dev.links b/debian/lib32soundtouch-dev.links
deleted file mode 100644
index c1da8ff..0000000
--- a/debian/lib32soundtouch-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libsoundtouch-dev /usr/share/doc/lib32soundtouch-dev
diff --git a/debian/lib32soundtouch0-dbg.links b/debian/lib32soundtouch0-dbg.links
deleted file mode 100644
index c3e05ea..0000000
--- a/debian/lib32soundtouch0-dbg.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/lib32soundtouch0 /usr/share/doc/lib32soundtouch0-dbg
diff --git a/debian/lib32soundtouch0.install b/debian/lib32soundtouch0.install
deleted file mode 100644
index 8f23c3d..0000000
--- a/debian/lib32soundtouch0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib32/lib*.so.* /usr/lib32/
diff --git a/debian/lib32soundtouch0.links b/debian/lib32soundtouch0.links
deleted file mode 100644
index b0bebf5..0000000
--- a/debian/lib32soundtouch0.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libsoundtouch0 /usr/share/doc/lib32soundtouch0
diff --git a/debian/libsoundtouch-dev.install b/debian/libsoundtouch-dev.install
index 64aeff8..6b491cc 100644
--- a/debian/libsoundtouch-dev.install
+++ b/debian/libsoundtouch-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/aclocal/*
diff --git a/debian/libsoundtouch0.install b/debian/libsoundtouch0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libsoundtouch0.install
+++ b/debian/libsoundtouch0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 85d044a..657cb01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,26 +2,10 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-        ifeq ($(DEB_HOST_ARCH), amd64)
-		dh_auto_configure -- CC='gcc -m32' CXX='g++ -m32' \
-                                   --enable-shared=yes \
-                                   --bindir=\$${prefix}/bin32 \
-                                   --libexecdir=\$${prefix}/lib32/soundtouch \
-                                   --libdir=\$${prefix}/lib32
-		$(MAKE)
-		$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-		$(MAKE) clean
-        endif
-
-	dh_auto_configure -- --enable-shared=yes
-
-ifeq ($(DEB_HOST_ARCH), amd64)
-override_dh_prep:
-	dh_prep --exclude=debian/tmp
-endif
+	dh_auto_configure -- --enable-shared=yes --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installdocs:
 	dh_installdocs -plibsoundtouch0 -psoundstretch
@@ -31,9 +15,6 @@ override_dh_installchangelogs:
 
 override_dh_strip:
 	dh_strip --package=libsoundtouch0 --dbg-package=libsoundtouch0-dbg
-        ifeq ($(DEB_HOST_ARCH), amd64)
-		dh_strip --package=lib32soundtouch0 --dbg-package=lib32soundtouch0-dbg
-        endif
 	dh_strip --package=soundstretch --dbg-package=soundstretch-dbg
 
 %:

-- 
soundtouch packaging

