SOURCES: k3b-debian-ver.patch (NEW) - new; relax version checking

arekm arekm at pld-linux.org
Sun Dec 24 14:03:43 CET 2006


Author: arekm                        Date: Sun Dec 24 13:03:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new; relax version checking

---- Files affected:
SOURCES:
   k3b-debian-ver.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/k3b-debian-ver.patch
diff -u /dev/null SOURCES/k3b-debian-ver.patch:1.1
--- /dev/null	Sun Dec 24 14:03:43 2006
+++ SOURCES/k3b-debian-ver.patch	Sun Dec 24 14:03:38 2006
@@ -0,0 +1,92 @@
+diff -urN k3b-1.0rc2.org/libk3b/core/k3bdefaultexternalprograms.cpp k3b-1.0rc2/libk3b/core/k3bdefaultexternalprograms.cpp
+--- k3b-1.0rc2.org/libk3b/core/k3bdefaultexternalprograms.cpp	2006-12-13 15:41:57.000000000 +0100
++++ k3b-1.0rc2/libk3b/core/k3bdefaultexternalprograms.cpp	2006-12-24 11:56:34.710236000 +0100
+@@ -222,12 +222,12 @@
+   }
+ 
+   // FIXME: are these version correct?
+-  if( bin->version >= K3bVersion("1.11a38") )
++  if( bin->version >= K3bVersion("1.0pre1") )
+     bin->addFeature( "plain-atapi" );
+-  if( bin->version > K3bVersion("1.11a17") )
++  if( bin->version > K3bVersion("1.0pre1") )
+     bin->addFeature( "hacked-atapi" );
+ 
+-  if( bin->version >= K3bVersion( 2, 1, 1, "a02" ) )
++  if( bin->version >= K3bVersion( "1.0pre1" ) )
+     bin->addFeature( "short-track-raw" );
+ 
+   addBin( bin );
+@@ -475,10 +475,7 @@
+   }
+ 
+ 
+-  // FIXME: are these version correct?
+-  if( bin->version >= K3bVersion("1.11a38") )
+     bin->addFeature( "plain-atapi" );
+-  if( bin->version > K3bVersion("1.11a17") )
+     bin->addFeature( "hacked-atapi" );
+ 
+   addBin(bin);
+diff -urN k3b-1.0rc2.org/libk3b/projects/audiocd/k3baudiojob.cpp k3b-1.0rc2/libk3b/projects/audiocd/k3baudiojob.cpp
+--- k3b-1.0rc2.org/libk3b/projects/audiocd/k3baudiojob.cpp	2006-12-13 15:42:02.000000000 +0100
++++ k3b-1.0rc2/libk3b/projects/audiocd/k3baudiojob.cpp	2006-12-24 11:51:31.647295750 +0100
+@@ -264,7 +264,7 @@
+     bool cdrecordOnTheFly = false;
+     bool cdrecordCdText = false;
+     if( k3bcore->externalBinManager()->binObject("cdrecord") ) {
+-      cdrecordOnTheFly = k3bcore->externalBinManager()->binObject("cdrecord")->version >= K3bVersion( 2, 1, -1, "a13" );
++      cdrecordOnTheFly = k3bcore->externalBinManager()->binObject("cdrecord")->version >= K3bVersion( "1.0pre1" );
+       cdrecordCdText = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "cdtext" );
+     }    
+ 
+diff -urN k3b-1.0rc2.org/libk3b/projects/datadvd/k3bgrowisofsimager.cpp k3b-1.0rc2/libk3b/projects/datadvd/k3bgrowisofsimager.cpp
+--- k3b-1.0rc2.org/libk3b/projects/datadvd/k3bgrowisofsimager.cpp	2006-12-13 15:42:00.000000000 +0100
++++ k3b-1.0rc2/libk3b/projects/datadvd/k3bgrowisofsimager.cpp	2006-12-24 11:53:35.507036500 +0100
+@@ -119,6 +119,7 @@
+     return;
+   }
+   if( d->usedMultiSessionMode != K3bDataDoc::NONE ) {
++/*
+     if( m_mkisofsBin->version < K3bVersion( 2, 0 ) ) {
+       emit infoMessage( i18n("Mkisofs version %1 is too old. "
+ 			     "For writing multisession DVDs "
+@@ -127,6 +128,7 @@
+       jobFinished( false );
+       return;
+     }
++*/
+   }
+ 
+   emit debuggingOutput( "Used versions", "growisofs: " + m_growisofsBin->version );
+diff -urN k3b-1.0rc2.org/libk3b/projects/mixedcd/k3bmixedjob.cpp k3b-1.0rc2/libk3b/projects/mixedcd/k3bmixedjob.cpp
+--- k3b-1.0rc2.org/libk3b/projects/mixedcd/k3bmixedjob.cpp	2006-12-13 15:42:17.000000000 +0100
++++ k3b-1.0rc2/libk3b/projects/mixedcd/k3bmixedjob.cpp	2006-12-24 11:52:13.817931250 +0100
+@@ -1130,7 +1130,7 @@
+   if( k3bcore->externalBinManager()->binObject("cdrecord") ) {
+     cdrecordOnTheFly =
+       k3bcore->externalBinManager()->binObject("cdrecord")->version
+-      >= K3bVersion( 2, 1, -1, "a13" );
++      >= K3bVersion( "1.0pre1" );
+     cdrecordCdText =
+       k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "cdtext" );
+     cdrecordUsable =
+diff -urN k3b-1.0rc2.org/src/k3bsystemproblemdialog.cpp k3b-1.0rc2/src/k3bsystemproblemdialog.cpp
+--- k3b-1.0rc2.org/src/k3bsystemproblemdialog.cpp	2006-12-13 15:41:47.000000000 +0100
++++ k3b-1.0rc2/src/k3bsystemproblemdialog.cpp	2006-12-24 12:01:55.894308750 +0100
+@@ -181,6 +181,7 @@
+ 					 false ) );
+     }
+     else {
++/*
+       if( k3bcore->externalBinManager()->binObject( "cdrecord" )->version < K3bVersion( 2, 0 ) ) {
+ 	problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
+ 					   i18n("Used %1 version %2 is outdated").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
+@@ -190,6 +191,7 @@
+ 					   i18n("Install a more recent version of the cdrtools."),
+ 					   false ) );
+       }
++*/
+     
+ #ifdef Q_OS_LINUX
+ 
================================================================


More information about the pld-cvs-commit mailing list