rev 10852 - in kde-extras/k3b/trunk/debian: . patches
Francois Marier
francois at alioth.debian.org
Tue Jun 3 02:02:57 UTC 2008
Author: francois
Date: 2008-06-03 02:02:57 +0000 (Tue, 03 Jun 2008)
New Revision: 10852
Added:
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/103_kdepotpath.diff
kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
kde-extras/k3b/trunk/debian/patches/105_add_iso_burning_to_welcome_screen.diff
kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff
kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff
kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
Removed:
kde-extras/k3b/trunk/debian/patches/kubuntu_101_rename_normalize.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_102_rename_dvd+rw-tools.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_103_kdepotpath.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_105_add_iso_burning_to_welcome_screen.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_107_iso_cue_mimetypes.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_109_disable_firstrun.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_110_disable_no_problems_found_popup.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_111_advice_kubuntu_restricted_extras.diff
kde-extras/k3b/trunk/debian/patches/kubuntu_112_dont_require_mp3.diff
Modified:
kde-extras/k3b/trunk/debian/changelog
Log:
Remove the kubuntu prefix on patches
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2008-06-03 01:58:06 UTC (rev 10851)
+++ kde-extras/k3b/trunk/debian/changelog 2008-06-03 02:02:57 UTC (rev 10852)
@@ -1,8 +1,9 @@
k3b (1.0.5-1) unstable; urgency=low
* New upstream release (closes: #465430, #483218)
+ * Remove the kubuntu prefix on debian/patches/kubuntu*
- -- Francois Marier <francois at debian.org> Tue, 03 Jun 2008 14:03:09 +1200
+ -- Francois Marier <francois at debian.org> Tue, 03 Jun 2008 14:07:47 +1200
k3b (1.0.4-9) unstable; urgency=low
Copied: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_101_rename_normalize.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,103 @@
+diff -Nurp k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp
+--- k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-11 16:36:12.000000000 +0000
++++ k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-12 14:21:32.000000000 +0000
+@@ -715,7 +715,7 @@ bool K3bVcdbuilderProgram::scan( const Q
+
+
+ K3bNormalizeProgram::K3bNormalizeProgram()
+- : K3bExternalProgram( "normalize" )
++ : K3bExternalProgram( "normalize-audio" )
+ {
+ }
+
+@@ -730,7 +730,7 @@ bool K3bNormalizeProgram::scan( const QS
+ if( fi.isDir() ) {
+ if( path[path.length()-1] != '/' )
+ path.append("/");
+- path.append("normalize");
++ path.append("normalize-audio");
+ }
+
+ if( !QFile::exists( path ) )
+
+diff -Nurp k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+--- k3b-1.0rc1/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2006-12-11 16:36:16.000000000 +0000
++++ k3b-1.0rc1-copy/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2006-12-12 14:23:51.000000000 +0000
+@@ -52,10 +52,10 @@ void K3bAudioNormalizeJob::start()
+ connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
+ connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
+
+- const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
++ const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
+
+ if( !bin ) {
+- emit infoMessage( i18n("Could not find normalize executable."), ERROR );
++ emit infoMessage( i18n("Could not find normalize-audio executable."), ERROR );
+ jobFinished(false);
+ return;
+ }
+@@ -82,8 +82,8 @@ void K3bAudioNormalizeJob::start()
+ if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ // something went wrong when starting the program
+ // it "should" be the executable
+- kdDebug() << "(K3bAudioNormalizeJob) could not start normalize" << endl;
+- emit infoMessage( i18n("Could not start normalize."), K3bJob::ERROR );
++ kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl;
++ emit infoMessage( i18n("Could not start normalize-audio."), K3bJob::ERROR );
+ jobFinished(false);
+ }
+ }
+@@ -106,7 +106,7 @@ void K3bAudioNormalizeJob::slotStdLine(
+
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
+
+- emit debuggingOutput( "normalize", line );
++ emit debuggingOutput( "normalize-audio", line );
+
+ // wenn "% done" drin:
+ // wenn ein --% drin ist, so beginnt ein neuer track
+@@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessEx
+ break;
+ default:
+ if( !m_canceled ) {
+- emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize").arg(p->exitStatus()),
++ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
+ K3bJob::ERROR );
+ emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
+ emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
+diff -Nurp k3b-1.0rc1/src/projects/k3baudioburndialog.cpp k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp
+--- k3b-1.0rc1/src/projects/k3baudioburndialog.cpp 2006-12-11 16:36:02.000000000 +0000
++++ k3b-1.0rc1-copy/src/projects/k3baudioburndialog.cpp 2006-12-12 14:28:32.000000000 +0000
+@@ -298,11 +298,11 @@ void K3bAudioBurnDialog::slotNormalizeTo
+ {
+ if( on ) {
+ // we are not able to normalize in on-the-fly mode
+- if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
+- KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
+- "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
++ if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
++ KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
++ "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
+ "to normalize audio tracks. In order to "
+- "use this functionality, please install it first.") );
++ "use this functionality, please install it first. (sudo apt-get install normalize-audio)") );
+ m_checkNormalize->setChecked( false );
+ }
+ else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
+diff -Nurp k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp
+--- k3b-1.0rc1/src/projects/k3bmixedburndialog.cpp 2006-12-11 16:36:03.000000000 +0000
++++ k3b-1.0rc1-copy/src/projects/k3bmixedburndialog.cpp 2006-12-12 14:29:27.000000000 +0000
+@@ -309,10 +309,10 @@ void K3bMixedBurnDialog::slotNormalizeTo
+ if( on ) {
+ // we are not able to normalize in on-the-fly mode
+ if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
+- KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
+- "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
++ KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
++ "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
+ "to normalize audio tracks. In order to "
+- "use this functionality, please install it first.") );
++ "use this functionality, please install it first (sudo apt-get install normalize-audio.") );
+ m_checkNormalize->setChecked( false );
+ }
+ else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
Copied: kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_102_rename_dvd+rw-tools.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,11 @@
+--- k3b-1.0rc1/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-11 16:36:12.000000000 +0000
++++ k3b-1.0rc1-copy/libk3b/core/k3bdefaultexternalprograms.cpp 2006-12-12 14:54:33.000000000 +0000
+@@ -870,7 +870,7 @@ bool K3bDvdformatProgram::scan( const QS
+ if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
+ // different locales make searching for the +- char difficult
+ // so we simply ignore it.
+- int pos = out.output().find( QRegExp("DVD.*RW(/-RAM)? format utility") );
++ int pos = out.output().find( QRegExp("DVD.*RAM format utility") );
+ if( pos < 0 )
+ return false;
+
Copied: kde-extras/k3b/trunk/debian/patches/103_kdepotpath.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_103_kdepotpath.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/103_kdepotpath.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/103_kdepotpath.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,19 @@
+diff -Nurp k3b-1.0rc2/admin/cvs.sh k3b-1.0rc2-copy/admin/cvs.sh
+--- k3b-1.0rc2/admin/cvs.sh 2006-12-13 14:40:56.000000000 +0000
++++ k3b-1.0rc2-copy/admin/cvs.sh 2006-12-18 14:36:23.000000000 +0000
+@@ -554,10 +554,11 @@ for subdir in $dirs; do
+ fi
+ perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
+
+- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
+- if ! test -f $kdepotpath; then
+- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
+- fi
++ #kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
++ #if ! test -f $kdepotpath; then
++ #kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
++ #fi
++ kdepotpath=/usr/include/kde/kde.pot
+
+ $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
+ XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
Copied: kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,42 @@
+diff -Nur k3b-1.0.1/src/k3bsystemproblemdialog.cpp k3b-1.0.1.new/src/k3bsystemproblemdialog.cpp
+--- k3b-1.0.1/src/k3bsystemproblemdialog.cpp 2007-04-18 17:43:19.000000000 +0200
++++ k3b-1.0.1.new/src/k3bsystemproblemdialog.cpp 2007-06-29 02:22:53.000000000 +0200
+@@ -202,7 +202,8 @@
+ i18n("Install a more recent version of the cdrtools."),
+ false ) );
+ }
+-
++
++/*
+ #ifdef Q_OS_LINUX
+
+ //
+@@ -237,8 +238,8 @@
+ true ) );
+ #endif // CDRECORD_SUID_ROOT_CHECK
+ #endif
++*/
+ }
+-
+ if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
+ problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
+ i18n("Unable to find %1 executable").arg("cdrdao"),
+@@ -246,6 +247,7 @@
+ i18n("Install the cdrdao package."),
+ false ) );
+ }
++/*
+ else {
+ #ifdef Q_OS_LINUX
+ #ifdef CDRECORD_SUID_ROOT_CHECK
+@@ -260,9 +262,9 @@
+ #endif // CDRECORD_SUID_ROOT_CHECK
+ #endif
+ }
++*/
+ }
+
+-
+ if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
+ if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
+ problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
Copied: kde-extras/k3b/trunk/debian/patches/105_add_iso_burning_to_welcome_screen.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_105_add_iso_burning_to_welcome_screen.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/105_add_iso_burning_to_welcome_screen.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/105_add_iso_burning_to_welcome_screen.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,12 @@
+diff -Nurp k3b-1.0rc3-clean/src/k3bwelcomewidget.cpp k3b-1.0rc3/src/k3bwelcomewidget.cpp
+--- k3b-1.0rc3-clean/src/k3bwelcomewidget.cpp 2006-12-29 20:41:04.000000000 +0000
++++ k3b-1.0rc3/src/k3bwelcomewidget.cpp 2007-01-08 11:50:52.000000000 +0000
+@@ -313,6 +313,8 @@ void K3bWelcomeWidget::loadConfig( KConf
+ sl.append( "file_new_data" );
+ sl.append( "file_new_dvd" );
+ sl.append( "tools_copy_cd" );
++ sl.append( "tools_write_cd_image" );
++ sl.append( "tools_write_dvd_iso" );
+ }
+
+ QPtrList<KAction> actions;
Copied: kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_107_iso_cue_mimetypes.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,14 @@
+diff -Nur k3b-1.0.1/src/k3b.desktop k3b-1.0.1.new/src/k3b.desktop
+--- k3b-1.0.1/src/k3b.desktop 2007-06-29 00:58:21.000000000 +0200
++++ k3b-1.0.1.new/src/k3b.desktop 2007-06-29 01:16:32.000000000 +0200
+@@ -109,8 +109,8 @@
+ Name[ar]= K3b
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+-MimeType=application/x-k3b
++MimeType=application/x-k3b;application/x-iso;application/x-cue
+ X-KDE-StartupNotify=true
+-X-KDE-NativeMimeType=application/x-k3b;application/x-iso
++X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
+ Categories=KDE;Application;AudioVideo;DiscBurning;
+ X-DCOP-ServiceType=Unique
Copied: kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_109_disable_firstrun.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,12 @@
+diff -Nurp k3b-1.0rc4-clean/src/k3bapplication.cpp k3b-1.0rc4/src/k3bapplication.cpp
+--- k3b-1.0rc4-clean/src/k3bapplication.cpp 2007-01-09 13:36:40.000000000 +0000
++++ k3b-1.0rc4/src/k3bapplication.cpp 2007-01-09 16:39:51.000000000 +0000
+@@ -143,7 +143,7 @@ void K3bApplication::init()
+
+ emit initializationDone();
+
+- K3bFirstRun::run( m_mainWindow );
++ //K3bFirstRun::run( m_mainWindow );
+
+ if( K3bSystemProblemDialog::readCheckSystemConfig() ) {
+ emit initializationInfo( i18n("Checking System") );
Copied: kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_110_disable_no_problems_found_popup.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,12 @@
+diff -Nurp k3b-1.0rc5-clean/src/k3bsystemproblemdialog.cpp k3b-1.0rc5/src/k3bsystemproblemdialog.cpp
+--- k3b-1.0rc5-clean/src/k3bsystemproblemdialog.cpp 2007-01-27 11:27:49.000000000 +0000
++++ k3b-1.0rc5/src/k3bsystemproblemdialog.cpp 2007-02-05 17:00:52.000000000 +0000
+@@ -580,7 +580,7 @@ void K3bSystemProblemDialog::checkSystem
+ }
+ if( problems.isEmpty() ) {
+ kdDebug() << " - none - " << endl;
+- K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") );
++ //K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") );
+ }
+ else {
+ static K3bSystemProblemDialog* s_openDlg = 0;
Copied: kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_111_advice_kubuntu_restricted_extras.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,14 @@
+diff -Nur k3b-1.0.2/src/k3bsystemproblemdialog.cpp k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp
+--- k3b-1.0.2/src/k3bsystemproblemdialog.cpp 2007-07-12 11:47:03.000000000 +0200
++++ k3b-1.0.2.new/src/k3bsystemproblemdialog.cpp 2007-07-12 11:48:00.000000000 +0200
+@@ -518,8 +518,8 @@
+ "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 (i.e. SuSE's YOU)."),
++ "due to the missing libmad). To get Mp3 support, please install libk3b3-extracodecs"
++ "."),
+ false ) );
+ }
+
Copied: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff (from rev 10850, kde-extras/k3b/trunk/debian/patches/kubuntu_112_dont_require_mp3.diff)
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2008-06-03 02:02:57 UTC (rev 10852)
@@ -0,0 +1,19 @@
+diff -Nur k3b-1.0.3/src/k3bsystemproblemdialog.cpp k3b-1.0.3.new/src/k3bsystemproblemdialog.cpp
+--- k3b-1.0.3/src/k3bsystemproblemdialog.cpp 2007-08-06 15:34:51.000000000 +0100
++++ k3b-1.0.3.new/src/k3bsystemproblemdialog.cpp 2007-08-06 15:36:09.000000000 +0100
+@@ -502,6 +502,7 @@
+ // 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
+ //
++/*
+ QPtrList<K3bPlugin> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
+ bool haveMp3Decoder = false;
+ for( QPtrListIterator<K3bPlugin> it( plugins ); *it; ++it ) {
+@@ -522,6 +523,7 @@
+ "or kubuntu-restricted-extras."),
+ false ) );
+ }
++*/
+
+ #ifdef HAVE_ICONV_H
+ char* codec = nl_langinfo( CODESET );
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_101_rename_normalize.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_102_rename_dvd+rw-tools.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_103_kdepotpath.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_104_dont_require_suid_cdrecord_or_cdrdao.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_105_add_iso_burning_to_welcome_screen.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_107_iso_cue_mimetypes.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_109_disable_firstrun.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_110_disable_no_problems_found_popup.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_111_advice_kubuntu_restricted_extras.diff
Deleted: kde-extras/k3b/trunk/debian/patches/kubuntu_112_dont_require_mp3.diff
More information about the pkg-kde-commits
mailing list