[SCM] gerbera/master: Use new shared library provided by duktape-dev

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 66672f28a9af45e3ffa58823ed41e1dcadccf69e
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Nov 21 22:48:57 2017 +0000

    Use new shared library provided by duktape-dev
    
    Add versioned build dependency to ensure new version of duktape-dev is
    pulled in.

diff --git a/debian/control b/debian/control
index 06649c3..f26fa12 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 10),
  default-libmysqlclient-dev,
  dh-exec,
- duktape-dev,
+ duktape-dev (>= 2.2.0-1~),
  libavcodec-dev,
  libavformat-dev,
  libavutil-dev,
diff --git a/debian/patches/0011_duktape-nolib.patch b/debian/patches/0011_duktape-nolib.patch
deleted file mode 100644
index d4d767e..0000000
--- a/debian/patches/0011_duktape-nolib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Adjust FindDuktape.cmake to handle Debian's duktape-dev
- Upstream gerbera expects duktape to be shipped as a shared library, but in
- Debian the sources are shipped directly. Arrange for the source to be compiled
- into a static library in the FindDuktape.cmake script.
-Author: James Cowgill <jcowgill at debian.org>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/FindDuktape.cmake
-+++ b/cmake/FindDuktape.cmake
-@@ -7,16 +7,11 @@
- #  DUKTAPE_DEFINITIONS - Compiler switches required for using Duktape
- #
- 
--find_package(PkgConfig QUIET)
--pkg_check_modules(PC_DUK QUIET duktape libduktape)
-+set(DUKTAPE_INCLUDE_DIR "/usr/share/duktape" CACHE PATH "DukTape Include Directory")
-+set(DUKTAPE_LIBRARY duktape CACHE STRING "DukTape Library")
- 
--find_path(DUKTAPE_INCLUDE_DIR duktape.h
--    HINTS ${PC_DUK_INCLUDEDIR} ${PC_DUK_INCLUDE_DIRS}
--    PATH_SUFFIXES duktape)
--
--find_library(DUKTAPE_LIBRARY
--    NAMES duktape libduktape
--    HINTS ${PC_DUK_LIBDIR} ${PC_DUK_LIBRARY_DIRS})
-+add_library(duktape STATIC "/usr/share/duktape/duktape.c")
-+target_include_directories(duktape PUBLIC ${DUKTAPE_INCLUDE_DIR})
- 
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Duktape
diff --git a/debian/patches/series b/debian/patches/series
index e555bff..65f557a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0008_symlinks.patch
-0011_duktape-nolib.patch
 0012_reload-log-on-hup.patch
 0013_more-spelling.patch

-- 
gerbera packaging