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

Sat Dec 7 21:15:15 UTC 2013

Author: msp
Date: 2013-12-07 21:15:14 +0000 (Sat, 07 Dec 2013)
New Revision: 19739

Removed:
   kde-extras/kid3/trunk/debian/kid3-qt.1
   kde-extras/kid3/trunk/debian/kid3-qt.doc-base
   kde-extras/kid3/trunk/debian/kid3-qt.lintian-overrides
   kde-extras/kid3/trunk/debian/kid3-qt.manpages
Modified:
   kde-extras/kid3/trunk/debian/changelog
   kde-extras/kid3/trunk/debian/compat
   kde-extras/kid3/trunk/debian/control
   kde-extras/kid3/trunk/debian/rules
Log:
* New upstream release 
* Switch to dh - reduce debian/rules bloat
* kid3 Replaces kid3-qt - low popcon, reduce archive bloat
* Fix vcs-field-not-canonical
* debian/compat -> 9
* Update Description:

Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================

--- kde-extras/kid3/trunk/debian/changelog	2013-12-06 22:00:27 UTC (rev 19738)
+++ kde-extras/kid3/trunk/debian/changelog	2013-12-07 21:15:14 UTC (rev 19739)
@@ -1,13 +1,23 @@
-kid3 (3.0.1-1) UNRELEASED; urgency=low
+kid3 (3.0.2-1) unstable; urgency=low
 
+  * New upstream release 
+
+  [ Patrick Matthäi ]
   * New upstream release.
     - Add new libreadline-dev build dependency.
   * Don't explicitly request xz compression - dpkg 1.17 does this by default.
   * Bump Standards-Version to 3.9.5 (no changes needed).
   * Fix Vcs-Browser control field.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 31 Oct 2013 10:52:51 +0100
+  [ Mark Purcell ]
+  * Switch to dh - reduce debian/rules bloat
+  * kid3 Replaces kid3-qt - low popcon, reduce archive bloat
+  * Fix vcs-field-not-canonical
+  * debian/compat -> 9
+  * Update Description:
 
+ -- Mark Purcell <msp at debian.org>  Sat, 30 Nov 2013 15:44:59 +1100
+
 kid3 (2.3-2) unstable; urgency=low
 
   * Upload to unstable

Modified: kde-extras/kid3/trunk/debian/compat
===================================================================
--- kde-extras/kid3/trunk/debian/compat	2013-12-06 22:00:27 UTC (rev 19738)
+++ kde-extras/kid3/trunk/debian/compat	2013-12-07 21:15:14 UTC (rev 19739)
@@ -1 +1 @@
-7
+9

Modified: kde-extras/kid3/trunk/debian/control
===================================================================
--- kde-extras/kid3/trunk/debian/control	2013-12-06 22:00:27 UTC (rev 19738)
+++ kde-extras/kid3/trunk/debian/control	2013-12-07 21:15:14 UTC (rev 19739)
@@ -5,7 +5,7 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>,
  Mark Purcell <msp at debian.org>,
  Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
  libqt4-dev,
  kdelibs5-dev,
  cmake,
@@ -23,41 +23,23 @@
  xsltproc
 Standards-Version: 3.9.5
 Homepage: http://kid3.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kid3/trunk/
+Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/kid3/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-kde/kde-extras/kid3/
 
 Package: kid3
 Architecture: any
+Conflicts: kid3-qt
+Replaces: kid3-qt
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: KDE MP3 ID3 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 Ogg/Vorbis tags
-  * Edit FLAC tags
-  * Edit APE tags in MPC files
-  * 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
+ An application to edit the ID3v1 and ID3v2 tags in MP3 files in an efficient
+ way. These tags can be edited by most MP3 players, but not in a very
+ comfortable and efficient way. Moreover the tags in Ogg/Vorbis, FLAC, MPC, APE,
+ MP4/AAC, MP2, Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker
+ modules (MOD, S3M, IT, XM) are supported too.
  .
- This package uses KDE libraries, if you do not use KDE you should use kid3-qt.
-
-Package: kid3-qt
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Audio tag editor
- With Kid3, an audio tag editor you can:
+ Features:
   * 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
@@ -75,5 +57,4 @@
   * Automatic case conversion and string translation
   * Import and export album data
   * Import from gnudb.org, TrackType.org, MusicBrainz, Discogs
- .
- This package does not use KDE libraries, if you use KDE you should use kid3.
+  * Export tags as CSV, HTML, playlists, Kover XML and in other formats

Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules	2013-12-06 22:00:27 UTC (rev 19738)
+++ kde-extras/kid3/trunk/debian/rules	2013-12-07 21:15:14 UTC (rev 19739)
@@ -1,129 +1,4 @@
 #!/usr/bin/make -f
+%:
+	dh $@  --parallel
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DEB_BUILD_HARDENING=1
-
-pixmaps = $(CURDIR)/debian/kid3/usr/share/pixmaps
-bindir = $(CURDIR)/debian/kid3/usr/bin
-kdedocs = $(CURDIR)/debian/kid3/usr/share/doc/kde/HTML
-
-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$$//')
-
-FILENAME := kid3_$(UPVERSION).orig.tar.gz
-UPFILENAME := kid3-$(UPVERSION).tar.gz
-URL = http://heanet.dl.sourceforge.net/kid3/$(UPFILENAME)
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-build: build-stamp
-
-build-arch: build
-
-build-indep: build
-
-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
-
-CMAKE_KDE4_FLAGS += \
-	-DCMAKE_SKIP_RPATH=true \
-	-DKDE4_USE_ALWAYS_FULL_RPATH=false \
-	-DWITH_MP4V2=false \
-	-DWITH_TUNEPIMP=false \
-	-DSYSCONF_INSTALL_DIR=/etc \
-	-DCMAKE_INSTALL_PREFIX=$(DEB_CMAKE_PREFIX) \
-	-DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
-	-DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \
-	-DHTML_INSTALL_DIR=$(DEB_HTML_INSTALL_DIR) \
-	-DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg \
-	-DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib
-
-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_TUNEPIMP=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
-	# KDE4 build.
-	mkdir kid3-kde4
-	cd kid3-kde4 && cmake .. $(CMAKE_KDE4_FLAGS)
-	$(MAKE) -C kid3-kde4
-	# Qt4 build.
-	mkdir kid3-qt
-	cd kid3-qt && cmake .. -DWITH_KDE=OFF $(CMAKE_QT4_FLAGS)
-	$(MAKE) -C kid3-qt
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -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
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	# Main install.
-	$(MAKE) -C kid3-kde4 install DESTDIR=$(CURDIR)/debian/kid3
-	$(MAKE) -C kid3-qt install DESTDIR=$(CURDIR)/debian/kid3-qt
-	rm $(CURDIR)/debian/kid3/usr/share/doc/kde/HTML/*/kid3/common
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -A AUTHORS NEWS README
-	dh_installmenu
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_icons
-	dh_link
-	dh_lintian
-	dh_strip
-	dh_compress --exclude=.docbook
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-get-orig-source:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(UPFILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)


