[SCM] libopenshot/master: merge patched into master

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

Capture multi-digit version numbers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 80d8656adeddc18c27ec97e105558ad840742215
X-Git-Newrev: cf72943c269f82dc424c259dfeeddb810322d6ee

The following commit has been merged in the master branch:
commit f97c56bcf3b850cd496ae9d110cd0f2fcf886e69
Merge: 56a5ae16497e78dfb6d065e0be4eb30bc5ae53b4 3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat Feb 4 14:23:46 2017 +0000

    merge patched into master

diff --combined debian/.git-dpm
index 8e5505c,0000000..fbfd554
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0dd01afe165a6216133075b333ebcc7905fde6e5
- 0dd01afe165a6216133075b333ebcc7905fde6e5
++3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7
++3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7
 +2f2a1992294bd8b9d7e225a37cf59fb4c62476ce
 +2f2a1992294bd8b9d7e225a37cf59fb4c62476ce
 +libopenshot_0.1.3+ds1.orig.tar.gz
 +c5f9c4f46eacfafc6605394a096b26dc4c6b9e08
 +10214545
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --combined debian/patches/0003-Capture-multi-digit-version-numbers.patch
index 0000000,0000000..36abacb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Capture-multi-digit-version-numbers.patch
@@@ -1,0 -1,0 +1,35 @@@
++From 3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7 Mon Sep 17 00:00:00 2001
++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 --combined debian/patches/series
index 0cfc594,0000000..95d5b11
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-use-system-libjsoncpp.patch
 +0002-disable-failing-tests.patch
++0003-Capture-multi-digit-version-numbers.patch

-- 
libopenshot packaging