Merge lp:~j/ubuntu/oneiric/kdenlive/fix-for-899580 into lp:ubuntu/oneiric/kdenlive

[j^]

[Martin Pitt (pitti)]

Uploaded to oneiric-proposed with updated version number. However, before the SRU team accepts this from the queue this needs to be fixed in oneiric first.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-21 00:14:09 +0000
+++ debian/changelog	2011-12-04 10:02:27 +0000
@@ -1,3 +1,10 @@
+kdenlive (0.8-4build2) oneiric; urgency=low
+
+  * add patch to work with mlt version in oneiric.
+    LP: #899580
+
+ -- Jan Gerber <[e-mail]>  Sun, 04 Dec 2011 10:51:32 +0100
+
 kdenlive (0.8-4build1) oneiric; urgency=low
 
   * No change rebuild for mlt transition

=== added directory 'debian/patches'
=== added file 'debian/patches/kdenlive-newmlt.patch'
--- debian/patches/kdenlive-newmlt.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/kdenlive-newmlt.patch	2011-12-04 10:02:27 +0000
@@ -0,0 +1,66 @@
+diff -ur kdenlive-0.8.orig/src/wizard.cpp kdenlive-0.8/src/wizard.cpp
+--- kdenlive-0.8.orig/src/wizard.cpp	2011-04-26 21:44:22.000000000 +0200
++++ kdenlive-0.8/src/wizard.cpp	2011-07-21 18:22:18.470831892 +0200
+@@ -214,7 +214,7 @@
+         button(QWizard::NextButton)->setEnabled(false);
+     } else {
+         checkProcess.waitForFinished();
+-        QByteArray result = checkProcess.readAllStandardError();
++        QByteArray result = checkProcess.readAllStandardOutput();
+ 
+         // Check MLT avformat module
+         QTreeWidgetItem *avformatItem = new QTreeWidgetItem(m_mltCheck.programList, QStringList() << QString() << i18n("Avformat module (FFmpeg)"));
+@@ -246,7 +246,7 @@
+                     kDebug() << "// Error querying MLT's version";
+                 } else {
+                     checkProcess.waitForFinished();
+-                    mltVersion = checkProcess.readAllStandardError();
++                    mltVersion = checkProcess.readAllStandardOutput();
+                     mltVersion = mltVersion.section('\n', 0, 0).simplified();
+                     mltVersion = mltVersion.section(' ', -1).simplified();
+                     version = 1000 * mltVersion.section('.', 0, 0).toInt() + 100 * mltVersion.section('.', 1, 1).toInt() + mltVersion.section('.', 2, 2).toInt();
+@@ -275,7 +275,7 @@
+                     kDebug() << "// Error parsing MLT's avformat codecs";
+                 } else {
+                     checkProcess2.waitForFinished();
+-                    QByteArray codecList = checkProcess2.readAllStandardError();
++                    QByteArray codecList = checkProcess2.readAllStandardOutput();
+                     QString acodecList(codecList);
+                     QStringList result;
+                     QStringList alist = acodecList.split('\n', QString::SkipEmptyParts);
+@@ -292,7 +292,7 @@
+                     kDebug() << "// Error parsing MLT's avformat codecs";
+                 } else {
+                     checkProcess2.waitForFinished();
+-                    QByteArray codecList = checkProcess2.readAllStandardError();
++                    QByteArray codecList = checkProcess2.readAllStandardOutput();
+                     QString vcodecList(codecList);
+                     QStringList result;
+                     QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
+@@ -309,7 +309,7 @@
+                     kDebug() << "// Error parsing MLT's avformat codecs";
+                 } else {
+                     checkProcess2.waitForFinished();
+-                    QByteArray codecList = checkProcess2.readAllStandardError();
++                    QByteArray codecList = checkProcess2.readAllStandardOutput();
+                     QString vcodecList(codecList);
+                     QStringList result;
+                     QStringList vlist = vcodecList.split('\n', QString::SkipEmptyParts);
+@@ -606,7 +606,7 @@
+ 
+     checkProcess.waitForFinished();
+ 
+-    QByteArray result = checkProcess.readAllStandardError();
++    QByteArray result = checkProcess.readAllStandardOutput();
+     if (!result.contains("- avformat")) errorMessage.append(i18n("MLT's avformat (FFMPEG) module not found. Please check your FFMPEG and MLT install. Kdenlive will not work until this issue is fixed.") + "\n");*/
+ 
+     QProcess checkProcess2;
+@@ -616,7 +616,7 @@
+ 
+     checkProcess2.waitForFinished();
+ 
+-    QByteArray result = checkProcess2.readAllStandardError();
++    QByteArray result = checkProcess2.readAllStandardOutput();
+     if (!result.contains("sdl") || !result.contains("sdl_preview")) errorMessage.append(i18n("MLT's SDL module not found. Please check your MLT install. Kdenlive will not work until this issue is fixed.") + '\n');
+ 
+     if (!errorMessage.isEmpty()) {

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-12-04 10:02:27 +0000
@@ -0,0 +1,1 @@
+kdenlive-newmlt.patch