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

Fathi Boudra fabo at alioth.debian.org
Sat Jun 19 16:27:39 UTC 2010 

Author: fabo
Date: 2010-06-19 16:27:37 +0000 (Sat, 19 Jun 2010)
New Revision: 18380

Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/docs
   kde-extras/k3b/trunk/debian/k3b-i18n.install
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
   kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
   kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
   kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
   kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
   kde-extras/k3b/trunk/debian/patches/series
Log:
Update debian/k3b-i18n.install: handbook moved to userbase.kde.org.
Refresh patches
Disable patch 102 until further notice


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/changelog	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,6 +1,7 @@
-k3b (1.92.0~rc4-1) unstable; urgency=low
+k3b (1.93.0~rc4-1) unstable; urgency=low
 
   * New upstream release.
+  * Update debian/k3b-i18n.install: handbook moved to userbase.kde.org.
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 18 Jun 2010 21:25:46 +0300
 

Modified: kde-extras/k3b/trunk/debian/docs
===================================================================
--- kde-extras/k3b/trunk/debian/docs	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/docs	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,3 +1,2 @@
 FAQ
 README
-TODO

Modified: kde-extras/k3b/trunk/debian/k3b-i18n.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-i18n.install	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/k3b-i18n.install	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,4 +1,3 @@
-usr/share/doc/kde/HTML/*/k3b/
 usr/share/locale/*/LC_MESSAGES/k3b.mo
 usr/share/locale/*/LC_MESSAGES/k3bsetup.mo
 usr/share/locale/*/LC_MESSAGES/libk3b.mo

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2010-06-19 16:27:37 UTC (rev 18380)
@@ -6,20 +6,18 @@
 
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -390,8 +390,9 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
+@@ -427,7 +427,7 @@ QString K3b::VcdbuilderProgram::versionI
  
  
  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
-@@ -588,7 +588,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
+@@ -590,7 +590,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
                  return false;
          }
  
@@ -28,7 +26,7 @@
              setNormalize( e.text() == "yes" );
  
          else if( e.nodeName() == "hide_first_track" )
-@@ -790,7 +790,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
+@@ -792,7 +792,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
      saveGeneralDocumentData( docElem );
  
      // add normalize

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	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,6 +1,6 @@
 --- a/src/k3bsystemproblemdialog.cpp
 +++ b/src/k3bsystemproblemdialog.cpp
-@@ -210,6 +210,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -221,6 +221,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                     i18n("Install a more recent version of the cdrtools.") ) );
              }
  
@@ -8,15 +8,15 @@
  #ifdef Q_OS_LINUX
  
              //
-@@ -242,6 +243,7 @@ void K3b::SystemProblemDialog::checkSyst
-                                                    i18n("Click \"Modify Permissions...\" to solve this problem.") ) );
+@@ -257,6 +258,7 @@ void K3b::SystemProblemDialog::checkSyst
+             }
  #endif // CDRECORD_SUID_ROOT_CHECK
  #endif
 +*/
          }
  
          if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -250,6 +252,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -265,6 +267,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                 i18n("K3b uses cdrdao to actually write CDs."),
                                                 i18n("Install the cdrdao package.") ) );
          }
@@ -24,7 +24,7 @@
          else {
  #ifdef Q_OS_LINUX
  #ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -263,6 +266,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -280,6 +283,7 @@ void K3b::SystemProblemDialog::checkSyst
  #endif // CDRECORD_SUID_ROOT_CHECK
  #endif
          }

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	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,6 +1,6 @@
 --- a/src/k3bsystemproblemdialog.cpp
 +++ b/src/k3bsystemproblemdialog.cpp
-@@ -571,7 +571,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -593,7 +593,7 @@ void K3b::SystemProblemDialog::checkSyst
      if( problems.isEmpty() ) {
          kDebug() << "          - none - ";
          if( level == AlwaysNotify ) {

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	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,6 +1,6 @@
 --- a/src/k3bsystemproblemdialog.cpp
 +++ b/src/k3bsystemproblemdialog.cpp
-@@ -505,8 +505,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -526,8 +526,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                  "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 "

Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,6 +1,6 @@
 --- a/src/k3bsystemproblemdialog.cpp
 +++ b/src/k3bsystemproblemdialog.cpp
-@@ -488,6 +488,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -509,6 +509,7 @@ void K3b::SystemProblemDialog::checkSyst
      // 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
      //
@@ -8,7 +8,7 @@
      QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
      bool haveMp3Decoder = false;
      for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -507,6 +508,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -528,6 +529,7 @@ void K3b::SystemProblemDialog::checkSyst
                                                  "K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
                                                  "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
      }

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2010-06-19 05:35:07 UTC (rev 18379)
+++ kde-extras/k3b/trunk/debian/patches/series	2010-06-19 16:27:37 UTC (rev 18380)
@@ -1,5 +1,5 @@
 101_rename_normalize.diff
-102_rename_dvd+rw-tools.diff
+#102_rename_dvd+rw-tools.diff
 104_dont_require_suid_cdrecord_or_cdrdao.diff
 110_disable_no_problems_found_popup.diff
 111_advice_debian_libk3b3-extracodes.diff

More information about the pkg-kde-commits mailing list