[SCM] KDE SDK module packaging branch, master, updated. debian/4.6.5-1-7-g7d86012

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 2c81cd02d5cfb154aeffce30b3476ce73f2815e1
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Sep 27 13:56:32 2011 +0100

    Update append_kde.diff
---
 debian/changelog               |    1 +
 debian/patches/append_kde.diff |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1042fda..e3b0727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ kdesdk (4:4.7.1-0r0) UNRELEASED; urgency=low
     * Bump kde-sc-dev-latest to 4:4.7.1.
     * Bump kdepimlibs5-dev to >= 4:4.7.
     * Bump libkonq5-dev to >= 4:4.7.
+  * Update append_kde.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Sep 2011 13:26:57 +0100
 
diff --git a/debian/patches/append_kde.diff b/debian/patches/append_kde.diff
index 2697ffe..6811b0c 100644
--- a/debian/patches/append_kde.diff
+++ b/debian/patches/append_kde.diff
@@ -1,18 +1,18 @@
+Rename svn-clean to svn-clean-kde to avoid conflicts with subversion-tools
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -43,7 +43,6 @@
+@@ -42,7 +42,6 @@
    cvs-clean 
    cvsblame 
    colorsvn 
 -  svn-clean 
    svnlastchange 
    svnversions 
-   kdesrc-build 
-@@ -65,4 +64,6 @@
+   extractrc 
+@@ -63,4 +62,5 @@
    kde_generate_export_header
    kde-systemsettings-tree.py
    DESTINATION ${BIN_INSTALL_DIR})
 - 
 +
 +install(PROGRAMS svn-clean DESTINATION ${BIN_INSTALL_DIR} RENAME svn-clean-kde)
-+

-- 
KDE SDK module packaging