rev 4995 - in people/ana/packages/amarok/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2006-11-26 03:34:35 +0100 (Sun, 26 Nov 2006)
New Revision: 4995

Added:
   people/ana/packages/amarok/debian/patches/invoke_browser.patch
Modified:
   people/ana/packages/amarok/debian/README.Debian
   people/ana/packages/amarok/debian/changelog
   people/ana/packages/amarok/debian/patches/series
   people/ana/packages/amarok/debian/rules
Log:
Changes for amarok 1.4.4-0.3


Modified: people/ana/packages/amarok/debian/README.Debian
===================================================================
--- people/ana/packages/amarok/debian/README.Debian	2006-11-26 02:32:52 UTC (rev 4994)
+++ people/ana/packages/amarok/debian/README.Debian	2006-11-26 02:34:35 UTC (rev 4995)
@@ -17,15 +17,6 @@
       some other packages for them to work. Those packages are listed in
       the Suggests: field of the amarok package.
 
-    - these Debian packages ship the amarokapp and amarok_xmmswrapper2
-      binaries in /usr/lib/amarok instead of /usr/bin, which upstream
-      does. This is done to comply with Debian Policy, which mandates
-      that binaries not meant to be invoked by the user shall not reside
-      in /usr/bin.
-
-      You should experience no problems because of this change. If you
-      do, please let me know.
-
   Also, users not using the full KDE environment may get the following
   error when executing amarok for the first time: "Socket-path is not a
   link or a directory: /home/$USER/.kde/socket-$HOSTNAME". Just execute:

Modified: people/ana/packages/amarok/debian/changelog
===================================================================
--- people/ana/packages/amarok/debian/changelog	2006-11-26 02:32:52 UTC (rev 4994)
+++ people/ana/packages/amarok/debian/changelog	2006-11-26 02:34:35 UTC (rev 4995)
@@ -1,3 +1,13 @@
+amarok (1.4.4-0.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Applied patch invoke_browser.patch to allow amarok open external URLs.
+    (Closes: #397266).
+  * Removed dependency on xmms and updated README.Debian. Thanks to Bryan 
+    Donlan and Michael Biebl. (Closes: #393141) 
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 19 Nov 2006 02:50:39 +0100
+
 amarok (1.4.4-0.2) unstable; urgency=low
 
   * Non-maintainer upload.

Added: people/ana/packages/amarok/debian/patches/invoke_browser.patch
===================================================================
--- people/ana/packages/amarok/debian/patches/invoke_browser.patch	2006-11-26 02:32:52 UTC (rev 4994)
+++ people/ana/packages/amarok/debian/patches/invoke_browser.patch	2006-11-26 02:34:35 UTC (rev 4995)
@@ -0,0 +1,13 @@
+--- amarok/src/app.cpp.orig	2006-11-19 02:22:07.000000000 +0100
++++ amarok/src/app.cpp	2006-11-19 02:22:46.000000000 +0100
+@@ -1219,7 +1219,9 @@
+     bool invokeBrowser( const QString& url )
+     {
+         //URL can be in whatever forms KURL::fromPathOrURL understands - ie most.
+-        return KRun::run( AmarokConfig::externalBrowser(), KURL::List( KURL::fromPathOrURL( url ) ) ) > 0;
++	const QString cmd = "%1 \"%2\"";
++	return KRun::runCommand( cmd.arg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0;
++
+     }
+ 
+     namespace ColorScheme

Modified: people/ana/packages/amarok/debian/patches/series
===================================================================
--- people/ana/packages/amarok/debian/patches/series	2006-11-26 02:32:52 UTC (rev 4994)
+++ people/ana/packages/amarok/debian/patches/series	2006-11-26 02:34:35 UTC (rev 4995)
@@ -5,3 +5,4 @@
 disable-final.diff -p0
 revert-fix-for-bug-116127.diff -p0
 sparc-asm.patch -p0
+invoke_browser.patch -p0

Modified: people/ana/packages/amarok/debian/rules
===================================================================
--- people/ana/packages/amarok/debian/rules	2006-11-26 02:32:52 UTC (rev 4994)
+++ people/ana/packages/amarok/debian/rules	2006-11-26 02:34:35 UTC (rev 4995)
@@ -13,7 +13,7 @@
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -n
 DEB_INSTALL_DIRS_amarok    := usr/lib/amarok
-DEB_DH_SHLIBDEPS_ARGS	   := -Xusr/lib/amarok/amarok_xmmswrapper2 \
+DEB_DH_SHLIBDEPS_ARGS	   := -Xusr/bin/amarok_xmmswrapper2 \
 			      -Xusr/lib/kde3/konqsidebar_universalamarok.so
 
 DEB_CONFIGURE_EXTRA_FLAGS  :=	--without-included-sqlite \