rev 14653 - kde-extras/kid3/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2009-05-20 13:14:29 +0000 (Wed, 20 May 2009)
New Revision: 14653

Modified:
   kde-extras/kid3/trunk/debian/changelog
   kde-extras/kid3/trunk/debian/rules
   kde-extras/kid3/trunk/debian/watch
Log:
* Some minor packaging cleanups (remove useless whitespaces at EOL etc.).


Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog	2009-05-20 11:41:57 UTC (rev 14652)
+++ kde-extras/kid3/trunk/debian/changelog	2009-05-20 13:14:29 UTC (rev 14653)
@@ -1,12 +1,15 @@
 kid3 (1.2-1) unstable; urgency=low
 
-  * New usptream release, switch to Qt3 and KDE 4.
-  * Update build depends:
-
+  [ Ana Beatriz Guerrero Lopez ]
+  * New upstream release, switch to Qt3 and KDE 4.
+    Closes: #526313
   * Update copyright years.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 30 Apr 2009 11:15:07 +0200
+  [ Patrick Matthäi ]
+  * Some minor packaging cleanups (remove useless whitespaces at EOL etc.).
 
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 20 May 2009 14:48:43 +0200
+
 kid3 (1.1-1) unstable; urgency=low
 
   * New usptream release:

Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules	2009-05-20 11:41:57 UTC (rev 14652)
+++ kde-extras/kid3/trunk/debian/rules	2009-05-20 13:14:29 UTC (rev 14653)
@@ -29,9 +29,9 @@
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
-		
+
 build: build-stamp
-	
+
 -include debian/debiandirs
 
 debian/debiandirs: admin/debianrules
@@ -39,21 +39,17 @@
 
 build-stamp:
 	dh_testdir
-
-	QTDIR=/usr/share/qt3 ./configure \
-	                        --host=$(DEB_HOST_GNU_TYPE) \
-	                        --build=$(DEB_BUILD_GNU_TYPE) \
-	                        $(configkde)
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+				$(configkde)
 	$(MAKE)
 	cd kid3-qt; \
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	            --prefix=/usr --with-qmake=qmake-qt3; \
 	cd ..
 	$(MAKE) -C kid3-qt
-
 	touch build-stamp
 
-clean: 
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) -C kid3-qt distclean
@@ -66,18 +62,15 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	# Main install.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kid3
 	$(MAKE) -C kid3-qt install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
-
 	# Make common links for docs.
 	for p in `dh_listpackages`; do \
 	  for i in `find $(kdedocs) -type d -name $$p -not -regex .*/en/$$p`; do \
 	    ln -f -n -s ../../en/common $$i/common; done; done
-
 	perl -w admin/debianrules cleanup
-	
+
 binary-indep: build install
 
 binary-arch: build install
@@ -86,7 +79,6 @@
 	dh_installdocs -A AUTHORS NEWS README
 	dh_installmenu
 	dh_installman
-#	dh_installinfo
 	dh_installchangelogs ChangeLog
 	dh_icons
 	dh_desktop

Modified: kde-extras/kid3/trunk/debian/watch
===================================================================
--- kde-extras/kid3/trunk/debian/watch	2009-05-20 11:41:57 UTC (rev 14652)
+++ kde-extras/kid3/trunk/debian/watch	2009-05-20 13:14:29 UTC (rev 14653)
@@ -5,5 +5,3 @@
 
 # Uncomment to find new files on sourceforge, for debscripts >= 2.9
 http://sf.net/kid3/kid3-(.*)\.tar\.gz debian svn-upgrade
-
-