diff -Nru taglib-1.8/debian/changelog taglib-1.8/debian/changelog --- taglib-1.8/debian/changelog 2012-09-13 18:30:55.000000000 +0000 +++ taglib-1.8/debian/changelog 2012-09-17 18:10:36.000000000 +0000 @@ -1,3 +1,9 @@ +taglib (1.8-1~ppa3~lucid) lucid; urgency=low + + * Drop multiarch support + + -- Nathan Rennie-Waldock Mon, 17 Sep 2012 19:10:36 +0100 + taglib (1.8-1~ppa2~lucid) lucid; urgency=low * Upload to PPA diff -Nru taglib-1.8/debian/control taglib-1.8/debian/control --- taglib-1.8/debian/control 2012-09-12 09:25:19.000000000 +0000 +++ taglib-1.8/debian/control 2012-09-17 18:10:17.000000000 +0000 @@ -12,7 +12,6 @@ Package: libtag1c2a Architecture: any -Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libtag1-vanilla (= ${binary:Version}), ${misc:Depends} Conflicts: libtag-extras0 @@ -29,7 +28,6 @@ Package: libtag1-vanilla Architecture: any -Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libtag1-rusxmms, libtag-extras0 @@ -47,7 +45,6 @@ Package: libtag1-dev Section: libdevel Architecture: any -Multi-Arch: same Depends: libtag1c2a (= ${binary:Version}), ${misc:Depends} Description: audio meta-data library - development files TagLib is a library for reading and editing the meta-data of several popular @@ -74,7 +71,6 @@ Package: libtagc0 Architecture: any -Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: audio meta-data library - C bindings @@ -89,7 +85,6 @@ 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 diff -Nru taglib-1.8/debian/libtag1-dev.install taglib-1.8/debian/libtag1-dev.install --- taglib-1.8/debian/libtag1-dev.install 2012-09-12 09:21:32.000000000 +0000 +++ taglib-1.8/debian/libtag1-dev.install 2012-09-17 18:10:49.000000000 +0000 @@ -1,5 +1,5 @@ usr/include/taglib -usr/lib/*/libtag.so -usr/lib/*/pkgconfig/taglib.pc +usr/lib/libtag.so +usr/lib/pkgconfig/taglib.pc usr/bin/taglib-config diff -Nru taglib-1.8/debian/libtag1-rusxmms.install taglib-1.8/debian/libtag1-rusxmms.install --- taglib-1.8/debian/libtag1-rusxmms.install 2012-09-12 09:13:01.000000000 +0000 +++ taglib-1.8/debian/libtag1-rusxmms.install 2012-09-17 18:10:51.000000000 +0000 @@ -1 +1 @@ -usr/lib/*/libtag.so.1* +usr/lib/libtag.so.1* diff -Nru taglib-1.8/debian/libtag1-vanilla.install taglib-1.8/debian/libtag1-vanilla.install --- taglib-1.8/debian/libtag1-vanilla.install 2012-09-12 09:13:01.000000000 +0000 +++ taglib-1.8/debian/libtag1-vanilla.install 2012-09-17 18:10:53.000000000 +0000 @@ -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.8/debian/libtagc0-dev.install taglib-1.8/debian/libtagc0-dev.install --- taglib-1.8/debian/libtagc0-dev.install 2012-09-12 09:21:06.000000000 +0000 +++ taglib-1.8/debian/libtagc0-dev.install 2012-09-17 18:10:56.000000000 +0000 @@ -1,2 +1,2 @@ -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.8/debian/libtagc0.install taglib-1.8/debian/libtagc0.install --- taglib-1.8/debian/libtagc0.install 2012-09-12 09:13:01.000000000 +0000 +++ taglib-1.8/debian/libtagc0.install 2012-09-17 18:11:01.000000000 +0000 @@ -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.8/debian/rules taglib-1.8/debian/rules --- taglib-1.8/debian/rules 2012-09-12 09:13:01.000000000 +0000 +++ taglib-1.8/debian/rules 2012-09-17 18:10:06.000000000 +0000 @@ -2,9 +2,8 @@ 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 -DLIB_INSTALL_DIR:PATH=/usr/lib/$(DEB_HOST_MULTIARCH) -DCMAKE_RELEASE_TYPE=Release +CMAKE_ARGS = -DCMAKE_USE_RELATIVE_PATHS=ON -DWITH_ASF=ON -DWITH_MP4=ON -DLIB_INSTALL_DIR:PATH=/usr/lib -DCMAKE_RELEASE_TYPE=Release DH_AUTO_ARGS = --buildsystem=cmake QUILT := quilt --quiltrc /dev/null MAKE_ME = $(MAKE) -f $(lastword $(MAKEFILE_LIST))