[kbibtex] 06/08: merge patched-gitdpm into gitdpm

[Bastien ROUCARIES]

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

broucaries-guest pushed a commit to branch gitdpm
in repository kbibtex.

commit c6441202a4367f576ad2c33a7cdfdd4bdb5f11b7
Merge: e685745 fbf1246
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sat Sep 2 15:12:21 2017 +0200

    merge patched-gitdpm into gitdpm

 CMakeLists.txt                                     |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...a-cmake-feature-that-create-cmake-failure.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 16220d3,0000000..9f8fb56
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 4794d25f910fcc3fd030d90f812220faabb8eb85
- 4794d25f910fcc3fd030d90f812220faabb8eb85
++fbf1246eb9cee62843c331a72dbec2a4b2fb3b42
++fbf1246eb9cee62843c331a72dbec2a4b2fb3b42
 +4794d25f910fcc3fd030d90f812220faabb8eb85
 +4794d25f910fcc3fd030d90f812220faabb8eb85
 +kbibtex_0.7~beta1.orig.tar.gz
 +9c3145170f05d0745b44440344f9f2b013d64586
 +11302986
diff --cc debian/patches/0001-Disable-a-cmake-feature-that-create-cmake-failure.patch
index 0000000,0000000..1e5744f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Disable-a-cmake-feature-that-create-cmake-failure.patch
@@@ -1,0 -1,0 +1,23 @@@
++From fbf1246eb9cee62843c331a72dbec2a4b2fb3b42 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
++Date: Sat, 2 Sep 2017 15:11:59 +0200
++Subject: Disable a cmake feature that create cmake failure
++
++Forwarded: no
++---
++ CMakeLists.txt | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index 484952a5..1c5f007e 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -23,7 +23,7 @@ if(POLICY CMP0022)
++ endif()
++ if(POLICY CMP0059)
++     # see also: https://cmake.org/cmake/help/v3.3/policy/CMP0059.html
++-    cmake_policy(SET CMP0059 OLD)
+++#    cmake_policy(SET CMP0059 OLD)
++ endif()
++ 
++ set(
diff --cc debian/patches/series
index 0000000,0000000..7d9816f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Disable-a-cmake-feature-that-create-cmake-failure.patch

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