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

[Modestas Vainius]

Author: modax-guest
Date: 2007-12-24 21:23:27 +0000 (Mon, 24 Dec 2007)
New Revision: 8521

Removed:
   kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff
Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/control
   kde-extras/amarok/trunk/debian/copyright
   kde-extras/amarok/trunk/debian/patches/series
   kde-extras/amarok/trunk/debian/rules
Log:
1.4.8-1 as of this commit should be ready for unstable now.
It's mostly an update to new upstream release + amarok became gtk2 free.
1.4.8-2 will get more packaging changes including new binary packages.


Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2007-12-24 16:41:35 UTC (rev 8520)
+++ kde-extras/amarok/trunk/debian/changelog	2007-12-24 21:23:27 UTC (rev 8521)
@@ -1,4 +1,4 @@
-amarok (1.4.8-1~pre1) unstable; urgency=low
+amarok (1.4.8-1) unstable; urgency=low
 
   [ Adeodato Simó ]
   * Build against libgpod-nogtk-dev.
@@ -18,9 +18,12 @@
   * New upstream release (1.4.8) (Closes: #457352).
   * Resync patches:
     - proxy_lyrics.diff - removed, merged upstream.
-    - fix_gcc4.3_ftbfs.diff - unfuzz.
+    - fix_gcc4.3_ftbfs.diff - removed, resolved upstream.
+  * Drop kdemultimedia-dev from Build-Depends. It's no longer needed.
+  * debian/rules: use /usr/share/automake-1.10 instead of *-1.9
+    because 'automake' package provides version 1.10.
 
- -- Modestas Vainius <modestas at vainius.eu>  Mon, 24 Dec 2007 18:25:12 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Mon, 24 Dec 2007 23:10:02 +0200
 
 amarok (1.4.7-1) unstable; urgency=low
 

Modified: kde-extras/amarok/trunk/debian/control
===================================================================
--- kde-extras/amarok/trunk/debian/control	2007-12-24 16:41:35 UTC (rev 8520)
+++ kde-extras/amarok/trunk/debian/control	2007-12-24 21:23:27 UTC (rev 8521)
@@ -4,7 +4,7 @@
 Maintainer: Modestas Vainius <modestas at vainius.eu>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Adeodato Simó <dato at net.com.org.es>
 Build-Depends: cdbs, debhelper, quilt, bzip2, automake, libtool,
- kdelibs4-dev, kdemultimedia-dev, kdebase-dev,
+ kdelibs4-dev, kdebase-dev,
  libxine-dev,
  libtag1-dev, libsqlite3-dev, libtunepimp-dev,
  libmysqlclient15-dev, libpq-dev,

Modified: kde-extras/amarok/trunk/debian/copyright
===================================================================
--- kde-extras/amarok/trunk/debian/copyright	2007-12-24 16:41:35 UTC (rev 8520)
+++ kde-extras/amarok/trunk/debian/copyright	2007-12-24 21:23:27 UTC (rev 8521)
@@ -1,5 +1,6 @@
-Debianized by Peter Rockai <mornfall at mornfall.homeip.net>	2004-04-11
-New maintainer Adeodato Simó <dato at net.com.org.es>		2004-09-22
+Debianized by Peter Rockai <mornfall at mornfall.homeip.net>    2004-04-11
+New maintainer Adeodato Simó <dato at net.com.org.es>           2004-09-22
+New maintainer Modestas Vainius <modestas at vainius.eu>        2007-12-24
 
 It was downloaded from:
 

Deleted: kde-extras/amarok/trunk/debian/patches/fix_gcc4.3_ftbfs.diff

Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series	2007-12-24 16:41:35 UTC (rev 8520)
+++ kde-extras/amarok/trunk/debian/patches/series	2007-12-24 21:23:27 UTC (rev 8521)
@@ -4,4 +4,3 @@
 gmo_files_at_build_time.patch -p0
 disable-final.diff -p0
 queuemedia.patch -p0
-fix_gcc4.3_ftbfs.diff -p0

Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules	2007-12-24 16:41:35 UTC (rev 8520)
+++ kde-extras/amarok/trunk/debian/rules	2007-12-24 21:23:27 UTC (rev 8521)
@@ -37,7 +37,7 @@
 debian/stamp-autothings-update:
 	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
 	cp -f /usr/share/libtool/ltmain.sh  $(DEB_SRCDIR)/admin/ltmain.sh
-	for f in /usr/share/automake-1.9/*; do \
+	for f in /usr/share/automake-1.10/*; do \
 	    if  test -f $$f && \
 		test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
 		cp -f $$f $(DEB_SRCDIR)/admin; \