[SCM] kde-dev-scripts packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.2-0ubuntu1-12-gcd2ab3f

Clive Johnston clivejo-guest at moszumanska.debian.org
Mon Mar 7 11:46:38 UTC 2016


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

The following commit has been merged in the kubuntu_unstable branch:
commit cd2ab3f4d0b76a1b6dd42c646379d00e10818f82
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Mar 7 11:46:30 2016 +0000

    Removing upstream patch
---
 debian/changelog               |  4 ++++
 debian/patches/append_kde.diff | 23 -----------------------
 debian/patches/series          |  1 -
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b72d656..0dd50c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 kde-dev-scripts (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release.
   * Debian merge: No remaining changes. 
   * Fix typo. 
 
+  [ Clive Johnston ]
+  * Removing upstream patch
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 30 Jan 2016 06:44:46 -0800
 
 kde-dev-scripts (4:15.12.0-1~) UNRELEASED; urgency=medium
diff --git a/debian/patches/append_kde.diff b/debian/patches/append_kde.diff
deleted file mode 100644
index 3062eae..0000000
--- a/debian/patches/append_kde.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Fathi Boudra<fabo at debian.org>
-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-14.12.0/CMakeLists.txt
-===================================================================
---- 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
--  svn-clean
-   svnlastchange
-   svnversions
-   extractrc
-@@ -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 b164b13..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-append_kde.diff

-- 
kde-dev-scripts packaging



More information about the pkg-kde-commits mailing list