[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=61e3379

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 61e3379715df8d1dfbaff1b43bde6b08f4f11d27
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Fri Apr 6 19:19:31 2012 +0000

    * New upstream git snapshot.
      - Remove merged patch 01-glu-include.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@3597 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                   |  6 ++++--
 patches/01-glu-include.diff | 14 --------------
 patches/series              |  1 -
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/changelog b/changelog
index 122c35d..43da975 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,11 @@
-kdenlive (0.8.2.1-3) UNRELEASED; urgency=low
+kdenlive (0.8.2.1+git20120406-1) UNRELEASED; urgency=low
 
+  * New upstream git snapshot.
+    - Remove merged patch 01-glu-include.
   * Wrap all debian/control lines.
   * Remove obsolete README.Debian.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 06 Apr 2012 21:16:50 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 06 Apr 2012 21:20:21 +0200
 
 kdenlive (0.8.2.1-2) unstable; urgency=low
 
diff --git a/patches/01-glu-include.diff b/patches/01-glu-include.diff
deleted file mode 100644
index 321bb2a..0000000
--- a/patches/01-glu-include.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix FTBFS with Qt 4.8.
-# Author: Felix Geyer <debfx at ubuntu.com>
-
-diff -Naur kdenlive-0.8.2.1.orig/src/videoglwidget.cpp kdenlive-0.8.2.1/src/videoglwidget.cpp
---- kdenlive-0.8.2.1.orig/src/videoglwidget.cpp	2011-12-07 09:02:13.000000000 +0100
-+++ kdenlive-0.8.2.1/src/videoglwidget.cpp	2012-03-06 22:37:09.804942053 +0100
-@@ -1,6 +1,7 @@
- 
- #include <QtGui>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include "videoglwidget.h"
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
diff --git a/patches/series b/patches/series
deleted file mode 100644
index 98cf9b5..0000000
--- a/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-glu-include.diff

-- 
kdenlive packaging