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

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-04 14:54:54 +0100 (Fri, 04 Mar 2005)
New Revision: 636

Added:
   people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff
Modified:
   people/dato/packages/trunk/amarok/debian/amarok-xine.install
   people/dato/packages/trunk/amarok/debian/amarok.install
   people/dato/packages/trunk/amarok/debian/changelog
Log:
Preparing amarok 1.2.1 packages.


Modified: people/dato/packages/trunk/amarok/debian/amarok-xine.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok-xine.install	2005-03-04 12:31:38 UTC (rev 635)
+++ people/dato/packages/trunk/amarok/debian/amarok-xine.install	2005-03-04 13:54:54 UTC (rev 636)
@@ -1,4 +1,3 @@
 debian/tmp/usr/share/services/amarok_xine-engine.desktop
-debian/tmp/usr/share/services/amarok_xineengine_plugin.desktop
 debian/tmp/usr/lib/kde3/libamarok_xine-engine.so
 debian/tmp/usr/lib/kde3/libamarok_xine-engine.la

Modified: people/dato/packages/trunk/amarok/debian/amarok.install
===================================================================
--- people/dato/packages/trunk/amarok/debian/amarok.install	2005-03-04 12:31:38 UTC (rev 635)
+++ people/dato/packages/trunk/amarok/debian/amarok.install	2005-03-04 13:54:54 UTC (rev 636)
@@ -14,6 +14,8 @@
 debian/tmp/usr/lib/kde3/libamarok_void-engine_plugin.so
 
 debian/tmp/usr/share/apps/konqsidebartng/add/amarok.desktop
+debian/tmp/usr/share/apps/konqsidebartng/entries/amarok.desktop
+debian/tmp/usr/share/apps/konqsidebartng/kicker_entries/amarok.desktop
 debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.la
 debian/tmp/usr/lib/kde3/konqsidebar_universalamarok.so
 

Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-03-04 12:31:38 UTC (rev 635)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-03-04 13:54:54 UTC (rev 636)
@@ -1,3 +1,12 @@
+amarok (1.2.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+  * Include patch from CVS to make amaroK bind listening TCP connections to
+    the local interface only. Related to Bug#297693, but not the same.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 04 Mar 2005 14:54:34 +0100
+
 amarok (1.2.0-1) unstable; urgency=low
 
   * New upstream release packaged (closes: #296139). Lots of improvements and

Added: people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff	2005-03-04 12:31:38 UTC (rev 635)
+++ people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff	2005-03-04 13:54:54 UTC (rev 636)
@@ -0,0 +1,18 @@
+Index: cvs/src/streamprovider.h
+===================================================================
+RCS file: /home/kde/kdeextragear-1/amarok/src/streamprovider.h,v
+retrieving revision 1.31
+retrieving revision 1.32
+diff -u -p -r1.31 -r1.32
+--- a/amarok/src/streamprovider.h    25 Feb 2005 09:23:55 -0000      1.31
++++ b/amarok/src/streamprovider.h    4 Mar 2005 06:58:21 -0000       1.32
+@@ -134,7 +134,7 @@ namespace amaroK {
+
+         public:
+             StreamProxy( Q_UINT16 port, QObject* parent )
+-                : QServerSocket( port, 1, parent ) {};
++                : QServerSocket( 0x7f000001 /* 127.0.0.1 */, port, 1, parent ) {};
+
+         signals:
+             void connected( int socket );
+