[SCM] kile packaging branch, master, updated. bc1dcfac9f0dd63f8c287de2dad442c0a00f8262

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Oct 23 19:08:17 UTC 2015


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

The following commit has been merged in the master branch:
commit bc1dcfac9f0dd63f8c287de2dad442c0a00f8262
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Oct 23 16:07:57 2015 -0300

    Add fix_doc_target.patch in order to avoid a FTBFS
---
 debian/changelog                    |  2 ++
 debian/patches/fix_doc_target.patch | 24 ++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3113c0f..11f18ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kile (4:2.1.3-3) UNRELEASED; urgency=low
   * Add myself to Uploaders with Mark's approval.
   * Moved the repo to git, update Vcs-[Browser Git].
   * Depend upon konsole4-kpart instead of konsole (Closes: #793747).
+  * Add fix_doc_target.patch in order to avoid a FTBFS due to a CMake
+    policy (Closes: #802403).
 
  -- Mark Purcell <msp at debian.org>  Sat, 01 Jun 2013 08:40:14 +1000
 
diff --git a/debian/patches/fix_doc_target.patch b/debian/patches/fix_doc_target.patch
new file mode 100644
index 0000000..10cb44f
--- /dev/null
+++ b/debian/patches/fix_doc_target.patch
@@ -0,0 +1,24 @@
+Description: mark CMake policy CMP0002 as OLD
+ This makes CMake ignore the policy that forbids two targets with the same
+ name.
+ .
+ This should be fixed at a later point.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802403
+Last-Update: 2015-10-23
+
+---
+ CMakeLists.txt |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6.2)
+ 
+ PROJECT( kile )
+ 
++cmake_policy(SET CMP0002 OLD)
++
+ find_package(KDE4 4.2.0 REQUIRED)
+ include (KDE4Defaults)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0d2892a..9542f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix_doc_target.patch
 01_install_doc.diff
 02_tex_doc_location.diff
 kubuntu_01_improved_viewpart_warning.diff

-- 
kile packaging



More information about the pkg-kde-commits mailing list