rev 20122 - in kde-extras/k3b/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2015-12-12 12:52:17 +0000 (Sat, 12 Dec 2015)
New Revision: 20122

Added:
   kde-extras/k3b/trunk/debian/patches/cmake-duplicate-doc.diff
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/series
Log:
ix build

avoid adding the same subdirectory twice


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2015-12-12 12:49:05 UTC (rev 20121)
+++ kde-extras/k3b/trunk/debian/changelog	2015-12-12 12:52:17 UTC (rev 20122)
@@ -18,6 +18,8 @@
     - ffmpeg-more.diff: drop, fixed upstream
     - Prefer-growisofs-to-wodim-for-DVD-BluRay-burning.patch: drop, backported
       from upstream
+  * Fix build, avoid adding the same subdirectory twice; patch
+    cmake-duplicate-doc.diff.
   * Bump Standards-Version to 3.9.6, no changes required.
   * Re-enable the FFmpeg plugin, as it builds fine again:
     - install k3bffmpegdecoder.desktop in k3b-data

Added: kde-extras/k3b/trunk/debian/patches/cmake-duplicate-doc.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/cmake-duplicate-doc.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/cmake-duplicate-doc.diff	2015-12-12 12:52:17 UTC (rev 20122)
@@ -0,0 +1,16 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Do not add_subdirectory(doc) twice
+ Adding the same subdirectory in cmake will duplicate its targets, erroring
+ out during build.
+Last-Update: 2015-12-12
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -350,6 +350,3 @@ macro_display_feature_log()
+ 
+ include(MacroOptionalAddSubdirectory)
+ macro_optional_add_subdirectory( po )
+-
+-include(MacroOptionalAddSubdirectory)
+-macro_optional_add_subdirectory( doc )

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2015-12-12 12:49:05 UTC (rev 20121)
+++ kde-extras/k3b/trunk/debian/patches/series	2015-12-12 12:52:17 UTC (rev 20122)
@@ -4,3 +4,4 @@
 111_advice_debian_libk3b3-extracodes.diff
 112_dont_require_mp3.diff
 113_initial_preference.diff
+cmake-duplicate-doc.diff