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

[Modestas Vainius]

Author: modax-guest
Date: 2007-12-24 16:32:39 +0000 (Mon, 24 Dec 2007)
New Revision: 8519

Removed:
   kde-extras/amarok/trunk/debian/patches/proxy_lyrics.diff
Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff
   kde-extras/amarok/trunk/debian/patches/series
Log:
Packaging updated for 1.4.8 (can be built).

Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2007-12-24 11:37:52 UTC (rev 8518)
+++ kde-extras/amarok/trunk/debian/changelog	2007-12-24 16:32:39 UTC (rev 8519)
@@ -16,8 +16,11 @@
     XS-Vcs-Svn and XS-Vcs-Browser fields.
 
   * New upstream release (1.4.8) (Closes: #457352).
+  * Resync patches:
+    - proxy_lyrics.diff - removed, merged upstream.
+    - fix_gcc4.3_ftbfs.diff - unfuzz.
 
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 24 Dec 2007 00:02:04 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 24 Dec 2007 18:25:12 +0200
 
 amarok (1.4.7-1) unstable; urgency=low
 

Modified: kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff	2007-12-24 11:37:52 UTC (rev 8518)
+++ kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff	2007-12-24 16:32:39 UTC (rev 8519)
@@ -1,9 +1,9 @@
---- amarok/src/metadata/audible/audibletag.cpp.orig
-+++ amarok/src/metadata/audible/audibletag.cpp
-@@ -29,6 +29,8 @@
+--- amarok/src/metadata/audible/audibletag.cpp	2007-12-24 18:22:40.000000000 +0200
++++ amarok/src/metadata/audible/audibletag.cpp	2007-12-24 18:22:46.000000000 +0200
+@@ -31,6 +31,8 @@
+ #include <stdlib.h>
+ #include <string.h>
  
- #include <netinet/in.h> // ntohl
- 
 +#include <cstdlib>
 +
  using namespace TagLib;

Deleted: kde-extras/amarok/trunk/debian/patches/proxy_lyrics.diff

Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series	2007-12-24 11:37:52 UTC (rev 8518)
+++ kde-extras/amarok/trunk/debian/patches/series	2007-12-24 16:32:39 UTC (rev 8519)
@@ -4,5 +4,4 @@
 gmo_files_at_build_time.patch -p0
 disable-final.diff -p0
 queuemedia.patch -p0
-proxy_lyrics.diff -p0
 fix_gcc4.3_ftbfs.diff -p0