[docopt.cpp] 05/07: merge patched into master

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository docopt.cpp.

commit 9bd42e78ce23b4341499bd1e78f5ca4b549ffecb
Merge: 74e643b ce9d87a
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Dec 8 10:50:31 2016 +0000

    merge patched into master

 CMakeLists.txt                                     |  4 ++++
 debian/.git-dpm                                    |  4 ++--
 .../patches/0001-set-versioning-properties.patch   | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 7b33944,0000000..25d7280
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
- 667f037d98524b4592cda963c24455cfb6ab73b4
- 667f037d98524b4592cda963c24455cfb6ab73b4
++ce9d87ab83741776c0a64311926e8121cef4a91d
++ce9d87ab83741776c0a64311926e8121cef4a91d
 +667f037d98524b4592cda963c24455cfb6ab73b4
 +667f037d98524b4592cda963c24455cfb6ab73b4
 +docopt.cpp_0.6.2.orig.tar.gz
 +8517b306ba5f8ac935b15bda562104c8a2976ec3
 +27126
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-set-versioning-properties.patch
index 0000000,0000000..391ce50
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-set-versioning-properties.patch
@@@ -1,0 -1,0 +1,24 @@@
++From ce9d87ab83741776c0a64311926e8121cef4a91d Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Thu, 8 Dec 2016 10:50:08 +0000
++Subject: set versioning properties
++
++---
++ CMakeLists.txt | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index ee01e7c..eaa85e5 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -75,6 +75,10 @@ if(NOT MSVC)
++ 	set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt)
++ endif()
++ 
+++set_target_properties(docopt PROPERTIES
+++        VERSION ${docopt.cpp_VERSION}
+++        SOVERSION 0)
+++
++ if(USE_BOOST_REGEX)
++ 	add_definitions("-DDOCTOPT_USE_BOOST_REGEX")
++ 	# This is needed on Linux, where linking a static library into docopt.so
diff --cc debian/patches/series
index 0000000,0000000..a185a91
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-set-versioning-properties.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/docopt.cpp.git