[Pkg-kde-commits] rev 1216 - in people/dato/packages/trunk/amarok/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-06-11 23:06:55 +0000 (Sat, 11 Jun 2005)
New Revision: 1216

Added:
   people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff
Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Amarok 1.2.4 packaging, I forgot to commit when I uploaded.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-06-10 23:53:38 UTC (rev 1215)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-06-11 23:06:55 UTC (rev 1216)
@@ -1,3 +1,24 @@
+amarok (1.2.4-1) unstable; urgency=low
+
+  * The "following Debian Policy is cool, except when it's not" release.
+
+  * New upstream bugfix release:
+
+    + amaroK now correctly displays the name of the first available engine,
+      instead of an empty line. (Closes: #307949)
+
+  * The KDE Session Manager can now restore amaroK on login (closes: #302852,
+    #308099). Patch amarokapp to set its own argv[0] to 'amarok', since for the
+    session manager to restore an application the binary must be in the $PATH.
+
+  * Made the crash handler aware that amarokapp is in /usr/lib/amarok, and not
+    in /usr/bin.
+
+  * Include small patch to fix upstream bug 103510 ("systray icon continues
+    'playing' after songs end, if 'clear list' was hit while playing").
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Mon, 06 Jun 2005 00:08:28 +0200
+
 amarok (1.2.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff	2005-06-10 23:53:38 UTC (rev 1215)
+++ people/dato/packages/trunk/amarok/debian/patches/fix_103510.diff	2005-06-11 23:06:55 UTC (rev 1216)
@@ -0,0 +1,14 @@
+--- a/amarok/src/playlist.cpp    (revision 404174)
++++ b/amarok/src/playlist.cpp    (revision 404175)
+@@ -541,10 +541,7 @@
+         addSpecialTracks( songCount, AmarokConfig::partyType() );
+     }
+
+-    if( isEmpty() )
+-        return;
+-
+-    if( m_stopAfterCurrent )
++    if( isEmpty() || m_stopAfterCurrent )
+     {
+         m_stopAfterCurrent = false;
+         activate( 0 );

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	2005-06-10 23:53:38 UTC (rev 1215)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2005-06-11 23:06:55 UTC (rev 1216)
@@ -37,3 +37,43 @@
  
      vis = popen( "amarok_libvisual --list", "r" );
      str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+--- a/amarok/src/amarokcore/main.cpp
++++ b/amarok/src/amarokcore/main.cpp
+@@ -77,6 +77,8 @@
+     aboutData.addCredit( "Stefan Siegel", I18N_NOOP( "Patches, Bugfixes" ), "kde@sdas.de" );
+     aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode@gmx.net" );
+
++    argv[0] = qstrdup( "amarok" );
++
+     KApplication::disableAutoDcopRegistration();
+
+     App::initCliArgs( argc, argv );
+--- a/amarok/src/amarokcore/crashhandler.cpp
++++ b/amarok/src/amarokcore/crashhandler.cpp
+@@ -125,7 +125,7 @@
+             QCString gdb;
+             gdb  = "gdb --nw -n --batch -x ";
+             gdb += temp.name().latin1();
+-            gdb += " amarokapp ";
++            gdb += " /usr/lib/amarok/amarokapp ";
+             gdb += QCString().setNum( ::getppid() );
+
+             QString bt = runCommand( gdb );
+@@ -137,7 +137,7 @@
+             bt.stripWhiteSpace();
+
+             /// analyze usefulness
+-            const QString fileCommandOutput = runCommand( "file `which amarokapp`" );
++            const QString fileCommandOutput = runCommand( "file /usr/lib/amarok/amarokapp" );
+
+             if( fileCommandOutput.find( "not stripped", false ) == -1 )
+                 subject += "[___stripped]"; //same length as below
+@@ -173,7 +173,7 @@
+                 QFile file( path );
+                 file.open( IO_WriteOnly );
+                 QTextStream( &file )
+-                        << "==== file `which amarokapp` =======\n" << fileCommandOutput << "\n\n"
++                        << "==== file /usr/lib/amarok/amarokapp =======\n" << fileCommandOutput << "\n\n"
+                         << "==== (gdb) bt =====================\n" << bt << "\n\n"
+                         << "==== kdBacktrace() ================\n" << kdBacktrace();
+             }