rev 15593 - in kde-extras/k3b/trunk/debian: . patches
Didier Raboud
odyx-guest at alioth.debian.org
Sun Aug 9 17:13:01 UTC 2009
Author: odyx-guest
Date: 2009-08-09 17:13:01 +0000 (Sun, 09 Aug 2009)
New Revision: 15593
Added:
kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
kde-extras/k3b/trunk/debian/patches/series
Removed:
kde-extras/k3b/trunk/debian/k3b-data.files
kde-extras/k3b/trunk/debian/libk3b3-extracodecs.install
kde-extras/k3b/trunk/debian/libk3b3.files
kde-extras/k3b/trunk/debian/libk3b3.install
kde-extras/k3b/trunk/debian/patches/111_advice_kubuntu_restricted_extras.diff
Modified:
kde-extras/k3b/trunk/debian/changelog
kde-extras/k3b/trunk/debian/k3b-data.install
kde-extras/k3b/trunk/debian/k3b.install
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/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/112_dont_require_mp3.diff
kde-extras/k3b/trunk/debian/rules
Log:
k3b: WIP.
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/changelog 2009-08-09 17:13:01 UTC (rev 15593)
@@ -16,6 +16,7 @@
libpolkit-grant-dev, libpolkit-dbus-dev, libpolkit-dev, libkcddb-dev
- Remove chrpath.
* Drop Conflicts/Replaces for versions lower than Lenny's.
+ * Use quilt
-- Fathi Boudra <fabo at debian.org> Wed, 22 Apr 2009 13:25:36 +0200
Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/k3b-data.install 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,7 +1,2 @@
-debian/tmp/usr/share/applnk/.hidden/*
-debian/tmp/usr/share/apps/*
-debian/tmp/usr/share/icons/*
-debian/tmp/usr/share/doc/kde/*
-debian/tmp/usr/share/sounds/*
-debian/tmp/usr/share/mimelnk/*
-debian/tmp/usr/share/services/*
+/etc/dbus-1/system.d/org.k3b.setup.conf
+/usr/share/*
Modified: kde-extras/k3b/trunk/debian/k3b.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b.install 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/k3b.install 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,5 +1,2 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/applications/*
-debian/k3b.xpm usr/share/pixmaps/
-debian/tmp/usr/lib/kde3/kfile_k3b.so
-debian/tmp/usr/lib/kde3/kfile_k3b.la
+/usr/bin/*
+../k3b.xpm /usr/share/pixmaps/
Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,103 +1,102 @@
-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
+Description: normalize is named "normalize-audio" in Debian.
+ Change that everywhere.
+Reviewed-by: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-09
+
+Index: k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp
+===================================================================
+--- k3b-1.66.0.orig/libk3b/core/k3bdefaultexternalprograms.cpp 2009-08-09 14:34:11.000000000 +0200
++++ k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp 2009-08-09 15:47:13.000000000 +0200
+@@ -388,7 +388,7 @@
- K3bNormalizeProgram::K3bNormalizeProgram()
-- : K3bExternalProgram( "normalize" )
-+ : K3bExternalProgram( "normalize-audio" )
+ K3b::NormalizeProgram::NormalizeProgram()
+- : K3b::SimpleExternalProgram( "normalize" )
++ : K3b::SimpleExternalProgram( "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");
- }
+Index: k3b-1.66.0/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+===================================================================
+--- k3b-1.66.0.orig/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2009-08-09 14:34:11.000000000 +0200
++++ k3b-1.66.0/libk3b/projects/audiocd/k3baudionormalizejob.cpp 2009-08-09 14:34:13.000000000 +0200
+@@ -50,10 +50,10 @@
+ connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
+ connect( m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotProcessExited(int, QProcess::ExitStatus)) );
- 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 K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
++ const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
-- 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);
- }
+ if( !bin ) {
+- emit infoMessage( i18n("Could not find normalize executable."), MessageError );
++ emit infoMessage( i18n("Could not find normalize-audio executable."), MessageError );
+ jobFinished(false);
+ return;
+ }
+@@ -80,8 +80,8 @@
+ if( !m_process->start( KProcess::OnlyStderrChannel ) ) {
+ // something went wrong when starting the program
+ // it "should" be the executable
+- kDebug() << "(K3b::AudioNormalizeJob) could not start normalize";
+- emit infoMessage( i18n("Could not start normalize."), K3b::Job::MessageError );
++ kDebug() << "(K3b::AudioNormalizeJob) could not start normalize-audio";
++ emit infoMessage( i18n("Could not start normalize-audio."), K3b::Job::MessageError );
+ jobFinished(false);
+ }
}
-@@ -106,7 +106,7 @@ void K3bAudioNormalizeJob::slotStdLine(
+@@ -104,7 +104,7 @@
- // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)",t,tt,m_files.at(t-1)) );
-- emit debuggingOutput( "normalize", line );
-+ emit debuggingOutput( "normalize-audio", line );
+- 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
+ // wenn "% done" drin:
+ // wenn ein --% drin ist, so beginnt ein neuer track
+@@ -183,7 +183,7 @@
+ break;
+ default:
+ if( !m_canceled ) {
+- emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize"), exitCode),
++ emit infoMessage( i18n("%1 returned an unknown error (code %2).",QString("normalize-audio"), exitCode),
+ K3b::Job::MessageError );
+ emit infoMessage( i18n("Please send me an email with the last output."), K3b::Job::MessageError );
+ emit infoMessage( i18n("Error while normalizing tracks."), MessageError );
+Index: k3b-1.66.0/src/projects/k3baudioburndialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/projects/k3baudioburndialog.cpp 2009-08-09 14:34:11.000000000 +0200
++++ k3b-1.66.0/src/projects/k3baudioburndialog.cpp 2009-08-09 14:34:13.000000000 +0200
+@@ -283,11 +283,11 @@
{
- 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() ) {
+ 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://normalize.nongnu.org/) "
++ 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://normalize.nongnu.org/) "
+ "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() ) {
+Index: k3b-1.66.0/src/projects/k3bmixedburndialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/projects/k3bmixedburndialog.cpp 2009-08-09 14:37:31.000000000 +0200
++++ k3b-1.66.0/src/projects/k3bmixedburndialog.cpp 2009-08-09 14:39:37.000000000 +0200
+@@ -290,10 +290,10 @@
+ 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://normalize.nongnu.org/) "
++ KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
++ "<p>K3b uses <em>normalize-audio</em> (http://normalize.nongnu.org/) "
+ "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() ) {
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 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,11 +1,13 @@
---- 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 ) ) {
+Index: k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp
+===================================================================
+--- k3b-1.66.0.orig/libk3b/core/k3bdefaultexternalprograms.cpp 2009-08-09 14:25:42.000000000 +0200
++++ k3b-1.66.0/libk3b/core/k3bdefaultexternalprograms.cpp 2009-08-09 14:26:11.000000000 +0200
+@@ -431,7 +431,7 @@
+ {
// 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") );
+- int pos = out.indexOf( QRegExp("DVD.*RW(/-RAM)? format utility") );
++ int pos = out.indexOf( QRegExp("DVD.*RAM format utility") );
if( pos < 0 )
- return false;
+ return Version();
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 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,42 +1,36 @@
-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 ) );
- }
--
-+
-+/*
+Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp 2009-08-09 14:30:29.000000000 +0200
++++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp 2009-08-09 14:31:43.000000000 +0200
+@@ -206,6 +206,7 @@
+ false ) );
+ }
+
++/*
#ifdef Q_OS_LINUX
- //
-@@ -237,8 +238,8 @@
- true ) );
+ //
+@@ -241,6 +242,7 @@
+ 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 ) );
- }
+ }
+
+ if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
+@@ -250,6 +252,7 @@
+ i18n("Install the cdrdao package."),
+ false ) );
+ }
+/*
- else {
+ else {
#ifdef Q_OS_LINUX
#ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -260,9 +262,9 @@
+@@ -264,6 +267,7 @@
#endif // CDRECORD_SUID_ROOT_CHECK
#endif
- }
+ }
+*/
- }
+ }
--
- if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
- if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
- problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
+
Modified: kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,14 +1,15 @@
-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
+Index: k3b-1.66.0/src/k3b.desktop
+===================================================================
+--- k3b-1.66.0.orig/src/k3b.desktop 2009-08-09 14:42:40.000000000 +0200
++++ k3b-1.66.0/src/k3b.desktop 2009-08-09 14:43:10.000000000 +0200
+@@ -94,8 +94,8 @@
+ Name[hne]=के3बी
+ Name[ne]=केथ्रीबी
+ Name[x-test]=xxK3bxx
+-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
+ Categories=KDE;Qt;AudioVideo;DiscBurning;
+ X-DBUS-ServiceType=Unique
Modified: kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/109_disable_firstrun.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,12 +1,13 @@
-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()
+Index: k3b-1.66.0/src/k3bapplication.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/k3bapplication.cpp 2009-08-09 14:45:30.000000000 +0200
++++ k3b-1.66.0/src/k3bapplication.cpp 2009-08-09 14:45:40.000000000 +0200
+@@ -137,7 +137,7 @@
- emit initializationDone();
+ emit initializationDone();
-- K3bFirstRun::run( m_mainWindow );
-+ //K3bFirstRun::run( m_mainWindow );
+- K3b::FirstRun::run( m_mainWindow );
++ //K3b::FirstRun::run( m_mainWindow );
- if( K3bSystemProblemDialog::readCheckSystemConfig() ) {
- emit initializationInfo( i18n("Checking System") );
+ if( K3b::SystemProblemDialog::readCheckSystemConfig() ) {
+ emit initializationInfo( i18n("Checking System") );
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 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,12 +1,13 @@
-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;
+Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp 2009-08-09 14:46:42.000000000 +0200
++++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp 2009-08-09 14:47:10.000000000 +0200
+@@ -589,7 +589,7 @@
+ if( problems.isEmpty() ) {
+ kDebug() << " - none - ";
+ if( level == AlwaysNotify ) {
+- K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
++// K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
+ }
+ }
+ else {
Added: kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -0,0 +1,14 @@
+Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp 2009-08-09 17:01:11.000000000 +0200
++++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp 2009-08-09 17:46:06.000000000 +0200
+@@ -520,8 +520,7 @@
+ "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 ) );
+ }
+
Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,19 +1,20 @@
-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
- //
+Index: k3b-1.66.0/src/k3bsystemproblemdialog.cpp
+===================================================================
+--- k3b-1.66.0.orig/src/k3bsystemproblemdialog.cpp 2009-08-09 14:52:01.000000000 +0200
++++ k3b-1.66.0/src/k3bsystemproblemdialog.cpp 2009-08-09 14:52:52.000000000 +0200
+@@ -503,6 +503,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 ) );
- }
+ QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
+ bool haveMp3Decoder = false;
+ for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
+@@ -523,6 +524,7 @@
+ "due to the missing libmad). To get Mp3 support, please install the package libk3b3-extracodecs."),
+ false ) );
+ }
+*/
#ifdef HAVE_ICONV_H
- char* codec = nl_langinfo( CODESET );
+ char* codec = nl_langinfo( CODESET );
Added: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/series 2009-08-09 17:13:01 UTC (rev 15593)
@@ -0,0 +1,8 @@
+101_rename_normalize.diff
+102_rename_dvd+rw-tools.diff
+104_dont_require_suid_cdrecord_or_cdrdao.diff
+107_iso_cue_mimetypes.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 2009-08-09 16:49:09 UTC (rev 15592)
+++ kde-extras/k3b/trunk/debian/rules 2009-08-09 17:13:01 UTC (rev 15593)
@@ -1,11 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no
DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
-
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
More information about the pkg-kde-commits
mailing list