rev 16766 - in kde-extras/k3b/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Feb 1 15:53:40 UTC 2010
Author: fabo
Date: 2010-02-01 15:53:39 +0000 (Mon, 01 Feb 2010)
New Revision: 16766
Removed:
kde-extras/k3b/trunk/debian/README.source
kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff
Modified:
kde-extras/k3b/trunk/debian/changelog
kde-extras/k3b/trunk/debian/control
kde-extras/k3b/trunk/debian/copyright
kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.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:
* Switch to dpkg-source 3.0 (quilt) format.
* Remove patch: 109_disable_firstrun.diff - merged upstream.
* Update debian/control:
- remove quilt build dependency.
- bump debhelper build dependency to 7.4.10.
- bump Standards-Version to 3.8.4 (no changes needed).
* Update debian/copyright: update years.
* Update debian/rules: enable parallel build (pass --parallel to dh).
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/changelog 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,6 +1,14 @@
k3b (1.70.0~beta1-1) unstable; urgency=low
* New upstream release.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Remove patch: 109_disable_firstrun.diff - merged upstream.
+ * Update debian/control:
+ - remove quilt build dependency.
+ - bump debhelper build dependency to 7.4.10.
+ - bump Standards-Version to 3.8.4 (no changes needed).
+ * Update debian/copyright: update years.
+ * Update debian/rules: enable parallel build (pass --parallel to dh).
-- Fathi Boudra <fabo at debian.org> Mon, 01 Feb 2010 14:53:04 +0100
Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/control 2010-02-01 15:53:39 UTC (rev 16766)
@@ -3,12 +3,12 @@
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.3.16), cmake, quilt, pkg-kde-tools (>= 0.5),
- kdelibs5-dev (>= 4:4.3.2), libavformat-dev, libdvdread-dev, libflac++-dev,
+Build-Depends: debhelper (>= 7.4.10), cmake, pkg-kde-tools (>= 0.5.3),
+ 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,
libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.k3b.org
Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/k3b/trunk/
Modified: kde-extras/k3b/trunk/debian/copyright
===================================================================
--- kde-extras/k3b/trunk/debian/copyright 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/copyright 2010-02-01 15:53:39 UTC (rev 16766)
@@ -16,8 +16,8 @@
Copyright:
- Copyright (C) 2001-2009 Sebastian Trueg
- Copyright (C) 2009 Michał Małek
+ Copyright (C) 2001-2010 Sebastian Trueg
+ Copyright (C) 2009-2010 Michał Małek
License:
@@ -39,7 +39,7 @@
The Debian packaging is:
- Copyright (C) 2008-2009 Fathi Boudra <fabo at debian.org>
+ Copyright (C) 2008-2010 Fathi Boudra <fabo at debian.org>
Copyright (C) 2005-2008 Francois Marier <francois at debian.org>
Copyright (C) 2003-2005 Jean-Michel Kelbert <kelbert at debian.org>
Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -6,7 +6,7 @@
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -389,8 +389,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
+@@ -390,8 +390,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
K3b::NormalizeProgram::NormalizeProgram()
Modified: kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,6 +1,6 @@
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -433,7 +433,7 @@ K3b::Version K3b::DvdformatProgram::pars
+@@ -434,7 +434,7 @@ K3b::Version K3b::DvdformatProgram::pars
{
// different locales make searching for the +- char difficult
// so we simply ignore it.
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-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,30 +1,30 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -206,6 +206,7 @@ void K3b::SystemProblemDialog::checkSyst
- false ) );
+@@ -208,6 +208,7 @@ void K3b::SystemProblemDialog::checkSyst
+ i18n("Install a more recent version of the cdrtools.") ) );
}
+/*
#ifdef Q_OS_LINUX
//
-@@ -241,6 +242,7 @@ void K3b::SystemProblemDialog::checkSyst
- true ) );
+@@ -240,6 +241,7 @@ void K3b::SystemProblemDialog::checkSyst
+ i18n("Click \"Modify Permissions...\" to solve this problem.") ) );
#endif // CDRECORD_SUID_ROOT_CHECK
#endif
+*/
}
if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -250,6 +252,7 @@ void K3b::SystemProblemDialog::checkSyst
- i18n("Install the cdrdao package."),
- false ) );
+@@ -248,6 +250,7 @@ void K3b::SystemProblemDialog::checkSyst
+ i18n("K3b uses cdrdao to actually write CDs."),
+ i18n("Install the cdrdao package.") ) );
}
+/*
else {
#ifdef Q_OS_LINUX
#ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -264,6 +267,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -261,6 +264,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-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -589,7 +589,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -569,7 +569,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-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,12 +1,12 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -520,8 +520,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 "
-- "due to the missing libmad). Some distributions allow installation of Mp3 support "
-- "via an online update tool (e.g. SUSE's YOU)."),
-+ "due to the missing libmad). To get Mp3 support, please install the package libk3b6-extracodecs."),
- false ) );
+@@ -503,8 +503,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 "
+- "due to the missing libmad). Some distributions allow installation of MP3 support "
+- "via an online update tool.") ) );
++ "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
}
+ #ifdef HAVE_ICONV_H
Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,6 +1,6 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -503,6 +503,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -486,6 +486,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,9 +8,9 @@
QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
bool haveMp3Decoder = false;
for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -523,6 +524,7 @@ void K3b::SystemProblemDialog::checkSyst
- "due to the missing libmad). To get Mp3 support, please install the package libk3b6-extracodecs."),
- false ) );
+@@ -505,6 +506,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-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/patches/series 2010-02-01 15:53:39 UTC (rev 16766)
@@ -1,7 +1,6 @@
101_rename_normalize.diff
102_rename_dvd+rw-tools.diff
104_dont_require_suid_cdrecord_or_cdrdao.diff
-109_disable_firstrun.diff
110_disable_no_problems_found_popup.diff
111_advice_debian_libk3b3-extracodes.diff
112_dont_require_mp3.diff
Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules 2010-02-01 15:53:09 UTC (rev 16765)
+++ kde-extras/k3b/trunk/debian/rules 2010-02-01 15:53:39 UTC (rev 16766)
@@ -3,6 +3,6 @@
#DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
%:
- dh --dbg-package=k3b-dbg --list-missing --with quilt,kde $@
+ dh --parallel --list-missing --dbg-package=k3b-dbg --with kde $@
.PHONY: override_dh_auto_test
More information about the pkg-kde-commits
mailing list