[SCM] KDE SDK module packaging branch, kde4.5, updated. debian/4.4.5-1-11-g4b00e53

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit 69dc7fb30775fc23ccab642946ea331ebc727d0b
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat Sep 4 13:07:33 2010 +0300

    Refresh patches.
    
    * Refresh patch 02_append_kde.diff.
    * Drop patch 03_kmtrace_compile.diff; fixed upstream in a better way.
---
 debian/changelog                       |    2 ++
 debian/patches/02_append_kde.diff      |    8 ++++----
 debian/patches/03_kmtrace_compile.diff |   19 -------------------
 debian/patches/series                  |    1 -
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ec025d..56a8692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ kdesdk (4:4.5.1-0r1) UNRELEASED; urgency=low
 
   [ George Kiagiadakis ]
   * Add myself to uploaders.
+  * Refresh patch 02_append_kde.diff.
+  * Drop patch 03_kmtrace_compile.diff; fixed upstream in a better way.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Sep 2010 12:56:39 +0300
 
diff --git a/debian/patches/02_append_kde.diff b/debian/patches/02_append_kde.diff
index 471b13c..2697ffe 100644
--- a/debian/patches/02_append_kde.diff
+++ b/debian/patches/02_append_kde.diff
@@ -1,16 +1,16 @@
 --- a/scripts/CMakeLists.txt
 +++ b/scripts/CMakeLists.txt
-@@ -42,7 +42,6 @@ install(PROGRAMS 
+@@ -43,7 +43,6 @@
    cvs-clean 
    cvsblame 
    colorsvn 
 -  svn-clean 
    svnlastchange 
    svnversions 
-   kdesvn-build 
-@@ -62,4 +61,6 @@ install(PROGRAMS 
-   svnintegrate 
+   kdesrc-build 
+@@ -65,4 +64,6 @@
    kde_generate_export_header
+   kde-systemsettings-tree.py
    DESTINATION ${BIN_INSTALL_DIR})
 - 
 +
diff --git a/debian/patches/03_kmtrace_compile.diff b/debian/patches/03_kmtrace_compile.diff
deleted file mode 100644
index 96c5a45..0000000
--- a/debian/patches/03_kmtrace_compile.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixed-For: 4.5.0
-Index: kdesdk-4.3.0/CMakeLists.txt
-===================================================================
---- kdesdk-4.3.0.orig/CMakeLists.txt	2009-08-22 00:52:14.000000000 +0200
-+++ kdesdk-4.3.0/CMakeLists.txt	2009-08-22 00:52:50.000000000 +0200
-@@ -51,11 +51,11 @@
- macro_optional_add_subdirectory(strigi-analyzer)
- macro_optional_add_subdirectory(kioslave)
- 
--if (CMAKE_SYSTEM_NAME MATCHES Linux)
-+if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-   #kmtrace is highly non-portable and requires glibc
-   #TODO: replace with a check for glibc
-   macro_optional_add_subdirectory(kmtrace)
--endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-+endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- 
- macro_optional_add_subdirectory(kompare)
- macro_optional_add_subdirectory(kprofilemethod)
diff --git a/debian/patches/series b/debian/patches/series
index ac47376..7dc96d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 02_append_kde.diff
-03_kmtrace_compile.diff

-- 
KDE SDK module packaging