rev 17359 - in kde-extras/k3b/trunk/debian: . patches source
Fathi Boudra
fabo at alioth.debian.org
Fri Mar 5 19:57:11 UTC 2010
Author: fabo
Date: 2010-03-05 19:57:09 +0000 (Fri, 05 Mar 2010)
New Revision: 17359
Added:
kde-extras/k3b/trunk/debian/source/
kde-extras/k3b/trunk/debian/source/format
Removed:
kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff
kde-extras/k3b/trunk/debian/patches/114_fix_ftbfs_kfreebsd.diff
Modified:
kde-extras/k3b/trunk/debian/changelog
kde-extras/k3b/trunk/debian/control
kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
kde-extras/k3b/trunk/debian/patches/series
kde-extras/k3b/trunk/debian/rules
Log:
* Remove patches:
- 113_add_kfreebsd_support.diff - merged upstream.
- 114_fix_ftbfs_kfreebsd.diff - stolen upstream.
* Update debian/control:
- bump build dependencies (debhelper and pkg-kde-tools).
- remove libpolkit-qt-dev build dependency.
* Update debian/rules:
- disable k3bsetup to build with kdelibs 4.3.x.
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/changelog 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,14 @@
-k3b (1.90.0-1) UNRELEASED; urgency=low
+k3b (1.90.0~rc1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove patches:
+ - 113_add_kfreebsd_support.diff - merged upstream.
+ - 114_fix_ftbfs_kfreebsd.diff - stolen upstream.
+ * Update debian/control:
+ - bump build dependencies (debhelper and pkg-kde-tools).
+ - remove libpolkit-qt-dev build dependency.
+ * Update debian/rules:
+ - disable k3bsetup to build with kdelibs 4.3.x.
-- Fathi Boudra <fabo at debian.org> Fri, 05 Mar 2010 20:18:39 +0100
Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/control 2010-03-05 19:57:09 UTC (rev 17359)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>, Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 7.4.10), cmake, pkg-kde-tools (>= 0.5.3),
+Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.5),
kdelibs5-dev (>= 4:4.3.4), libavformat-dev, libdvdread-dev, libflac++-dev,
libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
- libpolkit-qt-dev, libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
+ libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]
Standards-Version: 3.8.4
Homepage: http://www.k3b.org
Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2010-03-05 19:57:09 UTC (rev 17359)
@@ -19,7 +19,7 @@
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
-@@ -508,7 +508,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
+@@ -588,7 +588,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
return false;
}
@@ -28,7 +28,7 @@
setNormalize( e.text() == "yes" );
else if( e.nodeName() == "hide_first_track" )
-@@ -712,7 +712,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
+@@ -790,7 +790,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
saveGeneralDocumentData( docElem );
// add normalize
@@ -83,7 +83,7 @@
emit infoMessage( i18n("Error while normalizing tracks."), MessageError );
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
-@@ -293,7 +293,7 @@ void K3b::ProjectManager::loadDefaults(
+@@ -293,7 +293,7 @@ void K3b::ProjectManager::loadDefaults(
audioDoc->writeCdText( c.readEntry( "cd_text", true ) );
audioDoc->setHideFirstTrack( c.readEntry( "hide_first_track", false ) );
@@ -92,7 +92,7 @@
audioDoc->setAudioRippingParanoiaMode( c.readEntry( "paranoia mode", 0 ) );
audioDoc->setAudioRippingRetries( c.readEntry( "read retries", 128 ) );
audioDoc->setAudioRippingIgnoreReadErrors( c.readEntry( "ignore read errors", false ) );
-@@ -364,7 +364,7 @@ void K3b::ProjectManager::loadDefaults(
+@@ -364,7 +364,7 @@ void K3b::ProjectManager::loadDefaults(
K3b::MixedDoc* mixedDoc = static_cast<K3b::MixedDoc*>(doc);
mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) );
Modified: kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -208,6 +208,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -210,6 +210,7 @@ void K3b::SystemProblemDialog::checkSyst
i18n("Install a more recent version of the cdrtools.") ) );
}
@@ -8,7 +8,7 @@
#ifdef Q_OS_LINUX
//
-@@ -240,6 +241,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -242,6 +243,7 @@ void K3b::SystemProblemDialog::checkSyst
i18n("Click \"Modify Permissions...\" to solve this problem.") ) );
#endif // CDRECORD_SUID_ROOT_CHECK
#endif
@@ -16,7 +16,7 @@
}
if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -248,6 +250,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -250,6 +252,7 @@ void K3b::SystemProblemDialog::checkSyst
i18n("K3b uses cdrdao to actually write CDs."),
i18n("Install the cdrdao package.") ) );
}
@@ -24,7 +24,7 @@
else {
#ifdef Q_OS_LINUX
#ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -261,6 +264,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -263,6 +266,7 @@ void K3b::SystemProblemDialog::checkSyst
#endif // CDRECORD_SUID_ROOT_CHECK
#endif
}
Modified: kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -569,7 +569,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -571,7 +571,7 @@ void K3b::SystemProblemDialog::checkSyst
if( problems.isEmpty() ) {
kDebug() << " - none - ";
if( level == AlwaysNotify ) {
Modified: kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -503,8 +503,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -505,8 +505,7 @@ void K3b::SystemProblemDialog::checkSyst
"include MP3 support for legal reasons."),
i18n("To enable MP3 support, please install the MAD MP3 decoding library as well as the "
"K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -486,6 +486,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -488,6 +488,7 @@ void K3b::SystemProblemDialog::checkSyst
// Way too many users are complaining about K3b not being able to decode mp3 files. So just warn them about
// the legal restrictions with many distros
//
@@ -8,7 +8,7 @@
QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
bool haveMp3Decoder = false;
for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -505,6 +506,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -507,6 +508,7 @@ void K3b::SystemProblemDialog::checkSyst
"K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
"due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
}
Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/patches/series 2010-03-05 19:57:09 UTC (rev 17359)
@@ -4,5 +4,3 @@
110_disable_no_problems_found_popup.diff
111_advice_debian_libk3b3-extracodes.diff
112_dont_require_mp3.diff
-113_add_kfreebsd_support.diff
-114_fix_ftbfs_kfreebsd.diff
Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules 2010-03-05 19:20:35 UTC (rev 17358)
+++ kde-extras/k3b/trunk/debian/rules 2010-03-05 19:57:09 UTC (rev 17359)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-#DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
+# K3bSetup uses KAuth with kdelibs 4.4.x
+DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
%:
dh --parallel --list-missing --dbg-package=k3b-dbg --with kde $@
Added: kde-extras/k3b/trunk/debian/source/format
===================================================================
--- kde-extras/k3b/trunk/debian/source/format (rev 0)
+++ kde-extras/k3b/trunk/debian/source/format 2010-03-05 19:57:09 UTC (rev 17359)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-kde-commits
mailing list