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

[Adeodato Simó]

Author: adeodato
Date: 2006-04-15 18:17:06 +0000 (Sat, 15 Apr 2006)
New Revision: 3553

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
Log:
Packaging amarok 1.4-beta3.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2006-04-14 18:11:38 UTC (rev 3552)
+++ people/dato/packages/trunk/amarok/debian/changelog	2006-04-15 18:17:06 UTC (rev 3553)
@@ -1,3 +1,11 @@
+amarok (1.4-beta3c-1) experimental; urgency=low
+
+  * Third beta for the upcoming 1.4 version packaged.
+
+  * Build against libtunepimp3-dev.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Sat, 15 Apr 2006 19:47:54 +0200
+
 amarok (1.4-beta2-3) experimental; urgency=low
 
   * Rebuild against libmysqlclient15off. (Closes: #358490)

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2006-04-14 18:11:38 UTC (rev 3552)
+++ people/dato/packages/trunk/amarok/debian/control	2006-04-15 18:17:06 UTC (rev 3553)
@@ -5,7 +5,7 @@
 Build-Depends: cdbs, debhelper, quilt, bzip2, automake1.9, libtool,
  kdelibs4-dev, kdemultimedia-dev, kdebase-dev,
  libgstreamer0.10-dev, libxine-dev,
- libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp2-dev,
+ libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp3-dev,
  libmysqlclient15-dev, libpq-dev,
  xmms-dev, libvisual0.2-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-dev

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-04-14 18:11:38 UTC (rev 3552)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-04-15 18:17:06 UTC (rev 3553)
@@ -26,7 +26,7 @@
      char str[4096];
 -    FILE *vis = popen( "amarok_xmmswrapper2 --list", "r" );
 +    FILE *vis = popen( "/usr/lib/amarok/amarok_xmmswrapper2 --list", "r" );
-     str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+     str[ fread( static_cast<void*>( str ), sizeof(char), 4096, vis ) ] = '\0';
      pclose( vis );
  
      QStringList entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) );
@@ -37,7 +37,7 @@
  
 -    vis = popen( "amarok_libvisual --list", "r" );
 +    vis = popen( "/usr/lib/amarok/amarok_libvisual --list", "r" );
-     str[ fread( (void*)str, sizeof(char), 4096, vis ) ] = '\0';
+     str[ fread( static_cast<void*>( str ), sizeof(char), 4096, vis ) ] = '\0';
      pclose( vis );
  
      entries = QStringList::split( '\n', QString::fromLocal8Bit( str ) );
@@ -99,7 +99,7 @@
      *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 @@
+@@ -396,7 +396,7 @@
          m_scanner = new ScannerProcIO();
          connect( m_scanner, SIGNAL( readReady( KProcIO* ) ), SLOT( slotReadReady() ) );