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

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-17 18:54:11 +0100 (Thu, 17 Mar 2005)
New Revision: 825

Removed:
   people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff
Modified:
   people/dato/packages/trunk/amarok/debian/
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/control
   people/dato/packages/trunk/amarok/debian/rules
Log:
- use kde.mk from svn, not from cdbs (svn:externals)
- added build-dependency on automake1.6 and libtool. added debian/rules
  snippet to update the files. set DEB_KDE_CVS_MAKE to yes.
- switch to tarball-in-tarball. include tarball.mk and set DEB_TAR_SRCDIR.
- removed patches/bind-to-localhost.diff



Property changes on: people/dato/packages/trunk/amarok/debian
___________________________________________________________________
Name: svn:externals
   + cdbs svn://svn.debian.org/pkg-kde/branches/kde-3.4.0/cdbs


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-03-17 17:50:53 UTC (rev 824)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-03-17 17:54:11 UTC (rev 825)
@@ -1,3 +1,20 @@
+amarok (1.2.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+  * Added a menu file, plus XPM icons.
+
+  * Switched to tarball-in-tarball for the .orig.tar.gz (which is sensble
+    smaller now, since upstream uses bz2).
+
+  * Build-depend on automake1.6 and libtool, and regenerate configure and
+    Makefiles.in at build-time.
+
+  * Use the kde.mk class maintained by the Debian KDE Maintainers, instead
+    of the one shipped with cdbs.
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Thu, 17 Mar 2005 18:19:12 +0100
+
 amarok (1.2.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: people/dato/packages/trunk/amarok/debian/control
===================================================================
--- people/dato/packages/trunk/amarok/debian/control	2005-03-17 17:50:53 UTC (rev 824)
+++ people/dato/packages/trunk/amarok/debian/control	2005-03-17 17:54:11 UTC (rev 825)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Adeodato Simó <asp16@alu.ua.es>
-Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient12-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
+Build-Depends: cdbs (>= 0.4.21), debhelper (>> 4.1.0), automake1.6, libtool, kdelibs4-dev (>= 4:3.2), kdemultimedia-dev (>= 4:3.2), kdebase-dev (>= 4:3.2), libgstreamer0.8-dev, libgstreamer-plugins0.8-dev, libmysqlclient12-dev, libtag1-dev (>> 1.3.1), libxine-dev (>= 1-rc4), libsqlite3-dev, xmms-dev, libtunepimp2-dev (>= 0.3.0-2.1)
 Standards-Version: 3.6.1
 
 Package: amarok

Deleted: people/dato/packages/trunk/amarok/debian/patches/bind-to-localhost.diff

Modified: people/dato/packages/trunk/amarok/debian/rules
===================================================================
--- people/dato/packages/trunk/amarok/debian/rules	2005-03-17 17:50:53 UTC (rev 824)
+++ people/dato/packages/trunk/amarok/debian/rules	2005-03-17 17:54:11 UTC (rev 825)
@@ -1,11 +1,16 @@
 #!/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 debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
 
 ### VARIABLES
+DEB_KDE_CVS_MAKE := yes
+
 DEB_DH_MAKESHLIBS_ARGS_ALL := -n
 DEB_INSTALL_DIRS_amarok    := usr/lib/amarok
 DEB_DH_SHLIBDEPS_ARGS	   := -Xusr/lib/amarok/amarok_xmmswrapper2 \
@@ -14,6 +19,22 @@
 DEB_CONFIGURE_EXTRA_FLAGS  := --without-included-sqlite \
 			      --enable-mysql
 
+### Libtool and Automake updates
+post-patches:: debian/stamp-autothings-update
+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.6/*; do \
+	    if test -f $$f && ! test -L $$f && \
+		test $(DEB_SRCDIR)/admin/`basename $$f`; then \
+		cp -f $$f $(DEB_SRCDIR)/admin; \
+	    fi; \
+	done
+	touch $@
+
+clean::
+	rm -f debian/stamp-autothings-update
+
 ### COMMON STUFF
 common-binary-arch::
 	# Use debian/substvars