diff -Nru taglib-1.8/debian/changelog taglib-1.8/debian/changelog --- taglib-1.8/debian/changelog 2012-09-15 20:47:36.000000000 +0000 +++ taglib-1.8/debian/changelog 2012-09-23 07:47:42.000000000 +0000 @@ -1,4 +1,4 @@ -taglib (1.8-0precise16) precise; urgency=high +taglib (1.8-0precise17) precise; urgency=high [ wsnipex ] * initial release @@ -7,4 +7,7 @@ * install to /opt/taglib-1.8, do not break loads of taglib 1.7 dependent packages * very dirty hack - symlink stuff to /usr/local as xbmc won't build otherwise + [ wsnipex ] + * build static library, shared ones still make problems for some users + -- wsnipex Sat, 15 Sep 2012 22:47:30 +0200 diff -Nru taglib-1.8/debian/postinst taglib-1.8/debian/postinst --- taglib-1.8/debian/postinst 2012-09-15 20:46:27.000000000 +0000 +++ taglib-1.8/debian/postinst 2012-09-23 07:47:42.000000000 +0000 @@ -23,22 +23,16 @@ [ -d /usr/local/lib/pkgconfig ] || mkdir -p /usr/local/lib/pkgconfig [ -h /usr/local/lib/pkgconfig/taglib.pc ] || ln -s /opt/taglib-1.8/lib/pkgconfig/taglib.pc /usr/local/lib/pkgconfig/taglib.pc [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] || ln -s /opt/taglib-1.8/lib/pkgconfig/taglib_c.pc /usr/local/lib/pkgconfig/taglib_c.pc - [ -h /usr/local/lib/libtag.so.1 ] || ln /opt/taglib-1.8/lib/libtag.so.1 /usr/local/lib/libtag.so.1 - [ -h /usr/local/lib/libtag.so.1.12.0 ] || ln -s /opt/taglib-1.8/lib/libtag.so.1.12.0 /usr/local/lib/libtag.so.1.12.0 - [ -h /usr/local/lib/libtag.so ] || ln -s /opt/taglib-1.8/lib/libtag.so /usr/local/lib/libtag.so - [ -h /usr/local/lib/libtag_c.so ] || ln -s /opt/taglib-1.8/lib/libtag_c.so /usr/local/lib/libtag_c.so - [ -h /usr/local/lib/libtag_c.so.0 ] || ln -s /opt/taglib-1.8/lib/libtag_c.so.0 /usr/local/lib/libtag_c.so.0 + [ -f /usr/local/lib/libtag.a ] || ln -s /opt/taglib-1.8/lib/libtag.a /usr/local/lib/libtag.a + [ -f /usr/local/lib/libtag_c.a ] || ln -s /opt/taglib-1.8/lib/libtag_c.a /usr/local/lib/libtag_c.a [ -d /usr/local/include ] || mkdir /usr/local/include [ -h /usr/local/include/taglib ] || ln -s /opt/taglib-1.8/include/taglib /usr/local/include/taglib ;; abort-upgrade|abort-remove|abort-deconfigure) [ -d /usr/local/include/taglib ] && rm -rf /usr/local/include/taglib - [ -h /usr/local/lib/libtag_c.so.0 ] && rm /usr/local/lib/libtag_c.so.0 - [ -h /usr/local/lib/libtag_c.so ] && rm /usr/local/lib/libtag_c.so - [ -h /usr/local/lib/libtag.so ] && rm /usr/local/lib/libtag.so - [ -h /usr/local/lib/libtag.so.1.12.0 ] && rm /usr/local/lib/libtag.so.1.12.0 - [ -h /usr/local/lib/libtag.so.1 ] && rm /usr/local/lib/libtag.so.1 + [ -h /usr/local/lib/libtag.a ] && rm /usr/local/lib/libtag.a + [ -h /usr/local/lib/libtag_c.a ] && rm /usr/local/lib/libtag_c.a [ -h /usr/local/lib/pkgconfig/taglib.pc ] && rm /usr/local/lib/pkgconfig/taglib.pc [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] && rm /usr/local/lib/pkgconfig/taglib_c.pc diff -Nru taglib-1.8/debian/postinst.old taglib-1.8/debian/postinst.old --- taglib-1.8/debian/postinst.old 1970-01-01 00:00:00.000000000 +0000 +++ taglib-1.8/debian/postinst.old 2012-09-23 07:47:42.000000000 +0000 @@ -0,0 +1,58 @@ +#!/bin/bash +# postinst script for libtag1x8 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + [ -d /usr/local/lib/pkgconfig ] || mkdir -p /usr/local/lib/pkgconfig + [ -h /usr/local/lib/pkgconfig/taglib.pc ] || ln -s /opt/taglib-1.8/lib/pkgconfig/taglib.pc /usr/local/lib/pkgconfig/taglib.pc + [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] || ln -s /opt/taglib-1.8/lib/pkgconfig/taglib_c.pc /usr/local/lib/pkgconfig/taglib_c.pc + [ -h /usr/local/lib/libtag.so.1 ] || ln /opt/taglib-1.8/lib/libtag.so.1 /usr/local/lib/libtag.so.1 + [ -h /usr/local/lib/libtag.so.1.12.0 ] || ln -s /opt/taglib-1.8/lib/libtag.so.1.12.0 /usr/local/lib/libtag.so.1.12.0 + [ -h /usr/local/lib/libtag.so ] || ln -s /opt/taglib-1.8/lib/libtag.so /usr/local/lib/libtag.so + [ -h /usr/local/lib/libtag_c.so ] || ln -s /opt/taglib-1.8/lib/libtag_c.so /usr/local/lib/libtag_c.so + [ -h /usr/local/lib/libtag_c.so.0 ] || ln -s /opt/taglib-1.8/lib/libtag_c.so.0 /usr/local/lib/libtag_c.so.0 + [ -d /usr/local/include ] || mkdir /usr/local/include + [ -h /usr/local/include/taglib ] || ln -s /opt/taglib-1.8/include/taglib /usr/local/include/taglib + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + [ -d /usr/local/include/taglib ] && rm -rf /usr/local/include/taglib + [ -h /usr/local/lib/libtag_c.so.0 ] && rm /usr/local/lib/libtag_c.so.0 + [ -h /usr/local/lib/libtag_c.so ] && rm /usr/local/lib/libtag_c.so + [ -h /usr/local/lib/libtag.so ] && rm /usr/local/lib/libtag.so + [ -h /usr/local/lib/libtag.so.1.12.0 ] && rm /usr/local/lib/libtag.so.1.12.0 + [ -h /usr/local/lib/libtag.so.1 ] && rm /usr/local/lib/libtag.so.1 + [ -h /usr/local/lib/pkgconfig/taglib.pc ] && rm /usr/local/lib/pkgconfig/taglib.pc + [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] && rm /usr/local/lib/pkgconfig/taglib_c.pc + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru taglib-1.8/debian/postrm taglib-1.8/debian/postrm --- taglib-1.8/debian/postrm 2012-09-15 20:37:46.000000000 +0000 +++ taglib-1.8/debian/postrm 2012-09-23 07:47:42.000000000 +0000 @@ -21,11 +21,8 @@ case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) [ -d /usr/local/include/taglib ] && rm -rf /usr/local/include/taglib - [ -h /usr/local/lib/libtag_c.so.0 ] && rm /usr/local/lib/libtag_c.so.0 - [ -h /usr/local/lib/libtag_c.so ] && rm /usr/local/lib/libtag_c.so - [ -h /usr/local/lib/libtag.so ] && rm /usr/local/lib/libtag.so - [ -h /usr/local/lib/libtag.so.1.12.0 ] && rm /usr/local/lib/libtag.so.1.12.0 - [ -h /usr/local/lib/libtag.so.1 ] && rm /usr/local/lib/libtag.so.1 + [ -h /usr/local/lib/libtag.a ] && rm /usr/local/lib/libtag.a + [ -h /usr/local/lib/libtag_c.a ] && rm /usr/local/lib/libtag_c.a [ -h /usr/local/lib/pkgconfig/taglib.pc ] && rm /usr/local/lib/pkgconfig/taglib.pc [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] && rm /usr/local/lib/pkgconfig/taglib_c.pc ;; diff -Nru taglib-1.8/debian/postrm.old taglib-1.8/debian/postrm.old --- taglib-1.8/debian/postrm.old 1970-01-01 00:00:00.000000000 +0000 +++ taglib-1.8/debian/postrm.old 2012-09-23 07:47:42.000000000 +0000 @@ -0,0 +1,44 @@ +#!/bin/sh +# postrm script for libtag1x8 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + [ -d /usr/local/include/taglib ] && rm -rf /usr/local/include/taglib + [ -h /usr/local/lib/libtag_c.so.0 ] && rm /usr/local/lib/libtag_c.so.0 + [ -h /usr/local/lib/libtag_c.so ] && rm /usr/local/lib/libtag_c.so + [ -h /usr/local/lib/libtag.so ] && rm /usr/local/lib/libtag.so + [ -h /usr/local/lib/libtag.so.1.12.0 ] && rm /usr/local/lib/libtag.so.1.12.0 + [ -h /usr/local/lib/libtag.so.1 ] && rm /usr/local/lib/libtag.so.1 + [ -h /usr/local/lib/pkgconfig/taglib.pc ] && rm /usr/local/lib/pkgconfig/taglib.pc + [ -h /usr/local/lib/pkgconfig/taglib_c.pc ] && rm /usr/local/lib/pkgconfig/taglib_c.pc + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru taglib-1.8/debian/rules taglib-1.8/debian/rules --- taglib-1.8/debian/rules 2012-09-15 08:13:14.000000000 +0000 +++ taglib-1.8/debian/rules 2012-09-23 07:47:42.000000000 +0000 @@ -3,7 +3,7 @@ #export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden #export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=/opt/taglib-1.8 -DCMAKE_RELEASE_TYPE=Release +CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=/opt/taglib-1.8 -DENABLE_STATIC=1 -DCMAKE_RELEASE_TYPE=Release DH_AUTO_ARGS = --buildsystem=cmake override_dh_auto_configure: