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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2011-11-13 15:48:36 +0000 (Sun, 13 Nov 2011)
New Revision: 19011

Modified:
   kde-extras/kid3/trunk/debian/changelog
   kde-extras/kid3/trunk/debian/rules
Log:
kid3 2.0.1


Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog	2011-11-13 02:21:25 UTC (rev 19010)
+++ kde-extras/kid3/trunk/debian/changelog	2011-11-13 15:48:36 UTC (rev 19011)
@@ -1,11 +1,17 @@
-kid3 (2.0-1) UNRELEASED; urgency=low
+kid3 (2.0.1-1) unstable; urgency=low
 
   * New upstream release.
-    - Adjust build system.
-    - Add build dependency xsltproc.
+  
+  [ Patrick Matthäi ]
+  * Adjust build system.
+  * Add build dependency xsltproc.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 24 Sep 2011 23:56:43 +0200
+  [ Ana Beatriz Guerrero Lopez ]
+  * Some more adjustments to the build system taken from upstream's deb/
+  * directory.
 
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 13 Nov 2011 16:34:13 +0100
+
 kid3 (1.6-2) unstable; urgency=low
 
   * Bump debhelper to version 7.

Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules	2011-11-13 02:21:25 UTC (rev 19010)
+++ kde-extras/kid3/trunk/debian/rules	2011-11-13 15:48:36 UTC (rev 19011)
@@ -8,9 +8,6 @@
 bindir = $(CURDIR)/debian/kid3/usr/bin
 kdedocs = $(CURDIR)/debian/kid3/usr/share/doc/kde/HTML
 
-INSTALL_DIR = install -p -d -o root -g root -m 755
-INSTALL_FILE = install -p -o root -g root -m 644
-
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
@@ -33,8 +30,6 @@
 
 build: build-stamp
 
--include debian/debiandirs
-
 DEB_CMAKE_PREFIX = /usr
 DEB_CONFIG_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/kde4/config
 DEB_HTML_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/doc/kde/HTML
@@ -51,8 +46,20 @@
 	-DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg \
 	-DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib
 
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
+CMAKE_QT4_FLAGS = \
+	-DCMAKE_SKIP_RPATH=ON \
+	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
+	-DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
+	-DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
+	-DCMAKE_C_FLAGS="$(CFLAGS)" \
+	-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DWITH_MP4V2=OFF \
+	-DWITH_KDE=OFF \
+	-DWITH_DATAROOTDIR=share \
+	-DWITH_DOCDIR=share/doc/kid3-qt \
+	-DWITH_TRANSLATIONSDIR=share/kid3-qt/translations \
+	-DWITH_BINDIR=bin
 
 build-stamp:
 	dh_testdir
@@ -62,17 +69,17 @@
 	$(MAKE) -C kid3-kde4
 	# Qt4 build.
 	mkdir kid3-qt
-	cd kid3-qt && cmake .. -DWITH_KDE=OFF $(CMAKE_KDE4_FLAGS)
+	cd kid3-qt && cmake .. -DWITH_KDE=OFF $(CMAKE_QT4_FLAGS)
 	$(MAKE) -C kid3-qt
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) -C kid3-qt distclean
-	[ ! -f Makefile ] || $(MAKE) -C kid3-kde4 distclean
-	rm -rf kid3-kde4
-	rm -f *-stamp po/*.gmo kid3-qt/kid3/*.png kid3-qt/kid3/*.svgz
+	[ ! -f kid3-qt/Makefile ] || $(MAKE) -C kid3-qt clean
+	[ ! -f kid3-kde4/Makefile ] || $(MAKE) -C kid3-kde4 clean
+	rm -rf kid3-kde4 kid3-qt
+	rm -f *-stamp po/*.gmo
 	dh_clean
 
 install: build
@@ -82,12 +89,11 @@
 	dh_installdirs
 	# Main install.
 	$(MAKE) -C kid3-kde4 install DESTDIR=$(CURDIR)/debian/kid3
-	$(MAKE) -C kid3-qt install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
+	$(MAKE) -C kid3-qt install DESTDIR=$(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