[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=b44c8fa

The following commit has been merged in the kubuntu_xenial_archive branch:
commit b44c8fa20d3c7802f1a7a62213031cfe19c18489
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Wed Jan 13 08:18:58 2016 +0000

    - Drop merged patch 01-render-with-rescale-changes-fps.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6499 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                                       |  1 +
 patches/01-render-with-rescale-changes-fps.diff | 24 ------------------------
 patches/series                                  |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/changelog b/changelog
index 29cf5fb..5399a99 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 kdenlive (15.12.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop merged patch 01-render-with-rescale-changes-fps.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 13 Jan 2016 09:17:52 +0100
 
diff --git a/patches/01-render-with-rescale-changes-fps.diff b/patches/01-render-with-rescale-changes-fps.diff
deleted file mode 100644
index e1715b5..0000000
--- a/patches/01-render-with-rescale-changes-fps.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit caf513092be17d72a7117d7dc6d60826728a1b81
-Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
-Date:   Wed Dec 16 19:19:30 2015 +0100
-
-    Fix resizing on render ressetting frame rate to default 25
-
-diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
-index f7314cc..918753f 100644
---- a/renderer/renderjob.cpp
-+++ b/renderer/renderjob.cpp
-@@ -66,11 +66,10 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString& rend
-     if (out != -1) m_args << QLatin1String("out=") + QString::number(out);
-     m_args << preargs;
-     if (scenelist.startsWith(QLatin1String("consumer:"))) {
--        // Use MLT's producer_consumer, needs a different syntax for profile:
-+        // Use MLT's producer_consumer, safer to pass profile in an explicit way
-         m_args << QLatin1String("profile=") + profile;
--    } else {
--        m_args << QLatin1String("-profile") << profile;
-     }
-+    m_args << QLatin1String("-profile") << profile;
-     m_args << QLatin1String("-consumer") << rendermodule + QLatin1Char(':') + m_dest
-            << QLatin1String("progress=1") << args;
- 
diff --git a/patches/series b/patches/series
deleted file mode 100644
index cdc7eb7..0000000
--- a/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-render-with-rescale-changes-fps.diff

-- 
kdenlive packaging