Your message dated Sun, 19 Feb 2012 21:14:34 +0000
with message-id <[email protected]>
and subject line Bug#651019: fixed in taglib 1.7-2
has caused the Debian Bug report #651019,
regarding add Multi-arch support
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
651019: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651019
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: taglib
Version: 1.7-1
Severity: normal
Tags: patch
This patch provides Multi-Arch support for the release goal, which we
worked on at the Portland Bug Squashing Party today.
Thanks!
-Kees
--
Kees Cook @debian.org
diff -Nru taglib-1.7/debian/changelog taglib-1.7/debian/changelog
--- taglib-1.7/debian/changelog 2011-04-09 09:32:42.000000000 -0700
+++ taglib-1.7/debian/changelog 2011-12-04 17:31:01.000000000 -0800
@@ -1,3 +1,11 @@
+taglib (1.7-2) UNRELEASED; urgency=low
+
+ * debian/{control,rules,*.install}: convert to Multi-Arch.
+ * debian/*patches/multiarch.diff: inject library triplet into cmake.
+ * debian/libtag1-rusxmms.install.in: target must be defined at build time.
+
+ -- Kees Cook <[email protected]> Sun, 04 Dec 2011 15:48:59 -0800
+
taglib (1.7-1) unstable; urgency=low
* New upstream release.
diff -Nru taglib-1.7/debian/compat taglib-1.7/debian/compat
--- taglib-1.7/debian/compat 2010-05-13 14:52:24.000000000 -0700
+++ taglib-1.7/debian/compat 2011-12-04 15:52:23.000000000 -0800
@@ -1 +1 @@
-7
+9
diff -Nru taglib-1.7/debian/control taglib-1.7/debian/control
--- taglib-1.7/debian/control 2011-04-09 07:58:14.000000000 -0700
+++ taglib-1.7/debian/control 2011-12-04 15:55:38.000000000 -0800
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Modestas Vainius <[email protected]>
-Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3), dpkg-dev (>= 1.15.3),
quilt (>= 0.46-7~), zlib1g-dev, librcc-dev
+Build-Depends: cmake (>= 2.6.2), debhelper (>= 8.1.3~), dpkg-dev (>= 1.15.3),
quilt (>= 0.46-7~), zlib1g-dev, librcc-dev
Build-Depends-Indep: doxygen, graphviz, gsfonts-x11
Standards-Version: 3.9.2
Homepage: http://developer.kde.org/~wheeler/taglib.html
@@ -11,6 +11,8 @@
Package: libtag1c2a
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libtag1-vanilla (= ${binary:Version}) | libtag1-rusxmms (=
${binary:Version}), ${misc:Depends}
Conflicts: libtag-extras0
Description: audio meta-data library
@@ -26,6 +28,8 @@
Package: libtag1-vanilla
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libtag1-rusxmms, libtag-extras0
Replaces: libtag1c2a (<< 1.5-5)
@@ -41,6 +45,8 @@
Package: libtag1-rusxmms
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libtag1-vanilla, libtag-extras0
Replaces: libtag1c2a (<< 1.5-5)
@@ -84,6 +90,8 @@
Package: libtagc0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: audio meta-data library - C bindings
TagLib is a library for reading and editing the meta-data of several popular
@@ -97,6 +105,8 @@
Package: libtagc0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: libtagc0 (= ${binary:Version}), libtag1-dev (= ${binary:Version}),
${misc:Depends}
Description: audio meta-data library - development files for C bindings
TagLib is a library for reading and editing the meta-data of several popular
diff -Nru taglib-1.7/debian/libtag1-dev.install
taglib-1.7/debian/libtag1-dev.install
--- taglib-1.7/debian/libtag1-dev.install 2011-04-09 09:32:16.000000000
-0700
+++ taglib-1.7/debian/libtag1-dev.install 2011-12-04 15:53:32.000000000
-0800
@@ -78,5 +78,5 @@
usr/include/taglib/wavproperties.h
usr/include/taglib/xingheader.h
usr/include/taglib/xiphcomment.h
-usr/lib/libtag.so
-usr/lib/pkgconfig/taglib.pc
+usr/lib/*/libtag.so
+usr/lib/*/pkgconfig/taglib.pc
diff -Nru taglib-1.7/debian/libtag1-rusxmms.install
taglib-1.7/debian/libtag1-rusxmms.install
--- taglib-1.7/debian/libtag1-rusxmms.install 2011-04-09 09:32:16.000000000
-0700
+++ taglib-1.7/debian/libtag1-rusxmms.install 1969-12-31 16:00:00.000000000
-0800
@@ -1,2 +0,0 @@
-debian/tmp-rusxmms/usr/lib/libtag.so.1 usr/lib
-debian/tmp-rusxmms/usr/lib/libtag.so.1.* usr/lib
diff -Nru taglib-1.7/debian/libtag1-rusxmms.install.in
taglib-1.7/debian/libtag1-rusxmms.install.in
--- taglib-1.7/debian/libtag1-rusxmms.install.in 1969-12-31
16:00:00.000000000 -0800
+++ taglib-1.7/debian/libtag1-rusxmms.install.in 2011-12-04
16:10:01.000000000 -0800
@@ -0,0 +1 @@
+debian/tmp-rusxmms/usr/lib/@@@DEB_HOST_MULTIARCH@@@/libtag.so.*
/usr/lib/@@@DEB_HOST_MULTIARCH@@@/
diff -Nru taglib-1.7/debian/libtag1-vanilla.install
taglib-1.7/debian/libtag1-vanilla.install
--- taglib-1.7/debian/libtag1-vanilla.install 2011-04-09 09:32:16.000000000
-0700
+++ taglib-1.7/debian/libtag1-vanilla.install 2011-12-04 16:22:51.000000000
-0800
@@ -1,2 +1,2 @@
-usr/lib/libtag.so.1
-usr/lib/libtag.so.1.*
+usr/lib/*/libtag.so.1
+usr/lib/*/libtag.so.1.*
diff -Nru taglib-1.7/debian/libtagc0-dev.install
taglib-1.7/debian/libtagc0-dev.install
--- taglib-1.7/debian/libtagc0-dev.install 2011-04-09 09:32:16.000000000
-0700
+++ taglib-1.7/debian/libtagc0-dev.install 2011-12-04 15:54:56.000000000
-0800
@@ -1,3 +1,3 @@
usr/include/taglib/tag_c.h
-usr/lib/libtag_c.so
-usr/lib/pkgconfig/taglib_c.pc
+usr/lib/*/libtag_c.so
+usr/lib/*/pkgconfig/taglib_c.pc
diff -Nru taglib-1.7/debian/libtagc0.install taglib-1.7/debian/libtagc0.install
--- taglib-1.7/debian/libtagc0.install 2011-04-09 09:32:16.000000000 -0700
+++ taglib-1.7/debian/libtagc0.install 2011-12-04 15:55:07.000000000 -0800
@@ -1,2 +1,2 @@
-usr/lib/libtag_c.so.0
-usr/lib/libtag_c.so.0.0.0
+usr/lib/*/libtag_c.so.0
+usr/lib/*/libtag_c.so.0.0.0
diff -Nru taglib-1.7/debian/patches/multiarch.diff
taglib-1.7/debian/patches/multiarch.diff
--- taglib-1.7/debian/patches/multiarch.diff 1969-12-31 16:00:00.000000000
-0800
+++ taglib-1.7/debian/patches/multiarch.diff 2011-12-04 17:09:12.000000000
-0800
@@ -0,0 +1,16 @@
+Description: insert the multiarch triplet into the library install path.
+Author: Kees Cook <[email protected]>
+
+Index: taglib-1.7/CMakeLists.txt
+===================================================================
+--- taglib-1.7.orig/CMakeLists.txt 2011-12-04 16:54:49.940430354 -0800
++++ taglib-1.7/CMakeLists.txt 2011-12-04 16:55:25.020874157 -0800
+@@ -14,7 +14,7 @@
+ add_definitions(-DHAVE_CONFIG_H)
+
+ #add some KDE specific stuff
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
++set(LIB_SUFFIX "/${DEB_HOST_MULTIARCH}" CACHE STRING "Define suffix of
directory name (32/64)" )
+ set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base
directory for executables and libraries" FORCE)
+ #
+ ## the following are directories where stuff will be installed to
diff -Nru taglib-1.7/debian/patches/series taglib-1.7/debian/patches/series
--- taglib-1.7/debian/patches/series 2011-04-09 08:17:40.000000000 -0700
+++ taglib-1.7/debian/patches/series 2011-12-04 16:54:47.000000000 -0800
@@ -1 +1,2 @@
upstream_doxygen_out_of_source.diff
+multiarch.diff
diff -Nru taglib-1.7/debian/rules taglib-1.7/debian/rules
--- taglib-1.7/debian/rules 2011-04-09 08:07:37.000000000 -0700
+++ taglib-1.7/debian/rules 2011-12-04 17:13:15.000000000 -0800
@@ -2,8 +2,9 @@
export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CMAKE_ARGS = -DCMAKE_USE_RELATIVE_PATHS=ON -DWITH_ASF=ON -DWITH_MP4=ON
+CMAKE_ARGS = -DCMAKE_USE_RELATIVE_PATHS=ON -DWITH_ASF=ON -DWITH_MP4=ON
-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
DH_AUTO_ARGS = --buildsystem=cmake
QUILT := quilt --quiltrc /dev/null
MAKE_ME = $(MAKE) -f $(lastword $(MAKEFILE_LIST))
@@ -55,8 +56,9 @@
### Install / binary building ###
override_dh_auto_install:
dh_auto_install --builddirectory=builddir-vanilla $(DH_AUTO_ARGS)
- install -d -m755 debian/tmp-rusxmms/usr/lib/
- cp -a builddir-rusxmms/taglib/libtag.so.* debian/tmp-rusxmms/usr/lib
+ install -d -m755 debian/tmp-rusxmms/usr/lib/$(DEB_HOST_MULTIARCH)
+ cp -a builddir-rusxmms/taglib/libtag.so.*
debian/tmp-rusxmms/usr/lib/$(DEB_HOST_MULTIARCH)/
+ sed -e 's/@@@DEB_HOST_MULTIARCH@@@/$(DEB_HOST_MULTIARCH)/g'
"$(CURDIR)/debian/libtag1-rusxmms.install.in" >
"$(CURDIR)/debian/libtag1-rusxmms.install"
override_dh_installdocs:
dh_installdocs
@@ -80,6 +82,7 @@
rm -rf $(patsubst %,debian/tmp-%,$(FLAVOURS))
rm -f debian/stamp-*
rm -f $(RUSXMMS_PATCH_SERIES)
+ rm -f $(CURDIR)/debian/libtag1-rusxmms.install
# Clean documentation
rm -rf doc/html
dh clean
diff -Nru taglib-1.7/debian/rusxmms-patches/multiarch.diff
taglib-1.7/debian/rusxmms-patches/multiarch.diff
--- taglib-1.7/debian/rusxmms-patches/multiarch.diff 1969-12-31
16:00:00.000000000 -0800
+++ taglib-1.7/debian/rusxmms-patches/multiarch.diff 2011-12-04
17:09:32.000000000 -0800
@@ -0,0 +1,16 @@
+Description: insert the multiarch triplet into the library install path.
+Author: Kees Cook <[email protected]>
+
+Index: taglib-1.7/CMakeLists.txt
+===================================================================
+--- taglib-1.7.orig/CMakeLists.txt 2011-12-04 16:54:49.940430354 -0800
++++ taglib-1.7/CMakeLists.txt 2011-12-04 16:55:25.020874157 -0800
+@@ -14,7 +14,7 @@
+ add_definitions(-DHAVE_CONFIG_H)
+
+ #add some KDE specific stuff
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
++set(LIB_SUFFIX "/${DEB_HOST_MULTIARCH}" CACHE STRING "Define suffix of
directory name (32/64)" )
+ set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base
directory for executables and libraries" FORCE)
+ #
+ ## the following are directories where stuff will be installed to
--- End Message ---
--- Begin Message ---
Source: taglib
Source-Version: 1.7-2
We believe that the bug you reported is fixed in the latest version of
taglib, which is due to be installed in the Debian FTP archive:
libtag1-dev_1.7-2_amd64.deb
to main/t/taglib/libtag1-dev_1.7-2_amd64.deb
libtag1-doc_1.7-2_all.deb
to main/t/taglib/libtag1-doc_1.7-2_all.deb
libtag1-rusxmms_1.7-2_amd64.deb
to main/t/taglib/libtag1-rusxmms_1.7-2_amd64.deb
libtag1-vanilla_1.7-2_amd64.deb
to main/t/taglib/libtag1-vanilla_1.7-2_amd64.deb
libtag1c2a_1.7-2_amd64.deb
to main/t/taglib/libtag1c2a_1.7-2_amd64.deb
libtagc0-dev_1.7-2_amd64.deb
to main/t/taglib/libtagc0-dev_1.7-2_amd64.deb
libtagc0_1.7-2_amd64.deb
to main/t/taglib/libtagc0_1.7-2_amd64.deb
taglib_1.7-2.debian.tar.gz
to main/t/taglib/taglib_1.7-2.debian.tar.gz
taglib_1.7-2.dsc
to main/t/taglib/taglib_1.7-2.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Modestas Vainius <[email protected]> (supplier of updated taglib package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 19 Feb 2012 21:47:28 +0200
Source: taglib
Binary: libtag1c2a libtag1-vanilla libtag1-rusxmms libtag1-dev libtag1-doc
libtagc0 libtagc0-dev
Architecture: source amd64 all
Version: 1.7-2
Distribution: unstable
Urgency: low
Maintainer: Modestas Vainius <[email protected]>
Changed-By: Modestas Vainius <[email protected]>
Description:
libtag1-dev - audio meta-data library - development files
libtag1-doc - audio meta-data library - API documentation
libtag1-rusxmms - audio meta-data library - RusXMMS flavour
libtag1-vanilla - audio meta-data library - vanilla flavour
libtag1c2a - audio meta-data library
libtagc0 - audio meta-data library - C bindings
libtagc0-dev - audio meta-data library - development files for C bindings
Closes: 651019 656226
Changes:
taglib (1.7-2) unstable; urgency=low
.
* Backport some fixes from upstream repository: (Closes: #656226)
- fix segfault when parsing some ID3v2 tags (patch
backport_id3v2_null_pointer.diff);
- partial protection against broken WMA files (patch
backport_protection_against_broken_wma_files.diff).
* Add Multi-arch support. (Closes: #651019) Implementation is mostly based on
the patch from Steve Langasek. The only difference is bumping debhelper
build dependency to 9.
* Pass visibility options via DEB_{CFLAGS,CXXFLAGS}_MAINT_APPEND in order to
inherit default flags from dh/dpkg-buildflags. This needs dpkg-dev 1.16.1
hence build depend on it.
* Enable parallel building.
* Update symbol file.
* Remove debian/libtag1-doc.lintian-overrides, no longer needed.
Checksums-Sha1:
03aa7e34f9f6b55e99d92fcdd10d33ef5b3f5b6e 1603 taglib_1.7-2.dsc
2b20383cef6f6293c25b783755883da136675d60 28116 taglib_1.7-2.debian.tar.gz
330e1065fc67dd6e4849d02ec9dad5c1c6fc78d4 8876 libtag1c2a_1.7-2_amd64.deb
4b6e6cca6d82d09a0caf35b32b2d053fde999c5a 243276 libtag1-vanilla_1.7-2_amd64.deb
08ea0d72d21f2ae04fd60e4799cd4f48f128afb9 246032 libtag1-rusxmms_1.7-2_amd64.deb
e50273ea400bcc2a9a67cb37a427d8f25f823f46 80570 libtag1-dev_1.7-2_amd64.deb
6995067e1f876c9cda9c40132bd0f3c5be972a60 5585662 libtag1-doc_1.7-2_all.deb
0d3c65b9ed0cd153cfc369c642daa676acf22c6a 14770 libtagc0_1.7-2_amd64.deb
6d50490f2d01ce0b18a4834fc32125d093f31b50 11922 libtagc0-dev_1.7-2_amd64.deb
Checksums-Sha256:
aba1080d98f7ca6cc49edb66bbb06b678cceacbe705264712c7cceb6c0687a73 1603
taglib_1.7-2.dsc
c4a191262cd8a9b1676c7c23a20cdd1180337951ac39513743f03ad858acc407 28116
taglib_1.7-2.debian.tar.gz
e94e2d3528b60fd5b7249f56330e3a23a660047038be4df848b5c8b642f62fc2 8876
libtag1c2a_1.7-2_amd64.deb
e7302cf0c1bf7245b6fe66434caa6b7303820ea5dd3a255360d05a2774919e0f 243276
libtag1-vanilla_1.7-2_amd64.deb
1d65a89c9b5ac2df51fdff213019ff6159d49aa3bac6839d90166097a4e18997 246032
libtag1-rusxmms_1.7-2_amd64.deb
3e363c1e6e9e029e5b59d75088e2dccde6c7cf6a05781dfc0d15e79bbf76dcd1 80570
libtag1-dev_1.7-2_amd64.deb
cffd1f169ee77c996cec18aa2e62f539c963c17f50daa8ad369e1acbec65cdd8 5585662
libtag1-doc_1.7-2_all.deb
729376901081d327670eed533f5566ccfade5c114ce5be0f9f096b779861ef2c 14770
libtagc0_1.7-2_amd64.deb
c16c3bbc57ef957bbeec7b91bc4452e3e0098585008ba3d3c6cbb65069f4787b 11922
libtagc0-dev_1.7-2_amd64.deb
Files:
a79d37eb8dbc36b642bd53121a613241 1603 libs optional taglib_1.7-2.dsc
70348ff4ff74cd054536c7838b823cfe 28116 libs optional taglib_1.7-2.debian.tar.gz
7d9797348adc14d9f1ee8d4a23a41de2 8876 libs optional libtag1c2a_1.7-2_amd64.deb
f2d306c695914f9a6c1550a7942bc6f5 243276 libs optional
libtag1-vanilla_1.7-2_amd64.deb
961456362f9507de41ea077d351cc449 246032 libs optional
libtag1-rusxmms_1.7-2_amd64.deb
d2d8a78d6136bbbaf5dec37051531812 80570 libdevel optional
libtag1-dev_1.7-2_amd64.deb
a8004581356997798694046d6c000378 5585662 doc optional libtag1-doc_1.7-2_all.deb
3a29322e9be14aa2789f38ff8712d756 14770 libs optional libtagc0_1.7-2_amd64.deb
d03138c34c81977bd3acbb2ba3040a10 11922 libdevel optional
libtagc0-dev_1.7-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk9BVSAACgkQHO9JRnPq4hSEUQCgkge0LAAdZdkPNexKo8ld9Ubr
fYoAoNWEOQgc91tfboqhk5LoiqKxRe0C
=HtKU
-----END PGP SIGNATURE-----
--- End Message ---
