[SCM] libopenshot/master: Rebase the patch queue

[ghisvail-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d94b0b28e51e03f47907f177d359d05ba547743a
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jun 13 10:16:47 2017 +0100

    Rebase the patch queue
    
    - Drop Capture-multi-digit-version-numbers.patch, applied upstream
    
    Gbp-Dch: Full

diff --git a/debian/patches/Capture-multi-digit-version-numbers.patch b/debian/patches/Capture-multi-digit-version-numbers.patch
deleted file mode 100644
index 0a5a667..0000000
--- a/debian/patches/Capture-multi-digit-version-numbers.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at users.noreply.github.com>
-Date: Sat, 28 Jan 2017 17:32:39 +0000
-Subject: Capture multi-digit version numbers
-
----
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1de241a..35055a0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,10 +49,10 @@ list (GET OPENSHOT_VERSION_LINES 2 LINE_BUILD)
- list (GET OPENSHOT_VERSION_LINES 3 LINE_SO)
- 
- #### Get the version number out of each line
--STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MAJOR.*([0-9])+;(.*)" "\\1" MAJOR_VERSION "${LINE_MAJOR}")
--STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MINOR.*([0-9])+;(.*)" "\\1" MINOR_VERSION "${LINE_MINOR}")
--STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_BUILD.*([0-9])+;(.*)" "\\1" BUILD_VERSION "${LINE_BUILD}")
--STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_SO.*([0-9])+;(.*)" "\\1" SO_VERSION "${LINE_SO}")
-+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MAJOR[ ]+([0-9]+);(.*)" "\\1" MAJOR_VERSION "${LINE_MAJOR}")
-+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MINOR[ ]+([0-9]+);(.*)" "\\1" MINOR_VERSION "${LINE_MINOR}")
-+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_BUILD[ ]+([0-9]+);(.*)" "\\1" BUILD_VERSION "${LINE_BUILD}")
-+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_SO[ ]+([0-9]+);(.*)" "\\1" SO_VERSION "${LINE_SO}")
- set(PROJECT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_VERSION}")
- 
- MESSAGE("--> MAJOR Version: ${MAJOR_VERSION}")
-@@ -84,4 +84,4 @@ add_subdirectory(tests)
- include(cmake/Modules/UseDoxygen.cmake)
- 
- file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR}/doc/html/*.*)
--INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
-\ No newline at end of file
-+INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
diff --git a/debian/patches/series b/debian/patches/series
index 93a2f2d..6fab4cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 Use-system-libjsoncpp.patch
 Disable-failing-tests.patch
-Capture-multi-digit-version-numbers.patch

-- 
libopenshot packaging