Source: mpg123
Version: 1.12.1-3.2
Severity: wishlist
Tags: patch
The following patch should add support for multiarch.
thanks!
live well,
vagrant
diff -u mpg123-1.12.1/debian/libmpg123-dev.install
mpg123-1.12.1/debian/libmpg123-dev.install
--- mpg123-1.12.1/debian/libmpg123-dev.install
+++ mpg123-1.12.1/debian/libmpg123-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig/libmpg123.pc
+debian/tmp/usr/lib/*/pkgconfig/libmpg123.pc
debian/tmp/usr/include/*.h
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.so
diff -u mpg123-1.12.1/debian/rules mpg123-1.12.1/debian/rules
--- mpg123-1.12.1/debian/rules
+++ mpg123-1.12.1/debian/rules
@@ -5,6 +5,7 @@
ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
WRAPPER_TARGETS:=mpg123-oss mpg123-esd mpg123-nas
@@ -16,7 +17,7 @@
WRAPPER_TARGETS += mpg123-alsa
endif
-CONF_COMMON:=--prefix=/usr --enable-static --enable-shared
--disable-ltdl-install
+CONF_COMMON:=--prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
--enable-static --enable-shared --disable-ltdl-install
CONF_i486:=--with-cpu=x86_dither
CONF_arm:=--with-cpu=generic_nofpu
@@ -178,12 +179,12 @@
dh_fixperms $(ALL_PKGSTR) $(DUMMY_PKGSTR)
dh_makeshlibs $(LIB_PKGSTR) -V "$(LIB_PKG) (>= 1.7.2)"
dh_installdeb $(ALL_PKGSTR)
- dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123/ -- \
- -dSuggests `find debian/mpg123/usr/lib/mpg123/ -name
"output_*.so" -type f` -dDepends
+ dh_shlibdeps $(ALL_PKGSTR)
-Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -- \
+ -dSuggests `find
debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -name "output_*.so" -type
f` -dDepends
for n in alsa dummy esd nas oss; do \
- i="debian/mpg123/usr/lib/mpg123/output_$$n.so"; \
+
i="debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/output_$$n.so"; \
test -e "$$i" || continue; \
- dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR)
-Xdebian/mpg123/usr/lib/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends
"$$i" -dDepends; \
+ dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR)
-Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123 debian/mpg123 --
-p"$$n"plugin -dRecommends "$$i" -dDepends; \
done
chmod +x "$(CURDIR)/debian/alt_deps.py"
"$(CURDIR)/debian/alt_deps.py" "$(CURDIR)/debian/mpg123.substvars" \
diff -u mpg123-1.12.1/debian/libmpg123-0.install
mpg123-1.12.1/debian/libmpg123-0.install
--- mpg123-1.12.1/debian/libmpg123-0.install
+++ mpg123-1.12.1/debian/libmpg123-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmpg123.so.0*
+debian/tmp/usr/lib/*/libmpg123.so.0*
diff -u mpg123-1.12.1/debian/mpg123.install mpg123-1.12.1/debian/mpg123.install
--- mpg123-1.12.1/debian/mpg123.install
+++ mpg123-1.12.1/debian/mpg123.install
@@ -2,4 +2,4 @@
debian/tmp/usr/share/man/*/*
-debian/tmp/usr/lib/mpg123/*.la
-debian/tmp/usr/lib/mpg123/*.so
+debian/tmp/usr/lib/*/mpg123/*.la
+debian/tmp/usr/lib/*/mpg123/*.so
diff -u mpg123-1.12.1/debian/control mpg123-1.12.1/debian/control
--- mpg123-1.12.1/debian/control
+++ mpg123-1.12.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Daniel Kobras <kob...@debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 5), autotools-dev, autoconf, automake,
pkg-config, libltdl-dev, libesd0-dev, libaudio-dev, libasound2-dev
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev, libpulse-dev
[!hurd-i386], python-minimal
+Build-Depends: debhelper (>= 8.1.3~), autotools-dev, autoconf, automake,
pkg-config, libltdl-dev, libesd0-dev, libaudio-dev, libasound2-dev
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libjack-dev, libpulse-dev
[!hurd-i386], python-minimal
Package: mpg123
Architecture: any
@@ -27,7 +27,9 @@
Package: libmpg123-0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MPEG layer 1/2/3 audio decoder -- runtime library
Mpg123 is a fast and portable MPEG audio decoder for Unix. It supports
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
