Hi *,
I’ve just built libcdio with Francois’ patch on i386 and x32
and can finally install mplayer (after also fixing libass).
Can one of you please upload (NMU, if it must be) the package?
Thanks,
//mirabilos
--
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -Nru libcdio-0.83/debian/changelog libcdio-0.83/debian/changelog
--- libcdio-0.83/debian/changelog 2014-09-01 23:07:11.000000000 +0200
+++ libcdio-0.83/debian/changelog 2015-07-27 09:26:12.000000000 +0200
@@ -1,3 +1,9 @@
+libcdio (0.83-4.3) unstable; urgency=low
+
+ * Add multiarch support except for the libcdio-dev package.
+
+ -- Francois Gouget <[email protected]> Fri, 06 Feb 2015 14:21:03 +0100
+
libcdio (0.83-4.2) unstable; urgency=low
* Non-maintainer upload with maintainers permission.
diff -Nru libcdio-0.83/debian/compat libcdio-0.83/debian/compat
--- libcdio-0.83/debian/compat 2011-12-28 23:58:43.000000000 +0100
+++ libcdio-0.83/debian/compat 2015-07-27 09:25:59.000000000 +0200
@@ -1 +1 @@
-8
+9
diff -Nru libcdio-0.83/debian/control libcdio-0.83/debian/control
--- libcdio-0.83/debian/control 2014-09-01 23:05:05.000000000 +0200
+++ libcdio-0.83/debian/control 2015-07-27 09:25:59.000000000 +0200
@@ -2,7 +2,7 @@
Priority: optional
Section: libs
Maintainer: Nicolas Boullis <[email protected]>
-Build-Depends: debhelper (>= 8.0.0), dctrl-tools | grep-dctrl, libpopt-dev,
libncurses5-dev | libncurses-dev, libcam-dev [kfreebsd-any], dh-autoreconf
+Build-Depends: debhelper (>= 9), dctrl-tools | grep-dctrl, libpopt-dev,
libncurses5-dev | libncurses-dev, libcam-dev [kfreebsd-any], dh-autoreconf
Standards-Version: 3.9.2
Homepage: http://www.gnu.org/software/libcdio/
@@ -25,6 +25,8 @@
Package: libcdio13
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to read and control CD-ROM
This library is to encapsulate CD-ROM reading and
@@ -38,6 +40,7 @@
Package: libiso9660-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libiso9660-8 (= ${binary:Version}), libcdio-dev (>= 0.78.2-1),
${libcdev}, ${misc:Depends}
Description: library to work with ISO9660 filesystems (development files)
This package contains development files (headers and static library)
@@ -49,6 +52,8 @@
Package: libiso9660-8
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to work with ISO9660 filesystems
This library is made to read and write ISO9660 filesystems; those
@@ -70,6 +75,8 @@
Package: libcdio-cdda1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to read and control digital audio CDs
This library is made to read and control digital audio CDs. It does
@@ -80,6 +87,7 @@
Package: libcdio-paranoia-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libcdio-paranoia1 (= ${binary:Version}), libcdio-cdda-dev,
libcdio-dev, ${libcdev}, ${misc:Depends}
Description: library to read digital audio CDs with error correction
(development files)
This package contains development files (headers and static library)
@@ -93,6 +101,8 @@
Package: libcdio-paranoia1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to read digital audio CDs with error correction
This library is made to read digital audio CDs, with error
@@ -103,6 +113,7 @@
Package: libudf-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libudf0 (= ${binary:Version}), libcdio-dev (>= 0.78.2-1), ${libcdev},
${misc:Depends}
Description: library to work with UDF filesystems (development files)
This package contains development files (headers and static library)
@@ -114,6 +125,8 @@
Package: libudf0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to work with UDF filesystems
This library is made to read and write UDF filesystems; those
@@ -122,6 +135,7 @@
Package: libcdio-utils
Section: otherosfs
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: sample applications based on the CDIO libraries
This package contains a collection of small libcdio-based tools:
diff -Nru libcdio-0.83/debian/libcdio-cdda-dev.install
libcdio-0.83/debian/libcdio-cdda-dev.install
--- libcdio-0.83/debian/libcdio-cdda-dev.install 2011-12-24
00:25:55.000000000 +0100
+++ libcdio-0.83/debian/libcdio-cdda-dev.install 2015-07-27
09:25:59.000000000 +0200
@@ -1,4 +1,4 @@
usr/include/cdio/cdda.h
-usr/lib/libcdio_cdda.a
-usr/lib/libcdio_cdda.so
-usr/lib/pkgconfig/libcdio_cdda.pc
+usr/lib/*/libcdio_cdda.a
+usr/lib/*/libcdio_cdda.so
+usr/lib/*/pkgconfig/libcdio_cdda.pc
diff -Nru libcdio-0.83/debian/libcdio-cdda1.install
libcdio-0.83/debian/libcdio-cdda1.install
--- libcdio-0.83/debian/libcdio-cdda1.install 2011-12-29 22:15:54.000000000
+0100
+++ libcdio-0.83/debian/libcdio-cdda1.install 2015-07-27 09:25:59.000000000
+0200
@@ -1,2 +1,2 @@
-usr/lib/libcdio_cdda.so.1
-usr/lib/libcdio_cdda.so.1.*
+usr/lib/*/libcdio_cdda.so.1
+usr/lib/*/libcdio_cdda.so.1.*
diff -Nru libcdio-0.83/debian/libcdio-dev.install
libcdio-0.83/debian/libcdio-dev.install
--- libcdio-0.83/debian/libcdio-dev.install 2011-12-29 23:24:04.000000000
+0100
+++ libcdio-0.83/debian/libcdio-dev.install 2015-07-27 09:25:59.000000000
+0200
@@ -24,7 +24,7 @@
usr/include/cdio/util.h
usr/include/cdio/utf8.h
usr/include/cdio/version.h
-usr/lib/libcdio.a
-usr/lib/libcdio.so
-usr/lib/pkgconfig/libcdio.pc
+usr/lib/*/libcdio.a
+usr/lib/*/libcdio.so
+usr/lib/*/pkgconfig/libcdio.pc
usr/share/info/libcdio.info*
diff -Nru libcdio-0.83/debian/libcdio-paranoia-dev.install
libcdio-0.83/debian/libcdio-paranoia-dev.install
--- libcdio-0.83/debian/libcdio-paranoia-dev.install 2011-12-24
00:25:55.000000000 +0100
+++ libcdio-0.83/debian/libcdio-paranoia-dev.install 2015-07-27
09:25:59.000000000 +0200
@@ -1,4 +1,4 @@
usr/include/cdio/paranoia.h
-usr/lib/libcdio_paranoia.a
-usr/lib/libcdio_paranoia.so
-usr/lib/pkgconfig/libcdio_paranoia.pc
+usr/lib/*/libcdio_paranoia.a
+usr/lib/*/libcdio_paranoia.so
+usr/lib/*/pkgconfig/libcdio_paranoia.pc
diff -Nru libcdio-0.83/debian/libcdio-paranoia1.install
libcdio-0.83/debian/libcdio-paranoia1.install
--- libcdio-0.83/debian/libcdio-paranoia1.install 2011-12-29
22:17:03.000000000 +0100
+++ libcdio-0.83/debian/libcdio-paranoia1.install 2015-07-27
09:25:59.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/libcdio_paranoia.so.1
-usr/lib/libcdio_paranoia.so.1.*
+usr/lib/*/libcdio_paranoia.so.1
+usr/lib/*/libcdio_paranoia.so.1.*
diff -Nru libcdio-0.83/debian/libcdio13.install
libcdio-0.83/debian/libcdio13.install
--- libcdio-0.83/debian/libcdio13.install 2011-12-29 22:13:31.000000000
+0100
+++ libcdio-0.83/debian/libcdio13.install 2015-07-27 09:25:59.000000000
+0200
@@ -1,2 +1,2 @@
-usr/lib/libcdio.so.13
-usr/lib/libcdio.so.13.*
+usr/lib/*/libcdio.so.13
+usr/lib/*/libcdio.so.13.*
diff -Nru libcdio-0.83/debian/libiso9660-8.install
libcdio-0.83/debian/libiso9660-8.install
--- libcdio-0.83/debian/libiso9660-8.install 2011-12-29 22:14:30.000000000
+0100
+++ libcdio-0.83/debian/libiso9660-8.install 2015-07-27 09:25:59.000000000
+0200
@@ -1,2 +1,2 @@
-usr/lib/libiso9660.so.8
-usr/lib/libiso9660.so.8.*
+usr/lib/*/libiso9660.so.8
+usr/lib/*/libiso9660.so.8.*
diff -Nru libcdio-0.83/debian/libiso9660-dev.install
libcdio-0.83/debian/libiso9660-dev.install
--- libcdio-0.83/debian/libiso9660-dev.install 2011-12-24 00:25:55.000000000
+0100
+++ libcdio-0.83/debian/libiso9660-dev.install 2015-07-27 09:25:59.000000000
+0200
@@ -1,6 +1,6 @@
usr/include/cdio/iso9660.h
usr/include/cdio/rock.h
usr/include/cdio/xa.h
-usr/lib/libiso9660.a
-usr/lib/libiso9660.so
-usr/lib/pkgconfig/libiso9660.pc
+usr/lib/*/libiso9660.a
+usr/lib/*/libiso9660.so
+usr/lib/*/pkgconfig/libiso9660.pc
diff -Nru libcdio-0.83/debian/libudf-dev.install
libcdio-0.83/debian/libudf-dev.install
--- libcdio-0.83/debian/libudf-dev.install 2011-12-24 00:25:55.000000000
+0100
+++ libcdio-0.83/debian/libudf-dev.install 2015-07-27 09:25:59.000000000
+0200
@@ -2,6 +2,6 @@
usr/include/cdio/udf.h
usr/include/cdio/udf_file.h
usr/include/cdio/udf_time.h
-usr/lib/libudf.a
-usr/lib/libudf.so
-usr/lib/pkgconfig/libudf.pc
+usr/lib/*/libudf.a
+usr/lib/*/libudf.so
+usr/lib/*/pkgconfig/libudf.pc
diff -Nru libcdio-0.83/debian/libudf0.install
libcdio-0.83/debian/libudf0.install
--- libcdio-0.83/debian/libudf0.install 2011-12-24 00:25:55.000000000 +0100
+++ libcdio-0.83/debian/libudf0.install 2015-07-27 09:25:59.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/libudf.so.0
-usr/lib/libudf.so.0.*
+usr/lib/*/libudf.so.0
+usr/lib/*/libudf.so.0.*
diff -Nru libcdio-0.83/debian/rules libcdio-0.83/debian/rules
--- libcdio-0.83/debian/rules 2014-09-01 23:05:05.000000000 +0200
+++ libcdio-0.83/debian/rules 2015-07-27 09:25:59.000000000 +0200
@@ -11,7 +11,7 @@
# from having to guess our platform (since we know it already)
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)
CFLAGS = -Wall -g
@@ -30,7 +30,7 @@
dh_testdir
dh_autoreconf
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --disable-cddb --disable-vcd-info
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ CFLAGS="$(CFLAGS)" ./configure --disable-cddb --disable-vcd-info
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
build: build-arch build-indep
build-arch: build-stamp
