rev 16298 - in kde-extras/k3b/trunk/debian: . patches

Michael Meskes meskes at alioth.debian.org
Sun Nov 22 14:32:02 UTC 2009 

Author: meskes
Date: 2009-11-22 14:32:02 +0000 (Sun, 22 Nov 2009)
New Revision: 16298

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
Log:
Updated normalize-audio patch to make sure the program is correctly recognized.
Thanks to Roderick B. Greening.



Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2009-11-22 14:17:48 UTC (rev 16297)
+++ kde-extras/k3b/trunk/debian/changelog	2009-11-22 14:32:02 UTC (rev 16298)
@@ -1,3 +1,10 @@
+k3b (1.68.0~alpha3-2) experimental; urgency=low
+
+  * Updated normalize-audio patch to make sure the program is correctly
+    recognized. Thanks to Roderick B. Greening. (Closes: #549221)
+
+ -- Michael Meskes <meskes at debian.org>  Sun, 22 Nov 2009 15:30:39 +0100
+
 k3b (1.68.0~alpha3-1) experimental; urgency=low
 
   * New upstream release.

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-11-22 14:17:48 UTC (rev 16297)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-11-22 14:32:02 UTC (rev 16298)
@@ -1,19 +1,42 @@
 Description: normalize is named "normalize-audio" in Debian.
- Change that everywhere.
+ Change that everywhere.... for real this time
 Reviewed-by: Didier Raboud <didier at raboud.com>
-Last-Update: 2009-08-09
+Updated-by: Roderick B. Greening <roderick.greening at gmail.com>
+Last-Update: 2009-09-30
 
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -389,7 +389,7 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
+@@ -388,8 +388,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
  
  
  K3b::NormalizeProgram::NormalizeProgram()
 -    : K3b::SimpleExternalProgram( "normalize" )
 +    : K3b::SimpleExternalProgram( "normalize-audio" )
  {
++    setVersionIdentifier( QLatin1String( "normalize" ) );
  }
  
+
+--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
++++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
+@@ -524,7 +524,7 @@
+                 return false;
+         }
+ 
+-        else if( e.nodeName() == "normalize" )
++        else if( e.nodeName() == "normalize-audio" )
+             setNormalize( e.text() == "yes" );
+ 
+         else if( e.nodeName() == "hide_first_track" )
+@@ -728,7 +728,7 @@
+     saveGeneralDocumentData( docElem );
+ 
+     // add normalize
+-    QDomElement normalizeElem = doc.createElement( "normalize" );
++    QDomElement normalizeElem = doc.createElement( "normalize-audio" );
+     normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) );
+     docElem->appendChild( normalizeElem );
+ 
 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
 +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
 @@ -50,10 +50,10 @@ void K3b::AudioNormalizeJob::start()
@@ -58,8 +81,46 @@
                                    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 );
+--- a/src/k3bprojectmanager.cpp
++++ b/src/k3bprojectmanager.cpp
+@@ -293,7 +293,7 @@
+ 
+         audioDoc->writeCdText( c.readEntry( "cd_text", true ) );
+         audioDoc->setHideFirstTrack( c.readEntry( "hide_first_track", false ) );
+-        audioDoc->setNormalize( c.readEntry( "normalize", false ) );
++        audioDoc->setNormalize( c.readEntry( "normalize-audio", false ) );
+         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 @@
+         K3b::MixedDoc* mixedDoc = static_cast<K3b::MixedDoc*>(doc);
+ 
+         mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) );
+-        mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize", false ) );
++        mixedDoc->audioDoc()->setNormalize( c.readEntry( "normalize-audio", false ) );
+ 
+         // load mixed type
+         if( c.readEntry( "mixed_type" ) == "last_track" )
 --- a/src/projects/k3baudioburndialog.cpp
 +++ b/src/projects/k3baudioburndialog.cpp
+@@ -186,7 +186,7 @@
+ 
+     m_cdtextWidget->setChecked( c.readEntry( "cd_text", true ) );
+     m_checkHideFirstTrack->setChecked( c.readEntry( "hide_first_track", false ) );
+-    m_checkNormalize->setChecked( c.readEntry( "normalize", false ) );
++    m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) );
+ 
+     m_comboParanoiaMode->setCurrentIndex( c.readEntry( "paranoia mode", 0 ) );
+     m_checkAudioRippingIgnoreReadErrors->setChecked( c.readEntry( "ignore read errors", true ) );
+@@ -202,7 +202,7 @@
+ 
+     c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
+     c.writeEntry( "hide_first_track", m_checkHideFirstTrack->isChecked() );
+-    c.writeEntry( "normalize", m_checkNormalize->isChecked() );
++    c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() );
+ 
+     c.writeEntry( "paranoia mode", m_comboParanoiaMode->currentText() );
+     c.writeEntry( "ignore read errors", m_checkAudioRippingIgnoreReadErrors->isChecked() );
 @@ -283,11 +283,11 @@ void K3b::AudioBurnDialog::slotNormalize
  {
      if( on ) {
@@ -78,12 +139,32 @@
          else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
 --- a/src/projects/k3bmixedburndialog.cpp
 +++ b/src/projects/k3bmixedburndialog.cpp
-@@ -290,10 +290,10 @@ void K3b::MixedBurnDialog::slotNormalize
+@@ -201,7 +201,7 @@
+     K3b::ProjectBurnDialog::loadSettings( c );
+ 
+     m_cdtextWidget->setChecked( c.readEntry( "cd_text", false ) );
+-    m_checkNormalize->setChecked( c.readEntry( "normalize", false ) );
++    m_checkNormalize->setChecked( c.readEntry( "normalize-audio", false ) );
+ 
+     // load mixed type
+     if( c.readEntry( "mixed_type" ) == "last_track" )
+@@ -225,7 +225,7 @@
+     K3b::ProjectBurnDialog::saveSettings(c);
+ 
+     c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
+-    c.writeEntry( "normalize", m_checkNormalize->isChecked() );
++    c.writeEntry( "normalize-audio", m_checkNormalize->isChecked() );
+ 
+     // save mixed type
+     switch( m_comboMixedModeType->selectedValue() ) {
+@@ -289,11 +289,11 @@ void K3b::MixedBurnDialog::slotNormalize
+ {
      if( on ) {
          // we are not able to normalize in on-the-fly mode
-         if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
+-        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 "

More information about the pkg-kde-commits mailing list