tags 392392 patch forwarded 392392 http://bugs.kde.org/show_bug.cgi?id=136185 stop
Here is a patch that makes the libhttp11.so* files install to /usr/lib rather than /usr/share. I tested as much DAAP and ruby-script functionality as I could and nothing seemed to be broken by it. After that, I spoke with eeanm on the #amarok IRC channel: < eeanm> nothing is affected in 1.4.3 by this < eeanm> so debian would be fine applying that patch < tedp> so, it's actually unused code in 1.4.3? < eeanm> yes The first part of the patch is actually unnecessary because the files are unused, but I thought they might end up being installed there in a future release when they are used. -Ted
diff -ruN amarok-1.4.3/debian/amarok.install amarok-1.4.3-new/debian/amarok.install --- amarok-1.4.3/debian/amarok.install 2006-10-23 23:17:35.000000000 +1000 +++ amarok-1.4.3-new/debian/amarok.install 2006-10-23 23:15:27.000000000 +1000 @@ -55,6 +55,7 @@ debian/tmp/usr/lib/kde3/libamarok_daap-mediadevice.so debian/tmp/usr/share/services/amarok_daap-mediadevice.desktop +debian/tmp/usr/lib/amarok/* debian/tmp/usr/lib/libamarok.* debian/tmp/usr/bin/amarok diff -ruN amarok-1.4.3/debian/patches/daap_libhttp11_location.patch amarok-1.4.3-new/debian/patches/daap_libhttp11_location.patch --- amarok-1.4.3/debian/patches/daap_libhttp11_location.patch 1970-01-01 10:00:00.000000000 +1000 +++ amarok-1.4.3-new/debian/patches/daap_libhttp11_location.patch 2006-10-23 23:15:29.000000000 +1000 @@ -0,0 +1,9 @@ +diff -ru amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am amarok-1.4.3-new/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am +--- amarok-1.4.3/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am 2006-09-05 12:42:40.000000000 +1000 ++++ amarok-1.4.3-new/amarok/src/mediadevice/daap/mongrel/http11/Makefile.am 2006-10-23 21:25:30.000000000 +1000 +@@ -1,4 +1,4 @@ +-amarokrubylibdir = $(kde_datadir)/amarok/ruby_lib ++amarokrubylibdir = $(libexecdir)/ruby_lib + + amarokrubylib_LTLIBRARIES = libhttp11.la + diff -ruN amarok-1.4.3/debian/patches/series amarok-1.4.3-new/debian/patches/series --- amarok-1.4.3/debian/patches/series 2006-10-23 23:17:35.000000000 +1000 +++ amarok-1.4.3-new/debian/patches/series 2006-10-23 23:15:29.000000000 +1000 @@ -5,3 +5,4 @@ disable-final.diff -p0 revert-fix-for-bug-116127.diff -p0 143_provided_upstream_playlist_encoding.diff -p0 +daap_libhttp11_location.patch -p1
signature.asc
Description: OpenPGP digital signature
