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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3a24f80ebadfdfccf01eaab894ce9c783ea49068
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 17 12:02:09 2014 +0100

    releasing package kde-dev-scripts version 4:14.12.0-0ubuntu1
---
 debian/changelog                         |  2 +-
 debian/patches/append_kde.diff           | 13 +++++++------
 debian/patches/series                    |  1 -
 debian/patches/upstream_install-man.diff | 20 --------------------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4fcfb6..8aea072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde-dev-scripts (4:14.12.0-0ubuntu1) UNRELEASED; urgency=medium
+kde-dev-scripts (4:14.12.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
 
diff --git a/debian/patches/append_kde.diff b/debian/patches/append_kde.diff
index 856cdbc..3062eae 100644
--- a/debian/patches/append_kde.diff
+++ b/debian/patches/append_kde.diff
@@ -3,11 +3,11 @@ Description: Append "-kde" to svn-clean like KDE3.
  svn-clean script is provided by subversion-tools.
 Bug-Debian: http://bugs.debian.org/461095
 
-Index: kde-dev-scripts/CMakeLists.txt
+Index: kde-dev-scripts-14.12.0/CMakeLists.txt
 ===================================================================
---- kde-dev-scripts.orig/CMakeLists.txt	2014-02-08 23:45:47.936915266 +0100
-+++ kde-dev-scripts/CMakeLists.txt	2014-02-08 23:45:47.936915266 +0100
-@@ -59,7 +59,6 @@
+--- kde-dev-scripts-14.12.0.orig/CMakeLists.txt
++++ kde-dev-scripts-14.12.0/CMakeLists.txt
+@@ -75,7 +75,6 @@ install(PROGRAMS
    cvs-clean
    cvsblame
    colorsvn
@@ -15,8 +15,9 @@ Index: kde-dev-scripts/CMakeLists.txt
    svnlastchange
    svnversions
    extractrc
-@@ -81,3 +80,4 @@
+@@ -96,3 +95,5 @@ install(PROGRAMS
+   kde-systemsettings-tree.py
    reviewboard-am
    DESTINATION ${BIN_INSTALL_DIR})
- 
++
 +install(PROGRAMS svn-clean DESTINATION ${BIN_INSTALL_DIR} RENAME svn-clean-kde)
diff --git a/debian/patches/series b/debian/patches/series
index 59480f7..b164b13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 append_kde.diff
-upstream_install-man.diff
diff --git a/debian/patches/upstream_install-man.diff b/debian/patches/upstream_install-man.diff
deleted file mode 100644
index bde6754..0000000
--- a/debian/patches/upstream_install-man.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-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()

-- 
kde-dev-scripts packaging