rev 3164 - in people/dato/packages/trunk/amarok/debian: . patches

Adeodato Simó adeodato at costa.debian.org
Sun Feb 19 19:09:47 UTC 2006


Author: adeodato
Date: 2006-02-19 19:09:46 +0000 (Sun, 19 Feb 2006)
New Revision: 3164

Modified:
   people/dato/packages/trunk/amarok/debian/amarok.install
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Install new file, not in /usr/bin but in /usr/lib/amarok; update
some-binaries-in-usr-lib.patch accordingly.


Modified: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install	2006-02-19 19:00:18 UTC (rev 3163)
+++ people/dato/packages/trunk/amarok/debian/amarok.install	2006-02-19 19:09:46 UTC (rev 3164)
@@ -22,9 +22,10 @@
 debian/tmp/usr/lib/libamarok.*
 
 debian/tmp/usr/bin/amarok
-debian/tmp/usr/bin/amarokapp		/usr/lib/amarok
-debian/tmp/usr/bin/amarok_libvisual	/usr/lib/amarok
-debian/tmp/usr/bin/amarok_xmmswrapper2	/usr/lib/amarok
+debian/tmp/usr/bin/amarokapp			/usr/lib/amarok
+debian/tmp/usr/bin/amarok_libvisual		/usr/lib/amarok
+debian/tmp/usr/bin/amarok_xmmswrapper2		/usr/lib/amarok
+debian/tmp/usr/bin/amarokcollectionscanner	/usr/lib/amarok
 
 debian/tmp/etc/*
 

Modified: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-02-19 19:00:18 UTC (rev 3163)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-02-19 19:09:46 UTC (rev 3164)
@@ -88,3 +88,23 @@
                  body += fileCommandOutput + "\n\n";
                  body += "==== (gdb) bt =====================\n";
                  body += bt + "\n\n";
+--- amarok/src/scancontroller.cpp.orig
++++ amarok/src/scancontroller.cpp
+@@ -92,7 +92,7 @@
+     connect( m_scanner, SIGNAL( readReady( KProcIO* ) ), SLOT( slotReadReady() ) );
+ 
+ 
+-    *m_scanner << "amarokcollectionscanner";
++    *m_scanner << "/usr/lib/amarok/amarokcollectionscanner";
+     *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV
+ 
+     // KProcess must be started from the GUI thread, so we're invoking the scanner
+@@ -392,7 +392,7 @@
+         m_scanner = new ScannerProcIO();
+         connect( m_scanner, SIGNAL( readReady( KProcIO* ) ), SLOT( slotReadReady() ) );
+ 
+-        *m_scanner << "amarokcollectionscanner";
++        *m_scanner << "/usr/lib/amarok/amarokcollectionscanner";
+         *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV
+         if( m_incremental ) *m_scanner << "-i";
+         *m_scanner << "-s";




More information about the pkg-kde-commits mailing list