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

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-09 22:38:26 +0000 (Wed, 09 Apr 2008)
New Revision: 10090

Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
   kde-extras/amarok/trunk/debian/patches/97_automake_cleanup.diff
   kde-extras/amarok/trunk/debian/rules
Log:
Preparing for 1.4.9

Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2008-04-09 20:29:35 UTC (rev 10089)
+++ kde-extras/amarok/trunk/debian/changelog	2008-04-09 22:38:26 UTC (rev 10090)
@@ -1,3 +1,17 @@
+amarok (1.4.9~prepack-1~pre2) unstable; urgency=low
+
+  * New upstream release.
+  * Repackage original tarball as orig.tar.gz instead of doing tarball-in-orig
+    tarball thing. The previous way made patch testing and debugging more
+    painful unnecessarily.
+  * Resynchronize patches:
+    - 11_bug403340_cancel_rename_when_deleting_items.diff - fix offsets.
+    - 97_automake_cleanup.diff - adopt to upstream changes, fix offsets.
+  * Improve debian/rules stamp-automake and clean targets a bit not to rm
+    automake generated files uselessly (if they were not regenerated)
+
+ -- Modestas Vainius <modestas at vainius.eu>  Thu, 10 Apr 2008 01:32:13 +0300
+
 amarok (1.4.8-2) unstable; urgency=low
 
   * Remove Adeodato Simó from Uploaders by his request. Thank you Adeodato for

Modified: kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff	2008-04-09 20:29:35 UTC (rev 10089)
+++ kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff	2008-04-09 22:38:26 UTC (rev 10090)
@@ -1,6 +1,6 @@
 --- amarok/src/playlist.cpp	2007-12-25 23:53:35.000000000 +0200
 +++ amarok/src/playlist.cpp	2007-12-26 00:00:38.000000000 +0200
-@@ -4382,6 +4382,12 @@
+@@ -4381,6 +4381,12 @@
              setStopAfterMode( DoNotStop );
      }
  

Modified: kde-extras/amarok/trunk/debian/patches/97_automake_cleanup.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/97_automake_cleanup.diff	2008-04-09 20:29:35 UTC (rev 10089)
+++ kde-extras/amarok/trunk/debian/patches/97_automake_cleanup.diff	2008-04-09 22:38:26 UTC (rev 10090)
@@ -91,7 +91,7 @@
      $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
 -    $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
 +    $(LIB_QT) $(LIB_KPARTS) -lDCOP -lkdefx $(KDE_MT_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
-     $(taglib_libs) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
+     $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
      $(LIB_TUNEPIMP) \
      $(mysql_libs) \
 @@ -196,11 +196,8 @@
@@ -99,7 +99,7 @@
      $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
      $(top_builddir)/amarok/src/metadata/libmetadata.la \
 -    $(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KHTML) $(LIB_KNEWSTUFF) \
--    $(taglib_libs) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(EXSCALIBAR_LIBS) \
+-    $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) $(EXSCALIBAR_LIBS) \
 -    $(LIB_TUNEPIMP) \
 -    $(mysql_libs) \
 -    $(postgresql_libs)
@@ -194,7 +194,7 @@
      $(KDE_PLUGIN) \
 --- amarok-1.4.8_dst/amarok/configure.in.in	2007-12-17 17:53:19.000000000 +0200
 +++ amarok-1.4.8_dst/amarok/configure.in.in	2008-02-27 11:15:25.000000000 +0200
-@@ -588,7 +588,10 @@
+@@ -573,7 +573,10 @@
  
      if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
  
@@ -206,7 +206,7 @@
  
          AC_SUBST(LIBVISUAL_LIBS)
          AC_SUBST(LIBVISUAL_CFLAGS)
-@@ -785,6 +788,7 @@
+@@ -770,6 +773,7 @@
      if test "$PKGCONFIGFOUND" = "yes" ; then
          PKG_CHECK_MODULES(LIBMTP, libmtp >= 0.1.1,
          [

Modified: kde-extras/amarok/trunk/debian/rules
===================================================================
--- kde-extras/amarok/trunk/debian/rules	2008-04-09 20:29:35 UTC (rev 10089)
+++ kde-extras/amarok/trunk/debian/rules	2008-04-09 22:38:26 UTC (rev 10090)
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tar.bz2) .tar.bz2)
-
 ### CDBS INCLUDES
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -44,6 +41,7 @@
 
 post-patches:: debian/stamp-automake
 debian/stamp-automake:
+	touch debian/stamp-automake-started
 	if test -n "$(DEB_AUTOMAKE_SHARE_DIR)"; then \
 		for f in $(DEB_AUTOMAKE_SHARE_DIR)/*; do \
 			if  test -f $$f && \
@@ -65,7 +63,7 @@
 	fi
 
 clean::
-	if test -d $(DEB_SRCDIR); then \
+	if test -d $(DEB_SRCDIR) && test -f debian/stamp-automake-started; then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
 				xargs --no-run-if-empty rm -f; \
@@ -73,7 +71,7 @@
 				configure configure.files configure.in stamp-h.in \
 				subdirs; \
 	fi
-	rm -f debian/stamp-automake
+	rm -f debian/stamp-automake*
 
 binary-fixup/amarok-common::
 	# Fix permissions of some amarok scripts