[Pkg-kde-commits] rev 449 - in people/dato/packages/trunk/amarok/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Wed, 02 Feb 2005 11:40:34 +0100
Author: dato-guest
Date: 2005-02-02 11:40:33 +0100 (Wed, 02 Feb 2005)
New Revision: 449
Modified:
people/dato/packages/trunk/amarok/debian/changelog
people/dato/packages/trunk/amarok/debian/control
people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
people/dato/packages/trunk/amarok/debian/rules
Log:
Updates for beta4.
Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog 2005-02-01 17:52:00 UTC (rev 448)
+++ people/dato/packages/trunk/amarok/debian/changelog 2005-02-02 10:40:33 UTC (rev 449)
@@ -1,10 +1,18 @@
-amarok (1.2-beta3-1) staging; urgency=low
+amarok (1.2-beta4-1) staging; urgency=low
- * Packaged third 1.2 beta from upstream:
+ * Packaged fourth 1.2 beta from upstream:
+ the search text input element is now cleared when the user writes
something there. (Closes: #278359)
+ + analyzers work with the XINE engine. (Closes: #287091)
+
+ * amaroK's collection can be now stored in a MySQL database:
+
+ + Build-Depend on libmysqlclient12-dev
+
+ + Pass --enable-mysql to configure.
+
* amaroK now includes a sidebar plugin for amarok:
+ debian/amarok.install:
@@ -31,7 +39,7 @@
+ debian/amarok.install:
- install amarok.profile.xml into /usr/share/apps/profiles.
- -- Adeodato Simó <asp16@alu.ua.es> Sat, 15 Jan 2005 18:23:54 +0100
+ -- Adeodato Simó <asp16@alu.ua.es> Wed, 02 Feb 2005 11:11:10 +0100
amarok (1.1.1-2) unstable; urgency=high
Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control 2005-02-01 17:52:00 UTC (rev 448)
+++ people/dato/packages/trunk/amarok/debian/control 2005-02-02 10:40:33 UTC (rev 449)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Adeodato Simó <asp16@alu.ua.es>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient12-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
Standards-Version: 3.6.1
Package: amarok
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-02-01 17:52:00 UTC (rev 448)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch 2005-02-02 10:40:33 UTC (rev 449)
@@ -1,26 +1,26 @@
---- amarok/src/loader/loader.cpp.orig 2004-09-23 21:17:31.000000000 +0200
-+++ amarok/src/loader/loader.cpp 2004-09-23 21:18:21.000000000 +0200
-@@ -88,7 +88,7 @@
- //and if we did it KCmdLineArgs would make us exit!
- //TODO add all arguments or something
+--- a/amarok/src/loader/loader.cpp
++++ b/amarok/src/loader/loader.cpp
+@@ -66,7 +66,7 @@
+ // this argument cannot be passed to the running amarokapp
+ // or KCmdLineArgs would exit the application
-- QProcess proc( QString("amarokapp") );
-+ QProcess proc( QString("/usr/lib/amarok/amarokapp") );
- proc.setCommunication( 0 );
- proc.addArgument( arg );
- proc.start();
-@@ -122,7 +122,7 @@
- //no, amaroK is not running -> start new instance, show splash
- std::cout << "[amaroK loader] amaroK not running. Trying to start it..\n";
+- QProcess proc( QString("amarokapp") );
++ QProcess proc( QString("/usr/lib/amarok/amarokapp") );
+ proc.setCommunication( 0 ); //show everything
+ proc.addArgument( arg );
+ proc.start();
+@@ -141,7 +141,7 @@
+ if( !QApplication::isSessionRestored() && isSplashEnabled() )
+ m_splash = new Splash;
-- QStringList args( "amarokapp" );
-+ QStringList args( "/usr/lib/amarok/amarokapp" );
- for ( int i = 1; i < argc; i++ ) args << argv[ i ]; //start at 1 to avoid appName
+- args.prepend( "amarokapp" );
++ args.prepend( "/usr/lib/amarok/amarokapp" );
- QProcess proc( args );
---- amarok/src/socketserver.cpp 2004-09-23 18:15:16.000000000 +0200
-+++ amarok/src/socketserver.cpp.debian 2004-09-23 18:17:57.000000000 +0200
-@@ -250,14 +250,14 @@
+ m_proc = new QProcess( args, this );
+ m_proc->setCommunication( QProcess::Stdout );
+--- a/amarok/src/socketserver.cpp
++++ b/amarok/src/socketserver.cpp
+@@ -169,14 +169,14 @@
//can I get a pointer to the data section of a QCString?
char str[4096];
@@ -29,11 +29,11 @@
str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
pclose( vis );
- QStringList entries = QStringList::split( '\n', str );
+ QStringList entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) );
for( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
-- new Item( this, "amarok_xmmswrapper2", *it );
-+ new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it );
+- new Item( this, "amarok_xmmswrapper2", *it, "xmms" );
++ new Item( this, "/usr/lib/amarok/amarok_xmmswrapper2", *it, "xmms" );
vis = popen( "amarok_libvisual --list", "r" );
str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules 2005-02-01 17:52:00 UTC (rev 448)
+++ people/dato/packages/trunk/amarok/debian/rules 2005-02-02 10:40:33 UTC (rev 449)
@@ -11,7 +11,8 @@
DEB_DH_SHLIBDEPS_ARGS := -Xusr/lib/amarok/amarok_xmmswrapper2 \
-Xusr/lib/kde3/konqsidebar_universalamarok.so
-DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite
+DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite \
+ --enable-mysql
### COMMON STUFF
common-binary-arch::