[SCM] krecipes packaging branch, master, updated. debian/2.1.0-2-7-g3de4e2a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=3de4e2a

The following commit has been merged in the master branch:
commit 3de4e2a1418255e1552d3990343c0170e8082dba
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 15:52:15 2016 +0200

    avoid adding the 'doc' subdirectory twice
---
 debian/changelog                  |  1 +
 debian/patches/cmake-subdirs.diff | 13 +++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1eacebc..4dd036c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ krecipes (2.1.0-3) UNRELEASED; urgency=medium
     the cmake minimum version required and policies, and build properly with
     that; patch
     upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch.
+    - avoid adding the 'doc' subdirectory twice; patch cmake-subdirs.diff
   * Remove krecipes-dbg in favour of the -dbgsym packages.
   * Bump Standards-Version to 3.9.8, no changes required.
   * Remove obsolete get-orig-source target from rules, uscan is enough.
diff --git a/debian/patches/cmake-subdirs.diff b/debian/patches/cmake-subdirs.diff
new file mode 100644
index 0000000..6567c1d
--- /dev/null
+++ b/debian/patches/cmake-subdirs.diff
@@ -0,0 +1,13 @@
+Author: Pino Toscano <pino at debian.org>
+Description: cmake: avoid adding the 'doc' subdirectory twice
+Forwarded: not-needed
+Last-Update: 2016-06-18
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,4 +29,4 @@ include(MacroOptionalAddSubdirectory)
+ macro_optional_add_subdirectory( po )
+ 
+ include(MacroOptionalAddSubdirectory)
+-macro_optional_add_subdirectory( doc )
++#macro_optional_add_subdirectory( doc )
diff --git a/debian/patches/series b/debian/patches/series
index 511ee66..8470bf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 upstream_Fix-flags-for-KFontDialog-getFont.patch
 upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+cmake-subdirs.diff

-- 
krecipes packaging