rev 13925 - in kde-extras/amarok/trunk/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Mon Mar 2 07:35:14 UTC 2009 

Author: modax-guest
Date: 2009-03-02 07:35:14 +0000 (Mon, 02 Mar 2009)
New Revision: 13925

Added:
   kde-extras/amarok/trunk/debian/patches/21_fix_libmtp-0.3.0-API.diff
   kde-extras/amarok/trunk/debian/patches/22_fix_wikipedia_tab.diff
Removed:
   kde-extras/amarok/trunk/debian/amarok-konqsidebar.install
Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/control
   kde-extras/amarok/trunk/debian/patches/series
Log:
* Rebuild for libmtp8 0.3.6. Steal the patch (21_fix_libmtp-0.3.0-API.diff)
  from ubuntu (Closes: #516557).
* Bump libmtp-dev build depend to >= 0.3.0.
* Remove amarok-konqsidebar package to drop kdebase-dev build depend.
* Fix Wikipedia tab (patch 22_fix_wikipedia_tab.diff) (Closes: #512847).

Deleted: kde-extras/amarok/trunk/debian/amarok-konqsidebar.install

Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2009-03-02 01:30:11 UTC (rev 13924)
+++ kde-extras/amarok/trunk/debian/changelog	2009-03-02 07:35:14 UTC (rev 13925)
@@ -1,3 +1,13 @@
+amarok (1.4.10-3) unstable; urgency=low
+
+  * Rebuild for libmtp8 0.3.6. Steal the patch (21_fix_libmtp-0.3.0-API.diff)
+    from ubuntu (Closes: #516557).
+  * Bump libmtp-dev build depend to >= 0.3.0.
+  * Remove amarok-konqsidebar package to drop kdebase-dev build depend.
+  * Fix Wikipedia tab (patch 22_fix_wikipedia_tab.diff) (Closes: #512847).
+
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 02 Mar 2009 01:16:27 +0200
+
 amarok (1.4.10-2) unstable; urgency=high
 
   * Add 20_security_audible_tags.diff patch to fix integer overflow while

Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control	2009-03-02 01:30:11 UTC (rev 13924)
+++ kde-extras/amarok/trunk/debian/control	2009-03-02 07:35:14 UTC (rev 13925)
@@ -5,12 +5,12 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, libtool,
- kdelibs4-dev, kdebase-dev,
+ kdelibs4-dev,
  libxine-dev, libdbus-qt-1-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libkarma-dev, libmtp-dev,
+ libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libkarma-dev, libmtp-dev (>= 0.3.0),
  ruby, ruby1.8-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/amarok/trunk/
@@ -61,15 +61,6 @@
  and/or playlist2html scripts. You will also need python-qt3 for the
  WebControl script.
 
-Package: amarok-konqsidebar
-Architecture: any
-Depends: amarok (= ${binary:Version}), konqueror (>= 4:3.0.0), konqueror (<< 4:3.90.0), ${shlibs:Depends}
-Replaces: amarok (<= 1.4.8-1)
-Description: Amarok sidebar for konqueror 3.x.x
- This package contains the Amarok sidebar plugin for konqueror from KDE 3
- series. The sidebar provides a convenient way for a user to control amarok
- directly from the running konqueror instance.
-
 Package: amarok-engines
 Architecture: all
 Depends: amarok-engine-xine (>= ${source:Version}), amarok-engine-yauap (>= ${source:Version})

Added: kde-extras/amarok/trunk/debian/patches/21_fix_libmtp-0.3.0-API.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/21_fix_libmtp-0.3.0-API.diff	                        (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/21_fix_libmtp-0.3.0-API.diff	2009-03-02 07:35:14 UTC (rev 13925)
@@ -0,0 +1,44 @@
+--- amarok-1.4.10.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2008-08-14 19:10:25.000000000 +0200
++++ amarok-1.4.10/amarok/src/mediadevice/mtp/mtpmediadevice.cpp	2008-08-14 19:10:33.000000000 +0200
+@@ -293,12 +293,13 @@
+         parent_id = getDefaultParentId();
+     }
+     debug() << "Parent id : " << parent_id << endl;
++    trackmeta->parent_id = parent_id;
+ 
+     m_critical_mutex.lock();
+     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
+     int ret = LIBMTP_Send_Track_From_File(
+         m_device, bundle.url().path().utf8(), trackmeta,
+-        progressCallback, this, parent_id
++        progressCallback, this
+     );
+     m_critical_mutex.unlock();
+ 
+@@ -529,7 +530,7 @@
+         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
+             album_object->tracks[i++] = it->track()->id();
+         album_object->no_tracks = items->count();
+-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
++        ret = LIBMTP_Create_New_Album( m_device, album_object );
+         if( ret != 0 )
+         {
+             debug() << "creating album failed : " << ret << endl;
+@@ -608,7 +609,7 @@
+ {
+     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
+     char *name_copy = qstrdup( name );
+-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
++    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
+     delete(name_copy);
+     debug() << "New folder ID: " << new_folder_id << endl;
+     if( new_folder_id == 0 )
+@@ -913,7 +914,7 @@
+     if( item->playlist()->id() == 0 )
+     {
+         debug() << "creating new playlist : " << metadata->name << endl;
+-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
++        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
+         if( ret == 0 )
+         {
+             item->playlist()->setId( metadata->playlist_id );

Added: kde-extras/amarok/trunk/debian/patches/22_fix_wikipedia_tab.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/22_fix_wikipedia_tab.diff	                        (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/22_fix_wikipedia_tab.diff	2009-03-02 07:35:14 UTC (rev 13925)
@@ -0,0 +1,11 @@
+--- a/amarok/src/contextbrowser.cpp
++++ b/amarok/src/contextbrowser.cpp
+@@ -4189,7 +4189,7 @@
+     }
+ 
+     // Ok lets remove the top and bottom parts of the page
+-    m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
++    m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\"" ) );
+     m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
+     // Adding back license information
+     m_wiki += copyright;

Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series	2009-03-02 01:30:11 UTC (rev 13924)
+++ kde-extras/amarok/trunk/debian/patches/series	2009-03-02 07:35:14 UTC (rev 13925)
@@ -15,4 +15,6 @@
 18_add_lastfm_recommended_radio.diff
 19_amarok_play_audiocd.desktop.diff
 20_security_audible_tags.diff
+21_fix_libmtp-0.3.0-API.diff
+22_fix_wikipedia_tab.diff
 97_automake_cleanup.diff

More information about the pkg-kde-commits mailing list