rev 6723 - in kde-extras/kid3/trunk/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sun Jul 8 16:49:28 UTC 2007
Author: ana
Date: 2007-07-08 16:49:27 +0000 (Sun, 08 Jul 2007)
New Revision: 6723
Added:
kde-extras/kid3/trunk/debian/patches/
kde-extras/kid3/trunk/debian/patches/kid3-0.9-desktop.diff
kde-extras/kid3/trunk/debian/patches/kid3-0.9-kid3-qt-icon.diff
kde-extras/kid3/trunk/debian/patches/kid3-0.9-remove_user_actions.diff
kde-extras/kid3/trunk/debian/patches/series
Modified:
kde-extras/kid3/trunk/debian/changelog
kde-extras/kid3/trunk/debian/control
kde-extras/kid3/trunk/debian/copyright
kde-extras/kid3/trunk/debian/rules
Log:
kid3 0.9-2 sorry for the mini-monster-commit :)
Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog 2007-07-07 20:19:19 UTC (rev 6722)
+++ kde-extras/kid3/trunk/debian/changelog 2007-07-08 16:49:27 UTC (rev 6723)
@@ -1,14 +1,20 @@
-kid3 (0.9-2) UNRELEASED; urgency=low
+kid3 (0.9-2) unstable; urgency=low
- * NOT RELEASED YET
-
[ Mark Purcell ]
* Install debian/watch file
* Add myself to uploaders
* Add debian/rules get-orig-source target for http://buildserver.net
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 04 Jul 2007 15:21:46 +0200
+ [Ana Beatriz Guerrero Lopez]
+ * Package split, now it provides: kid3 (integrated with KDE) and kid3-qt
+ (for non-KDE users).
+ * Improve package descriptions. Thanks Urs!
+ * Added post-release patches: kid3-0.9-desktop, kid3-0.9-kid3-qt-icon and
+ kid3-0.9-remove_user_actions
+ * New needed b-d libvorbis-dev, libtag1-dev, docbook-utils and quilt.
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 08 Jul 2007 05:31:05 +0200
+
kid3 (0.9-1) unstable; urgency=low
* New upstream release. (Closes: #423464, #423468, #428872)
Modified: kde-extras/kid3/trunk/debian/control
===================================================================
--- kde-extras/kid3/trunk/debian/control 2007-07-07 20:19:19 UTC (rev 6722)
+++ kde-extras/kid3/trunk/debian/control 2007-07-08 16:49:27 UTC (rev 6723)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 5), libqt3-mt-dev (>= 3:3.3.4-7), kdelibs4-dev (>= 4:3.4.2-1), libid3-3.8.3-dev (>= 3.8.3-4.2), libtunepimp-dev, libflac++-dev (>= 1.1.2-1)
+Build-Depends: debhelper (>= 5), libqt3-mt-dev (>= 3:3.3.4-7), kdelibs4-dev (>= 4:3.4.2-1), libid3-3.8.3-dev (>= 3.8.3-4.2), libtunepimp-dev, libflac++-dev (>= 1.1.2-1), libvorbis-dev, libtag1-dev, docbook-utils, quilt
Standards-Version: 3.7.2
Package: kid3
@@ -12,10 +12,11 @@
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 frames in your MP3 files
- * Convert between ID3v1.1 and ID3v2.3 tags
+ * 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 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
@@ -24,6 +25,36 @@
* 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 libraries, if you do not use KDE you should use kid3-qt.
.
Author: Urs Fleisch <ufleisch at users.sourceforge.net>
Homepage: http://kid3.sourceforge.net/
+
+Package: kid3-qt
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Audio tag editor
+ With Kid3, an audio tag editor 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 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 does not use KDE libraries, if you use KDE you should use kid3.
+ .
+ Author: Urs Fleisch <ufleisch at users.sourceforge.net>
+ Homepage: http://kid3.sourceforge.net/
+
Modified: kde-extras/kid3/trunk/debian/copyright
===================================================================
--- kde-extras/kid3/trunk/debian/copyright 2007-07-07 20:19:19 UTC (rev 6722)
+++ kde-extras/kid3/trunk/debian/copyright 2007-07-08 16:49:27 UTC (rev 6723)
@@ -1,7 +1,7 @@
This package was debianized by Aurelien Jarno <aurelien at aurel32.net> on
Sat, 17 Apr 2004 19:02:08 +0100.
-Maintenance was taken over by Ana Beatriz Guerrero López
+Maintenance was taken over by Ana Beatriz Guerrero L�pez
<ana at debian.org> on Fri, 27 Oct 2006 19:26:06 +0200
It was downloaded from http://kid3.sourceforge.net/
@@ -10,7 +10,7 @@
Copyright:
-Copyright 2003-2006 Urs Fleisch <ufleisch at users.sourceforge.net>
+Copyright 2003-2007 Urs Fleisch <ufleisch at users.sourceforge.net>
License:
Added: kde-extras/kid3/trunk/debian/patches/kid3-0.9-desktop.diff
===================================================================
--- kde-extras/kid3/trunk/debian/patches/kid3-0.9-desktop.diff (rev 0)
+++ kde-extras/kid3/trunk/debian/patches/kid3-0.9-desktop.diff 2007-07-08 16:49:27 UTC (rev 6723)
@@ -0,0 +1,16 @@
+--- kid3-0.9/kid3/kid3.desktop~ 2007-05-15 21:17:39.000000000 +0300
++++ kid3-0.9/kid3/kid3.desktop 2007-06-29 22:08:14.000000000 +0300
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Kid3
+-Exec=kid3 -caption "%c" %i %m
++Exec=kid3 -caption "%c" %i
+ Icon=kid3
+ Type=Application
+ DocPath=kid3/index.html
+ MimeType=audio/x-mp3;audio/x-mpegurl;application/ogg;audio/x-flac;audio/x-flac+ogg;audio/x-vorbis+ogg;audio/x-speex+ogg;audio/x-oggflac;audio/x-musepack;
+ GenericName=ID3 Tagger
+ Terminal=false
+-Categories=Application;AudioVideo;KDE;
++Categories=AudioVideo;KDE;
Added: kde-extras/kid3/trunk/debian/patches/kid3-0.9-kid3-qt-icon.diff
===================================================================
--- kde-extras/kid3/trunk/debian/patches/kid3-0.9-kid3-qt-icon.diff (rev 0)
+++ kde-extras/kid3/trunk/debian/patches/kid3-0.9-kid3-qt-icon.diff 2007-07-08 16:49:27 UTC (rev 6723)
@@ -0,0 +1,11 @@
+diff -ru kid3-0.9/kid3-qt/configure-kid3-qt.pl kid3/kid3-qt/configure-kid3-qt.pl
+--- kid3-0.9/kid3-qt/configure-kid3-qt.pl 2007-05-22 21:56:30.000000000 +0200
++++ kid3/kid3-qt/configure-kid3-qt.pl 2007-06-16 11:17:01.000000000 +0200
+@@ -470,6 +470,7 @@
+ while (<IF>) {
+ s/^Name=Kid3$/Name=Kid3-qt/;
+ s/^Exec=kid3.*$/Exec=kid3-qt/;
++ s/^Icon=kid3$/Icon=kid3-qt/;
+ print OF $_;
+ }
+ print "creating $fn\n";
Added: kde-extras/kid3/trunk/debian/patches/kid3-0.9-remove_user_actions.diff
===================================================================
--- kde-extras/kid3/trunk/debian/patches/kid3-0.9-remove_user_actions.diff (rev 0)
+++ kde-extras/kid3/trunk/debian/patches/kid3-0.9-remove_user_actions.diff 2007-07-08 16:49:27 UTC (rev 6723)
@@ -0,0 +1,75 @@
+diff -ru kid3-0.9.orig/kid3/configdialog.cpp kid3-0.9/kid3/configdialog.cpp
+--- kid3-0.9.orig/kid3/configdialog.cpp 2007-05-21 19:27:01.000000000 +0200
++++ kid3-0.9/kid3/configdialog.cpp 2007-06-29 14:45:17.000000000 +0200
+@@ -178,8 +178,6 @@
+ m_commandsTable = new CommandsTable(commandsGroupBox, "commandsTable");
+ vlayout->addWidget(commandsGroupBox);
+ }
+- QSpacerItem* vspacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+- vlayout->addItem(vspacer);
+ }
+ #ifdef KID3_USE_KCONFIGDIALOG
+ addPage(actionsPage, i18n("User Actions"), "package_utilities");
+diff -ru kid3-0.9.orig/kid3/generalconfig.cpp kid3-0.9/kid3/generalconfig.cpp
+--- kid3-0.9.orig/kid3/generalconfig.cpp 2007-04-29 00:02:28.000000000 +0200
++++ kid3-0.9/kid3/generalconfig.cpp 2007-06-29 14:30:32.000000000 +0200
+@@ -112,6 +112,12 @@
+ }
+ return found ? val : dflt;
+ }
++
++bool Kid3Settings::removeEntry(const QString& key)
++{
++ m_map.erase(key);
++ return true;
++}
+ #endif
+ #endif
+
+diff -ru kid3-0.9.orig/kid3/generalconfig.h kid3-0.9/kid3/generalconfig.h
+--- kid3-0.9.orig/kid3/generalconfig.h 2007-04-29 00:02:28.000000000 +0200
++++ kid3-0.9/kid3/generalconfig.h 2007-06-29 14:30:17.000000000 +0200
+@@ -42,6 +42,7 @@
+ bool readBoolEntry(const QString& key, bool dflt = 0);
+ QStringList readListEntry(const QString& key);
+ QMap<QString, QString> readMapEntry(const QString& key, const QMap<QString, QString>& dflt);
++ bool removeEntry(const QString& key);
+ private:
+ QMap<QString, QString> m_map;
+ QString m_group;
+diff -ru kid3-0.9.orig/kid3/miscconfig.cpp kid3-0.9/kid3/miscconfig.cpp
+--- kid3-0.9.orig/kid3/miscconfig.cpp 2007-06-03 17:32:45.000000000 +0200
++++ kid3-0.9/kid3/miscconfig.cpp 2007-06-29 14:32:14.000000000 +0200
+@@ -162,6 +162,15 @@
+ ++it) {
+ config->writeEntry(QString("Command%1").arg(cmdNr++), (*it).toStringList());
+ }
++ // delete entries which are no longer used
++ for (;;) {
++ QStringList strList = config->readListEntry(QString("Command%1").arg(cmdNr));
++ if (strList.empty()) {
++ break;
++ }
++ config->deleteEntry(QString("Command%1").arg(cmdNr));
++ ++cmdNr;
++ }
+ #else
+ config->beginGroup("/" + m_group);
+ config->writeEntry("/NameFilter2", m_nameFilter);
+@@ -206,6 +215,16 @@
+ ++it) {
+ config->writeEntry(QString("/Command%1").arg(cmdNr++), (*it).toStringList());
+ }
++ // delete entries which are no longer used
++ bool ok;
++ for (;;) {
++ QStringList strList = config->readListEntry(QString("/Command%1").arg(cmdNr), &ok);
++ if (!ok) {
++ break;
++ }
++ config->removeEntry(QString("/Command%1").arg(cmdNr));
++ ++cmdNr;
++ }
+ config->endGroup();
+ #endif
+ }
Added: kde-extras/kid3/trunk/debian/patches/series
===================================================================
--- kde-extras/kid3/trunk/debian/patches/series (rev 0)
+++ kde-extras/kid3/trunk/debian/patches/series 2007-07-08 16:49:27 UTC (rev 6723)
@@ -0,0 +1,3 @@
+kid3-0.9-desktop.diff
+kid3-0.9-kid3-qt-icon.diff
+kid3-0.9-remove_user_actions.diff
Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules 2007-07-07 20:19:19 UTC (rev 6722)
+++ kde-extras/kid3/trunk/debian/rules 2007-07-08 16:49:27 UTC (rev 6723)
@@ -40,17 +40,27 @@
build-stamp:
dh_testdir
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+
QTDIR=/usr/share/qt3 ./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:
dh_testdir
dh_testroot
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) -C kid3-qt distclean
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-rm -f *-stamp
dh_clean
@@ -62,6 +72,7 @@
# 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 \
@@ -75,7 +86,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installdocs
+ dh_installdocs -A AUTHORS NEWS README
dh_installmenu
dh_installman
# dh_installinfo
More information about the pkg-kde-commits
mailing list