[SCM] kdenlive packaging branch, master, updated. 9f550ac28d3e70cb6e0992fdea79b6c2f9777920

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9aeb6cc56cf56b00fd46437d58b42f9f882a347a
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Tue Mar 6 21:36:59 2012 +0000

    * Add patch 01-glu-include from Felix Geyer to build with Qt 4.8.
      Closes: #662769
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@3464 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog                   |  4 +++-
 debian/patches/01-glu-include.diff | 14 ++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b0d000..a4c743c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 kdenlive (0.8.2.1-2) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.9.3 (no changed needed).
+  * Add patch 01-glu-include from Felix Geyer to build with Qt 4.8.
+    Closes: #662769
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 24 Feb 2012 16:08:15 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 06 Mar 2012 22:39:24 +0100
 
 kdenlive (0.8.2.1-1) unstable; urgency=low
 
diff --git a/debian/patches/01-glu-include.diff b/debian/patches/01-glu-include.diff
new file mode 100644
index 0000000..321bb2a
--- /dev/null
+++ b/debian/patches/01-glu-include.diff
@@ -0,0 +1,14 @@
+# 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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..98cf9b5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-glu-include.diff

-- 
kdenlive packaging