rev 5593 - in people/ana/packages/amarok/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-02-15 22:19:17 +0100 (Thu, 15 Feb 2007)
New Revision: 5593

Added:
   people/ana/packages/amarok/debian/patches/proxy_lyrics.diff
Modified:
   people/ana/packages/amarok/debian/amarok.install
   people/ana/packages/amarok/debian/changelog
   people/ana/packages/amarok/debian/control
   people/ana/packages/amarok/debian/patches/queuemedia.patch
   people/ana/packages/amarok/debian/patches/series
Log:
amarok 1.4.5-2


Modified: people/ana/packages/amarok/debian/amarok.install
===================================================================
--- people/ana/packages/amarok/debian/amarok.install	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/amarok.install	2007-02-15 21:19:17 UTC (rev 5593)
@@ -33,6 +33,10 @@
 debian/tmp/usr/lib/kde3/libamarok_ifp-mediadevice.so
 debian/tmp/usr/share/services/amarok_ifp-mediadevice.desktop
 
+debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.la
+debian/tmp/usr/lib/kde3/libamarok_ipod-mediadevice.so
+debian/tmp/usr/share/services/amarok_ipod-mediadevice.desktop
+
 debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.la
 debian/tmp/usr/lib/kde3/libamarok_njb-mediadevice.so
 debian/tmp/usr/share/services/amarok_njb-mediadevice.desktop

Modified: people/ana/packages/amarok/debian/changelog
===================================================================
--- people/ana/packages/amarok/debian/changelog	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/changelog	2007-02-15 21:19:17 UTC (rev 5593)
@@ -1,9 +1,15 @@
 amarok (1.4.5-2) experimental; urgency=low
 
+  * iPod support is back. Added versioned build-dep on libgpod-dev (>=0.4.2).
+    (Closes: #409985)
   * Add patch to add the "Queue Track" functionality to the Amarok DCOP API:
-    queuemedia.patch
+    queuemedia.patch. Patch by Isaac Clerencia <isaac at debian.org>
+  * Add patch to allow amarok get lyrics via http proxy with authentication.
+    Thanks to Filipe Lautert <filipe at icewall.org>. (Closes: #409568)
+  * Added versioned dep on amarok-engines | amarok-engine, thanks to Andreas
+    Pakulat for pointing this. (Closes: #409996). 
 
- -- Isaac Clerencia <isaac at debian.org>  Fri,  9 Feb 2007 09:40:16 +0100
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 10 Feb 2007 00:40:10 +0100
 
 amarok (1.4.5-1) experimental; urgency=low
 

Modified: people/ana/packages/amarok/debian/control
===================================================================
--- people/ana/packages/amarok/debian/control	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/control	2007-02-15 21:19:17 UTC (rev 5593)
@@ -9,14 +9,14 @@
  libtag1-dev (>> 1.4), libsqlite3-dev, libtunepimp3-dev,
  libmysqlclient15-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libnjb-dev,
+ libifp-dev, libusb-dev, libgpod-dev (>=0.4.2), libnjb-dev,
  ruby, ruby1.8-dev,
  dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: amarok
 Architecture: any
-Depends: amarok-engines | amarok-engine, ruby, ${shlibs:Depends}
+Depends: amarok-engines (= ${binary:Version}) | amarok-engine(= ${binary:Version}), ruby, ${shlibs:Depends}
 Recommends: kdemultimedia-kio-plugins
 Suggests: libvisual-0.4-plugins, konqueror | www-browser, python, python-qt3, libqt0-ruby1.8
 Description: versatile and easy to use audio player for KDE

Added: people/ana/packages/amarok/debian/patches/proxy_lyrics.diff
===================================================================
--- people/ana/packages/amarok/debian/patches/proxy_lyrics.diff	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/patches/proxy_lyrics.diff	2007-02-15 21:19:17 UTC (rev 5593)
@@ -0,0 +1,29 @@
+--- amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb	2007-02-03 13:48:29.000000000 -0200
++++ amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb	2007-02-03 13:58:30.000000000 -0200
+@@ -111,6 +111,9 @@
+ 
+     proxy_host = nil
+     proxy_port = nil
++    proxy_user = nil
++    proxy_pass = nil
++
+     if ( @proxy == nil )
+         @proxy = `dcop amarok script proxyForProtocol http`
+     end
+@@ -118,9 +128,10 @@
+     if ( proxy_uri.class != URI::Generic )
+         proxy_host = proxy_uri.host
+         proxy_port = proxy_uri.port
++        proxy_user, proxy_pass = proxy_uri.userinfo.split(':') unless proxy_uri.userinfo.nil?
+     end
+ 
+-    h = Net::HTTP.new( host, 80, proxy_host, proxy_port )
++    h = Net::HTTP.new( host, 80, proxy_host, proxy_port, proxy_user, proxy_pass )
+     response = h.get( path )
+ 
+     unless response.code == "200"
+@@ -195,4 +199,3 @@
+             fetchLyrics( "", "", url )
+     end
+ end
+-

Modified: people/ana/packages/amarok/debian/patches/queuemedia.patch
===================================================================
--- people/ana/packages/amarok/debian/patches/queuemedia.patch	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/patches/queuemedia.patch	2007-02-15 21:19:17 UTC (rev 5593)
@@ -1,7 +1,7 @@
 diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.cpp amarok/src/amarokcore/amarokdcophandler.cpp
 --- amarok.orig/src/amarokcore/amarokdcophandler.cpp	2006-10-26 22:40:20.000000000 +0200
 +++ amarok/src/amarokcore/amarokdcophandler.cpp	2007-02-08 21:11:45.000000000 +0100
-@@ -578,6 +578,11 @@
+@@ -585,6 +585,11 @@
          Playlist::instance()->insertMedia(urls);
      }
  
@@ -16,7 +16,7 @@
 diff -u -Nrua amarok.orig/src/amarokcore/amarokdcophandler.h amarok/src/amarokcore/amarokdcophandler.h
 --- amarok.orig/src/amarokcore/amarokdcophandler.h	2006-10-26 22:40:20.000000000 +0200
 +++ amarok/src/amarokcore/amarokdcophandler.h	2007-02-08 21:11:56.000000000 +0100
-@@ -124,6 +124,7 @@
+@@ -125,6 +125,7 @@
        virtual int     getTotalTrackCount();
        virtual QString saveCurrentPlaylist();
        virtual void    addMedia(const KURL &);
@@ -27,7 +27,7 @@
 diff -u -Nrua amarok.orig/src/amarokcore/amarokdcopiface.h amarok/src/amarokcore/amarokdcopiface.h
 --- amarok.orig/src/amarokcore/amarokdcopiface.h	2006-10-26 22:40:20.000000000 +0200
 +++ amarok/src/amarokcore/amarokdcopiface.h	2007-02-08 21:12:12.000000000 +0100
-@@ -126,6 +126,7 @@
+@@ -127,6 +127,7 @@
  
     /* These two methods are used by mediacontrol. DO NOT TOUCH! */
     virtual void addMedia(const KURL &) = 0;                 ///< Add audio media specified by the url.

Modified: people/ana/packages/amarok/debian/patches/series
===================================================================
--- people/ana/packages/amarok/debian/patches/series	2007-02-15 18:29:43 UTC (rev 5592)
+++ people/ana/packages/amarok/debian/patches/series	2007-02-15 21:19:17 UTC (rev 5593)
@@ -4,3 +4,4 @@
 gmo_files_at_build_time.patch -p0
 disable-final.diff -p0
 queuemedia.patch -p0
+proxy_lyrics.diff -p0