Bug#777200: libcdaudio1 is not Multi-Arch compatible
On Wed, 4 Nov 2015, Boris Pek wrote:
[...]
> Could you show actual debdiff? Provided tarball is inconvenient for
> quick view of changes.
I have attached a diff showing the changes to the debian packaging files
and a debdiff of the amd64 package.
Note that the changes showing up in DEBIAN/* files in the deb_amd64.diff
file come from bumping up the compat level.
> Have you tested the package with you patch for possible regressions?
I had it installed for a while and did not notice any regression. I did
not specifically test it though as for me it was mostly a way of getting
the GStreamer 0.10 development packages installed. It got uninstalled
when I went through the big KDE / gcc-5 upgrade ordeal.
--
Francois Gouget <fgouget@free.fr> http://fgouget.free.fr/
A black hole is just God dividing by zero.diff -ur libcdaudio-0.99.12p2.orig/debian/changelog libcdaudio-0.99.12p2/debian/changelog
--- libcdaudio-0.99.12p2.orig/debian/changelog 2013-07-02 13:56:16.000000000 +0200
+++ libcdaudio-0.99.12p2/debian/changelog 2015-02-04 18:00:57.000000000 +0100
@@ -1,3 +1,9 @@
+libcdaudio (0.99.12p2-14) unstable; urgency=low
+
+ * Add multiarch support.
+
+ -- Francois Gouget <fgouget@codeweavers.com> Wed, 04 Feb 2015 16:27:00 +0100
+
libcdaudio (0.99.12p2-13) unstable; urgency=low
* QA upload.
diff -ur libcdaudio-0.99.12p2.orig/debian/compat libcdaudio-0.99.12p2/debian/compat
--- libcdaudio-0.99.12p2.orig/debian/compat 2012-06-22 23:22:42.000000000 +0200
+++ libcdaudio-0.99.12p2/debian/compat 2015-02-04 16:23:04.000000000 +0100
@@ -1 +1 @@
-7
+9
diff -ur libcdaudio-0.99.12p2.orig/debian/control libcdaudio-0.99.12p2/debian/control
--- libcdaudio-0.99.12p2.orig/debian/control 2013-07-02 13:55:12.000000000 +0200
+++ libcdaudio-0.99.12p2/debian/control 2015-02-04 16:30:54.000000000 +0100
@@ -2,12 +2,14 @@
Section: libs
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dh-autoreconf
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf
Standards-Version: 3.9.4
Homepage: http://libcdaudio.sourceforge.net/
Package: libcdaudio1
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library for controlling a CD-ROM when playing audio CDs
This library provides functions for controlling an audio CD: starting,
@@ -17,6 +19,7 @@
Package: libcdaudio-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, libcdaudio1 (= ${binary:Version})
Description: library for controlling a CD-ROM when playing audio CDs (development)
This library provides functions for controlling an audio CD: starting,
@@ -29,6 +32,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, libcdaudio1 (= ${binary:Version}), libcdaudio-dev (= ${binary:Version})
Description: library for controlling a CD-ROM when playing audio CDs (debug)
This library provides functions for controlling an audio CD: starting,
diff -ur libcdaudio-0.99.12p2.orig/debian/libcdaudio1.install libcdaudio-0.99.12p2/debian/libcdaudio1.install
--- libcdaudio-0.99.12p2.orig/debian/libcdaudio1.install 2012-06-22 23:22:42.000000000 +0200
+++ libcdaudio-0.99.12p2/debian/libcdaudio1.install 2015-02-04 16:30:07.000000000 +0100
@@ -1 +1 @@
-/usr/lib/*.so.*
+/usr/lib/*/*.so.*
diff -ur libcdaudio-0.99.12p2.orig/debian/libcdaudio-dev.install libcdaudio-0.99.12p2/debian/libcdaudio-dev.install
--- libcdaudio-0.99.12p2.orig/debian/libcdaudio-dev.install 2012-06-22 23:22:42.000000000 +0200
+++ libcdaudio-0.99.12p2/debian/libcdaudio-dev.install 2015-02-04 16:35:52.000000000 +0100
@@ -1,6 +1,6 @@
/usr/bin
/usr/include/*
-/usr/lib/*.a
-/usr/lib/*.so
-/usr/lib/pkgconfig/*
+/usr/lib/*/*.a
+/usr/lib/*/*.so
+/usr/lib/*/pkgconfig/*
/usr/share/aclocal
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/libcdaudio.so.1.0.0
-rw-r--r-- root/root DEBIAN/triggers
lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/libcdaudio.so.1 -> libcdaudio.so.1.0.0
Files in first .deb but not in second
-------------------------------------
-rw-r--r-- root/root /usr/lib/libcdaudio.so.1.0.0
-rw-r--r-- root/root /usr/share/doc/libcdaudio1/changelog.Debian.amd64.gz
-rwxr-xr-x root/root DEBIAN/postinst
-rwxr-xr-x root/root DEBIAN/postrm
lrwxrwxrwx root/root /usr/lib/libcdaudio.so.1 -> libcdaudio.so.1.0.0
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-91-] {+104+}
{+Multi-Arch: same+}
Source: libcdaudio [-(0.99.12p2-13)-]
Version: [-0.99.12p2-13+b1-] {+0.99.12p2-14+}
Reply to: