[SCM] Phonon GStreamer backend packaging branch, master, updated. debian/4.8.2-1-14-g2822e22

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=2d43f41

The following commit has been merged in the master branch:
commit 2d43f4124862745a96e616ad8b6cd87398c9991a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon May 16 12:35:26 2016 +0200

    Drop upstream applied patch: gstreamer-compatibility.patch
---
 debian/patches/gstreamer-compatibility.patch | 45 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/gstreamer-compatibility.patch b/debian/patches/gstreamer-compatibility.patch
deleted file mode 100644
index 76f397a..0000000
--- a/debian/patches/gstreamer-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Alex Merry
-Description: Fix finding recent version of gstreamer
-Commit: https://git.reviewboard.kde.org/r/125690/
---- a/cmake/FindGStreamer.cmake
-+++ b/cmake/FindGStreamer.cmake
-@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
-    PATH_SUFFIXES gstreamer-1.0
-    )
- 
-+IF (NOT GSTREAMER_INCLUDE_DIR)
-+   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
-+ENDIF (NOT GSTREAMER_INCLUDE_DIR)
-+
-+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
-+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
-+   PATHS
-+   ${PKG_GSTREAMER_INCLUDE_DIRS}
-+   PATH_SUFFIXES gstreamer-1.0
-+   )
-+
-+IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
-+   MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
-+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
-+
-+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
-+   IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
-+      LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
-+   ENDIF()
-+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
-+
- FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
-    PATHS
-    ${PKG_GSTREAMER_LIBRARY_DIRS}
-@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
-    ${PKG_GSTREAMER_LIBRARY_DIRS}
-    )
- 
--IF (GSTREAMER_INCLUDE_DIR)
--ELSE (GSTREAMER_INCLUDE_DIR)
--   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
--ENDIF (GSTREAMER_INCLUDE_DIR)
--
- IF (GSTREAMER_LIBRARIES)
- ELSE (GSTREAMER_LIBRARIES)
-    MESSAGE(STATUS "GStreamer: WARNING: library not found")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f9149b1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gstreamer-compatibility.patch

-- 
Phonon GStreamer backend packaging