[SCM] kde-dev-scripts packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-5-ge3d4b5d

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kde-dev-scripts.git;a=commitdiff;h=e3d4b5d

The following commit has been merged in the kubuntu_vivid_archive branch:
commit e3d4b5d9f64fdd90b52877ed3ba8986f796602e1
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 3 16:49:37 2014 +0100

     Build-dep on kdoctools-dev and remove kde4 build-deps
    
    * Build-dep on kdoctools-dev and remove kde4 build-deps
    * Add upstream_install-man.diff to install man pages
---
 debian/changelog                         |  5 +++++
 debian/control                           |  3 +--
 debian/patches/series                    |  1 +
 debian/patches/upstream_install-man.diff | 20 ++++++++++++++++++++
 debian/rules                             |  2 +-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e8e9a8..7320dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kde-dev-scripts (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Philip Muškovac ]
   * Merge with debian unstable, remaining changes:
     - kdesdk-scripts depends on pkg-kde-tools
     - kdesdk-scripts breaks/replaces pkg-kde-tools (<< 0.15.12ubuntu1~)
@@ -8,6 +9,10 @@ kde-dev-scripts (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
   * Update Vcs urls for the new repository location
   * Update the maintainer
 
+  [ Jonathan Riddell ]
+  * Build-dep on kdoctools-dev and remove kde4 build-deps
+  * Add upstream_install-man.diff to install man pages
+
  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 16:54:43 +0100
 
 kde-dev-scripts (4:4.14.2-0ubuntu1) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index ae32317..abdec97 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev (>= 4:4.11),
+               kdoctools-dev,
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.6
 Homepage: http://www.kde.org/
diff --git a/debian/patches/series b/debian/patches/series
index b164b13..59480f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 append_kde.diff
+upstream_install-man.diff
diff --git a/debian/patches/upstream_install-man.diff b/debian/patches/upstream_install-man.diff
new file mode 100644
index 0000000..bde6754
--- /dev/null
+++ b/debian/patches/upstream_install-man.diff
@@ -0,0 +1,20 @@
+commit 6eb25e115420a41a2e54238136675c692e66870f
+Author: Jonathan Riddell <jr at jriddell.org>
+Date:   Wed Dec 3 16:43:51 2014 +0100
+
+    use ECM as this sets MAN_INSTALL_DIR
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27fe837..b0d6fa0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,9 @@ project(kde-dev-scripts)
+ 
+ find_package(KF5DocTools)
+ if(KF5DocTools_FOUND)
++  find_package(ECM 1.3.0 REQUIRED NO_MODULE)
++  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++  include(KDEInstallDirs)
+   function(create_manpage)
+     kdoctools_create_manpage(${ARGN})
+   endfunction()
diff --git a/debian/rules b/debian/rules
index dc713e7..e21e883 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_auto_install:
 	$(overridden_command)

-- 
kde-dev-scripts packaging