improved the debian build system for Ubuntu 9.04, it can now create a KDE 3...

improved the debian build system for Ubuntu 9.04, it can now create a KDE 3 and a Qt 3 package, or a KDE 4 and a Qt 4 package

kid3/build-deb-kde4.sh

-#!/bin/sh
-# Build Debian package for KDE 4.
-if mv -T deb debian; then
-  DH_OPTIONS="-p kid3-kde4" dpkg-buildpackage -rfakeroot
-  mv -T debian deb
-fi

kid3/build-deb-qt.sh

-#!/bin/sh
-# Build Debian package for Qt.
-if mv -T deb debian; then
-  DH_OPTIONS="-p kid3-qt" dpkg-buildpackage -rfakeroot
-  mv -T debian deb
-fi

kid3/build-deb-kde3.sh → kid3/build-deb.sh

 #!/bin/sh
 # Build Debian package for KDE 3.
 if mv -T deb debian; then
-  DH_OPTIONS="-p kid3" dpkg-buildpackage -rfakeroot
+  dpkg-buildpackage -rfakeroot -tc
   mv -T debian deb
 fi

kid3/deb/changelog

-kid3 (1.1-0) unstable; urgency=low
+kid3 (1.1-2) unstable; urgency=low
 
-  * New upstream release.
+  * Build with KDE 4.
+
+ -- Urs Fleisch <ufleisch@users.sourceforge.net>  Sat, 07 Feb 2009 12:24:11 +0100
+
+kid3 (1.1-1) unstable; urgency=low
+
+  * New usptream release:
+    - Add support for .oga (Closes: #498352)
+  * Add call to dh_icons and dh_desktop. (Closes: #454526)
+  * Update do debhelper compat 6.
+  * Remove build depend on quilt.
+  * Update to Standards-Version: 3.8.0, no changes required.
 
- -- Urs Fleisch <ufleisch@users.sourceforge.net>  Sat, 27 Sep 2008 15:51:35 +0200
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 15 Jan 2009 19:15:40 +0100
 
 kid3 (1.0-1) unstable; urgency=low
 

kid3/deb/compat

-5
+6

kid3/deb/control

@@ -3,12 +3,12 @@ Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Mark Purcell <msp@debian.org>
-Build-Depends: debhelper (>= 5), quilt,
- libid3-3.8.3-dev, libtunepimp-dev | libtunepimp3-dev, libflac++-dev, libvorbis-dev, libtag1-dev,
- libqt3-mt-dev (>> 3.0), kdelibs4-dev (>> 3.0),
- xsltproc, docbook-xsl, libqt3-i18n,
- cmake, kdelibs5-dev (>=4:3.96.0)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), xsltproc, docbook-xsl,
+ cmake, libqt4-dev, kdelibs5-dev,
+ libqt3-mt-dev, libqt3-i18n, kdelibs4-dev,
+ libid3-3.8.3-dev, libtunepimp-dev | libtunepimp3-dev, libflac++-dev,
+ libvorbis-dev, libtag1-dev, libmp4v2-dev,
+Standards-Version: 3.8.0
 Homepage: http://kid3.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kid3/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kid3/?op=log 
@@ -22,7 +22,7 @@ Description: KDE MP3 ID3 tag editor
   * Edit all ID3v2.3 and ID3v2.4 frames in your MP3 files
   * Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
   * Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Speex,
-    TrueAudio and WavPack files.
+    TrueAudio and WavPack files
   * Edit tags of multiple files, e.g. the artist, album, year and genre
     of all files of an album typically have the same values and can be
     set together
@@ -33,7 +33,7 @@ Description: KDE MP3 ID3 tag editor
   * Import and export album data
   * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
  .
- This package uses KDE 3 libraries, if you do not use KDE 3 you should use kid3-qt or kid3-kde4.
+ This package uses KDE libraries, if you do not use KDE you should use kid3-qt.
 
 Package: kid3-qt
 Section: sound
@@ -45,7 +45,7 @@ Description: Audio tag editor
   * Edit all ID3v2.3 and ID3v2.4 frames in your MP3 files
   * Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
   * Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Speex,
-    TrueAudio and WavPack files.
+    TrueAudio and WavPack files
   * Edit tags of multiple files, e.g. the artist, album, year and genre
     of all files of an album typically have the same values and can be
     set together
@@ -57,26 +57,3 @@ Description: Audio tag editor
   * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
  .
  This package does not use KDE libraries, if you use KDE you should use kid3.
-
-Package: kid3-kde4
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: KDE audio tag editor
- With Kid3, an ID3 tag editor for KDE you can:
-  * Edit ID3v1.1 tags in your MP3 files
-  * Edit all ID3v2.3 and ID3v2.4 frames in your MP3 files
-  * Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
-  * Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Speex,
-    TrueAudio and WavPack files.
-  * Edit tags of multiple files, e.g. the artist, album, year and genre
-    of all files of an album typically have the same values and can be
-    set together
-  * Generate tags from filenames
-  * Generate filenames from tags
-  * Generate playlist files
-  * Automatic case conversion and string translation
-  * Import and export album data
-  * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
- .
- This package uses KDE 4 libraries, if you use KDE 3 you should use kid3.

kid3/deb/kid3.mk → kid3/deb/kid3-kde3.mk

@@ -4,7 +4,7 @@ pixmaps = $(CURDIR)/debian/kid3/usr/share/pixmaps
 bindir = $(CURDIR)/debian/kid3/usr/bin
 kdedocs = $(CURDIR)/debian/kid3/usr/share/doc/kde/HTML
 
-build: kid3.build-stamp
+build: kid3-kde3.build-stamp
 
 -include debian/debiandirs
 
@@ -14,22 +14,25 @@ debian/debiandirs: admin/debianrules
 configure: Makefile.cvs
 	$(MAKE) -f Makefile.cvs
 
-kid3.build-stamp: configure
-	QTDIR=/usr/share/qt3 ./configure \
+kid3-kde3.build-stamp: configure
+	mkdir kid3-kde3; \
+	cd kid3-kde3; \
+	QTDIR=/usr/share/qt3 ../configure \
 	                        --host=$(DEB_HOST_GNU_TYPE) \
 	                        --build=$(DEB_BUILD_GNU_TYPE) \
-	                        $(configkde)
-	$(MAKE)
+	                        $(configkde); \
+	cd ..; \
+	$(MAKE) -C kid3-kde3
 
-	touch kid3.build-stamp
+	touch kid3-kde3.build-stamp
 
 clean: 
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-rm -f kid3.build-stamp po/*.gmo
+	[ ! -f kid3-kde3/Makefile ] || $(MAKE) -C kid3-kde3 distclean
+	-rm -rf kid3-kde3.build-stamp kid3-kde3
 
 install: build
 	# Main install.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kid3
+	$(MAKE) -C kid3-kde3 install DESTDIR=$(CURDIR)/debian/kid3
 
 	# Make common links for docs.
 	for i in `find $(kdedocs) -type d -name kid3 -not -regex .*/en/kid3`; do \

kid3/deb/kid3-kde4.1

-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KID3 1 "April 17, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kid3 \- Kid3 ID3 Tagger
-.SH SYNOPSIS
-.B kid3
-.RI [ options ] " dir"
-.SH DESCRIPTION
- With Kid3, an ID3 tag editor for KDE you can:
-.PD
-.IP 
-* Edit ID3v1.1 tags
-.IP
-* Edit all ID3v2.3 and ID3v2.4 frames
-.IP
-* Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
-.IP
-* Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Speex, TrueAudio and WavPack files.
-.IP
-* Edit tags of multiple files, e.g. the artist, album, year and genre of all files of an album typically have the same values and can be set together.
-.IP
-* Generate tags from filenames
-.IP
-* Generate filenames from tags
-.IP
-* Generate playlist files
-.IP
-* Automatic case conversion and string translation
-.IP
-* Import and export album data
-.IP
-* Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
-.PD 1
-
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.SH AUTHOR
-.B Kid3
-was written by Urs Fleisch <ufleisch@users.sourceforge.net>.
-.br
-This manual page was written by Aurelien Jarno <aurel32@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).

kid3/deb/kid3-kde4.docs

-AUTHORS
-NEWS
-README

kid3/deb/kid3-kde4.manpages

-debian/kid3-kde4.1

kid3/deb/kid3-kde4.mk

@@ -3,9 +3,11 @@
 # For Ubuntu <=8.04 use this:
 #DEB_CMAKE_PREFIX = /usr/lib/kde4
 #DEB_CONFIG_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/etc/kde4
+#DEB_HTML_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/doc/kde4/HTML
 # For Ubuntu >=8.10, Debian use this:
 DEB_CMAKE_PREFIX ?= /usr
-DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
+DEB_CONFIG_INSTALL_DIR ?= $(DEB_CMAKE_PREFIX)/share/kde4/config
+DEB_HTML_INSTALL_DIR ?= $(DEB_CMAKE_PREFIX)/share/doc/kde/HTML
 
 DEB_CMAKE_EXTRA_FLAGS += \
 			-DCMAKE_BUILD_TYPE=Debian \
@@ -16,7 +18,7 @@ DEB_CMAKE_EXTRA_FLAGS += \
 			-DKDE4_USE_ALWAYS_FULL_RPATH=false \
 			-DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
 			-DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \
-			-DHTML_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/doc/kde4/HTML \
+			-DHTML_INSTALL_DIR=$(DEB_HTML_INSTALL_DIR) \
 			-DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg \
 			-DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib \
 			-DSYSCONF_INSTALL_DIR=/etc
@@ -58,8 +60,8 @@ build: kid3-kde4.build-stamp
 kid3-kde4.build-stamp:
 	mkdir kid3-kde4; \
 	cd kid3-kde4; \
-	$(CMAKE) .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS)
-	cd ..
+	$(CMAKE) .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS); \
+	cd ..; \
 	$(MAKE) -C kid3-kde4
 
 	touch kid3-kde4.build-stamp
@@ -69,6 +71,6 @@ clean:
 	-rm -rf kid3-kde4.build-stamp kid3-kde4
 
 install: build
-	$(MAKE) -C kid3-kde4 install DESTDIR=$(CURDIR)/debian/kid3-kde4
+	$(MAKE) -C kid3-kde4 install DESTDIR=$(CURDIR)/debian/kid3
 
 .PHONY: build clean install

kid3/deb/kid3-qt.mk → kid3/deb/kid3-qt3.mk

@@ -3,25 +3,26 @@
 QMAKE = qmake-qt3
 DEB_CONFIGURE_PREFIX = /usr
 
-build: kid3-qt.build-stamp
+build: kid3-qt3.build-stamp
 
 kid3-qt/configure: kid3-qt/configure.in
 	cd kid3-qt && autoconf
 
-kid3-qt.build-stamp: kid3-qt/configure
-	cd kid3-qt; \
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+kid3-qt3.build-stamp: kid3-qt/configure
+	mkdir kid3-qt3; \
+	cd kid3-qt3; \
+	../kid3-qt/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	            --prefix=$(DEB_CONFIGURE_PREFIX) --with-qmake=$(QMAKE); \
-	cd ..
-	$(MAKE) -C kid3-qt
+	cd ..; \
+	$(MAKE) -C kid3-qt3
 
-	touch kid3-qt.build-stamp
+	touch kid3-qt3.build-stamp
 
 clean: 
-	[ ! -f kid3-qt/Makefile ] || $(MAKE) -C kid3-qt distclean
-	-rm -rf kid3-qt.build-stamp kid3-qt/kid3 kid3-qt/doc kid3-qt/po
+	[ ! -f kid3-qt3/Makefile ] || $(MAKE) -C kid3-qt3 distclean
+	-rm -rf kid3-qt3.build-stamp kid3-qt3
 
 install: build
-	$(MAKE) -C kid3-qt install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
+	$(MAKE) -C kid3-qt3 install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
 
 .PHONY: build clean install

kid3/deb/kid3-qt4.mk

+#!/usr/bin/make -f
+
+QMAKE = qmake-qt4
+DEB_CONFIGURE_PREFIX = /usr
+
+build: kid3-qt4.build-stamp
+
+kid3-qt/configure: kid3-qt/configure.in
+	cd kid3-qt && autoconf
+
+kid3-qt4.build-stamp: kid3-qt/configure
+	mkdir kid3-qt4; \
+	cd kid3-qt4; \
+	../kid3-qt/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	            --prefix=$(DEB_CONFIGURE_PREFIX) --with-qmake=$(QMAKE); \
+	cd ..; \
+	$(MAKE) -C kid3-qt4
+
+	touch kid3-qt4.build-stamp
+
+clean: 
+	[ ! -f kid3-qt4/Makefile ] || $(MAKE) -C kid3-qt4 distclean
+	-rm -rf kid3-qt4.build-stamp kid3-qt4
+
+install: build
+	$(MAKE) -C kid3-qt4 install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
+
+.PHONY: build clean install

kid3/deb/rules

@@ -3,9 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# By default, all binary packages listed in debian/control are build.
-# To build only a subset of the packages, set the variable DH_OPTIONS, e.g.
-# DH_OPTIONS="-p kid3-qt"
+# For Ubuntu <=8.04 use this:
+#PACKAGE_MAKEFILES = kid3-kde3.mk kid3-qt3.mk
+# For Ubuntu >=8.10, Debian use this:
+PACKAGE_MAKEFILES = kid3-kde4.mk kid3-qt4.mk
 
 INSTALL_DIR = install -p -d -o root -g root -m 755
 INSTALL_FILE = install -p -o root -g root -m 644
@@ -35,9 +36,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-
-	for p in `dh_listpackages`; do $(MAKE) -f debian/$$p.mk build; done
+	for p in $(PACKAGE_MAKEFILES); do $(MAKE) -f debian/$$p build; done
 
 	touch build-stamp
 
@@ -45,9 +44,8 @@ clean:
 	dh_testdir
 	dh_testroot
 
-	for p in `dh_listpackages`; do $(MAKE) -f debian/$$p.mk clean; done
+	for p in $(PACKAGE_MAKEFILES); do $(MAKE) -f debian/$$p clean; done
 
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	-rm -f *-stamp
 	dh_clean
 
@@ -57,7 +55,7 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	for p in `dh_listpackages`; do $(MAKE) -f debian/$$p.mk install; done
+	for p in $(PACKAGE_MAKEFILES); do $(MAKE) -f debian/$$p install; done
 
 binary-indep: build install
 
@@ -69,7 +67,8 @@ binary-arch: build install
 	dh_installman
 #	dh_installinfo
 	dh_installchangelogs ChangeLog
-	-dh_icons
+	dh_icons
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress --exclude=.docbook