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

[Pino Toscano]

Author: pino
Date: 2012-02-20 11:07:50 +0000 (Mon, 20 Feb 2012)
New Revision: 19123

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
Log:
update patch 101_rename_normalize.diff (#597155)

properly consider "normalize" the identifier to use for the normalize-audio version
(thus fixing the normalize-audio detection)


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2012-02-20 09:57:39 UTC (rev 19122)
+++ kde-extras/k3b/trunk/debian/changelog	2012-02-20 11:07:50 UTC (rev 19123)
@@ -4,6 +4,9 @@
   * Add k3bscsicommand_bsd-Do-not-access-the-scsi_sense_data.patch (backported
     from upstream branch 2.0) to fix compatibility with FreeBSD >= 9.0
     libraries. (Closes: #660398)
+  * Update patch 101_rename_normalize.diff to properly consider "normalize"
+    the identifier to use for the normalize-audio version (thus fixing the
+    normalize-audio detection). (Closes: #597155)
 
  -- Pino Toscano <pino at debian.org>  Mon, 20 Feb 2012 10:45:46 +0100
 

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2012-02-20 09:57:39 UTC (rev 19122)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2012-02-20 11:07:50 UTC (rev 19123)
@@ -2,20 +2,22 @@
  Change that everywhere.... for real this time
 Reviewed-by: Didier Raboud <didier at raboud.com>
 Updated-by: Roderick B. Greening <roderick.greening at gmail.com>
-Last-Update: 2009-09-30
+Updated-by: Pino Toscano <pino at debian.org>
+Last-Update: 2012-02-20
 
 ---
- libk3b/core/k3bdefaultexternalprograms.cpp       |    2 +-
+ libk3b/core/k3bdefaultexternalprograms.cpp       |    8 +++++++-
+ libk3b/core/k3bdefaultexternalprograms.h         |    3 +++
  libk3b/projects/audiocd/k3baudiodoc.cpp          |    4 ++--
  libk3b/projects/audiocd/k3baudionormalizejob.cpp |   12 ++++++------
  src/k3bprojectmanager.cpp                        |    4 ++--
  src/projects/k3baudioburndialog.cpp              |   12 ++++++------
  src/projects/k3bmixedburndialog.cpp              |   12 ++++++------
- 6 files changed, 23 insertions(+), 23 deletions(-)
+ 7 files changed, 32 insertions(+), 23 deletions(-)
 
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -427,7 +427,7 @@ QString K3b::VcdbuilderProgram::versionI
+@@ -427,11 +427,17 @@ QString K3b::VcdbuilderProgram::versionI
  
  
  K3b::NormalizeProgram::NormalizeProgram()
@@ -24,6 +26,16 @@
  {
  }
  
+ 
++QString K3b::NormalizeProgram::versionIdentifier( const ExternalBin& /*bin*/ ) const
++{
++    return QLatin1String( "normalize" );
++}
++
++
+ K3b::GrowisofsProgram::GrowisofsProgram()
+     : K3b::SimpleExternalProgram( "growisofs" )
+ {
 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp
 +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
 @@ -590,7 +590,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
@@ -180,3 +192,15 @@
              m_checkNormalize->setChecked( false );
          }
          else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
+--- a/libk3b/core/k3bdefaultexternalprograms.h
++++ b/libk3b/core/k3bdefaultexternalprograms.h
+@@ -123,6 +123,9 @@ namespace K3b {
+     {
+     public:
+         NormalizeProgram();
++        
++    protected:
++        virtual QString versionIdentifier( const ExternalBin& bin ) const;
+     };
+ 
+