rev 16320 - in kde-extras/k3b/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Fri Nov 27 12:42:08 UTC 2009
Author: fabo
Date: 2009-11-27 12:42:07 +0000 (Fri, 27 Nov 2009)
New Revision: 16320
Removed:
kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
Modified:
kde-extras/k3b/trunk/debian/changelog
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/111_advice_debian_libk3b3-extracodes.diff
kde-extras/k3b/trunk/debian/patches/series
Log:
Remove 107_iso_cue_mimetypes.diff patch
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2009-11-27 12:20:10 UTC (rev 16319)
+++ kde-extras/k3b/trunk/debian/changelog 2009-11-27 12:42:07 UTC (rev 16320)
@@ -1,7 +1,8 @@
k3b (1.69.0~alpha4-1) experimental; urgency=low
* New upstream release.
- - Remove 114_new_libmpcdec_api.diff patch - Merged upstream.
+ - Remove 107_iso_cue_mimetypes.diff - Merged upstream.
+ - Remove 114_new_libmpcdec_api.diff - Merged upstream.
* Updated normalize-audio patch to make sure the program is correctly
recognized. Thanks to Roderick B. Greening. (Closes: #549221)
Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2009-11-27 12:20:10 UTC (rev 16319)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2009-11-27 12:42:07 UTC (rev 16320)
@@ -6,7 +6,7 @@
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -388,8 +388,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
+@@ -389,8 +389,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
K3b::NormalizeProgram::NormalizeProgram()
@@ -16,10 +16,10 @@
+ setVersionIdentifier( QLatin1String( "normalize" ) );
}
-
+
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
-@@ -524,7 +524,7 @@
+@@ -508,7 +508,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
return false;
}
@@ -28,7 +28,7 @@
setNormalize( e.text() == "yes" );
else if( e.nodeName() == "hide_first_track" )
-@@ -728,7 +728,7 @@
+@@ -712,7 +712,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 @@
+@@ -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 @@
+@@ -364,7 +364,7 @@ void K3b::ProjectManager::loadDefaults(
K3b::MixedDoc* mixedDoc = static_cast<K3b::MixedDoc*>(doc);
mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) );
@@ -103,7 +103,7 @@
if( c.readEntry( "mixed_type" ) == "last_track" )
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ void K3b::AudioBurnDialog::loadSettings(
m_cdtextWidget->setChecked( c.readEntry( "cd_text", true ) );
m_checkHideFirstTrack->setChecked( c.readEntry( "hide_first_track", false ) );
@@ -112,7 +112,7 @@
m_comboParanoiaMode->setCurrentIndex( c.readEntry( "paranoia mode", 0 ) );
m_checkAudioRippingIgnoreReadErrors->setChecked( c.readEntry( "ignore read errors", true ) );
-@@ -202,7 +202,7 @@
+@@ -202,7 +202,7 @@ void K3b::AudioBurnDialog::saveSettings(
c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
c.writeEntry( "hide_first_track", m_checkHideFirstTrack->isChecked() );
@@ -139,7 +139,7 @@
else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ void K3b::MixedBurnDialog::loadSettings(
K3b::ProjectBurnDialog::loadSettings( c );
m_cdtextWidget->setChecked( c.readEntry( "cd_text", false ) );
@@ -148,7 +148,7 @@
// load mixed type
if( c.readEntry( "mixed_type" ) == "last_track" )
-@@ -225,7 +225,7 @@
+@@ -225,7 +225,7 @@ void K3b::MixedBurnDialog::saveSettings(
K3b::ProjectBurnDialog::saveSettings(c);
c.writeEntry( "cd_text", m_cdtextWidget->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-11-27 12:20:10 UTC (rev 16319)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff 2009-11-27 12:42:07 UTC (rev 16320)
@@ -1,6 +1,6 @@
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -432,7 +432,7 @@ K3b::Version K3b::DvdformatProgram::pars
+@@ -433,7 +433,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/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2009-11-27 12:20:10 UTC (rev 16319)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2009-11-27 12:42:07 UTC (rev 16320)
@@ -5,7 +5,7 @@
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)."),
+- "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/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series 2009-11-27 12:20:10 UTC (rev 16319)
+++ kde-extras/k3b/trunk/debian/patches/series 2009-11-27 12:42:07 UTC (rev 16320)
@@ -1,7 +1,6 @@
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
More information about the pkg-kde-commits
mailing list