[SCM] kdenlive packaging branch, kubuntu_wily_backports, updated. ubuntu/4%15.08.2-0ubuntu1-6-g30adba5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 30adba56884b9e51109ccf99b8dff7042ded41d2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Nov 10 21:21:03 2015 -0800

    Remove files.
---
 debian/changelog                              |  1 +
 debian/patches/kubuntu_use_gles_on_armhf.diff | 63 ---------------------------
 debian/patches/series                         |  0
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da6c113..c789cf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kdenlive (4:15.08.3-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream bugfix release
   * Remove upstream applied kubuntu_use_gles_on_armhf.diff 
+  * Remove files. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Nov 2015 16:06:11 -0800
 
diff --git a/debian/patches/kubuntu_use_gles_on_armhf.diff b/debian/patches/kubuntu_use_gles_on_armhf.diff
deleted file mode 100644
index 71b787e..0000000
--- a/debian/patches/kubuntu_use_gles_on_armhf.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Fix building on armhf
- On armhf QtOpengl is built against OpenGLES, so check whether it's
- build against OpenGL, and use OpenGLES if not.
-Origin: vendor
-Forwarded: https://bugs.kde.org/show_bug.cgi?id=350061
-Author: Philip Muskovac <yofel at kubuntu.org>
-Index: b/cmake/modules/FindOpenGLES.cmake
-===================================================================
---- /dev/null
-+++ b/cmake/modules/FindOpenGLES.cmake
-@@ -0,0 +1,52 @@
-+# - Try to find OpenGLES
-+# Once done this will define
-+#  
-+#  OPENGLES_FOUND           - system has OpenGLES and EGL
-+#  OPENGL_EGL_FOUND         - system has EGL
-+#  OPENGLES_INCLUDE_DIR     - the GLES include directory
-+#  OPENGLES_LIBRARY	    - the GLES library
-+#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
-+#  OPENGLES_EGL_LIBRARY	    - the EGL library
-+#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
-+#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
-+
-+FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
-+  /usr/openwin/share/include
-+  /opt/graphics/OpenGL/include /usr/X11R6/include
-+  /usr/include
-+)
-+
-+FIND_LIBRARY(OPENGLES_LIBRARY
-+  NAMES GLESv2
-+  PATHS /opt/graphics/OpenGL/lib
-+        /usr/openwin/lib
-+        /usr/shlib /usr/X11R6/lib
-+        /usr/lib
-+)
-+
-+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
-+  /usr/openwin/share/include
-+  /opt/graphics/OpenGL/include /usr/X11R6/include
-+  /usr/include
-+)
-+
-+FIND_LIBRARY(OPENGLES_EGL_LIBRARY
-+    NAMES EGL
-+    PATHS /usr/shlib /usr/X11R6/lib
-+          /usr/lib
-+)
-+
-+SET(OPENGL_EGL_FOUND "NO")
-+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
-+    SET(OPENGL_EGL_FOUND "YES")
-+ENDIF()
-+
-+SET(OPENGLES_FOUND "NO")
-+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
-+   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
-+    SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
-+                           ${OPENGLES_EGL_LIBRARY})
-+    SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
-+    SET(OPENGLES_FOUND "YES")
-+ENDIF()
-+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000

-- 
kdenlive packaging