[SCM] KDE Utilities module packaging branch, master, updated. debian/4.7.2-1-7-g5ed5785
Pino Toscano
pino at alioth.debian.org
Mon Dec 19 10:06:24 UTC 2011
The following commit has been merged in the master branch:
commit 5ed5785344f86e8b093df583bce9072a37d340e2
Author: Pino Toscano <pino at debian.org>
Date: Mon Dec 19 11:05:51 2011 +0100
remove_workspace.patch: -pab
---
debian/patches/remove_workspace.patch | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/debian/patches/remove_workspace.patch b/debian/patches/remove_workspace.patch
index d78b195..12b22be 100644
--- a/debian/patches/remove_workspace.patch
+++ b/debian/patches/remove_workspace.patch
@@ -2,8 +2,8 @@ Author: Pino Toscano <pino at debian.org>
Description: remove extra kdebase-workspace dependency
Last-Update: 2011-10-11
Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotecontrol repository)
---- kdeutils-4.7.2.orig/kremotecontrol/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/CMakeLists.txt
+--- a/kremotecontrol/CMakeLists.txt
++++ b/kremotecontrol/CMakeLists.txt
@@ -21,11 +21,9 @@ else()
set(STUFF_REQUIRED FALSE)
endif()
@@ -17,8 +17,8 @@ Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotec
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
macro_display_feature_log()
else()
---- kdeutils-4.7.2.orig/kremotecontrol/libkremotecontrol/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/libkremotecontrol/CMakeLists.txt
+--- a/kremotecontrol/libkremotecontrol/CMakeLists.txt
++++ b/kremotecontrol/libkremotecontrol/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
${KDE4_INCLUDES}
${QT_INCLUDES}
@@ -27,8 +27,8 @@ Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotec
)
---- kdeutils-4.7.2.orig/kremotecontrol/krcdnotifieritem/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/krcdnotifieritem/CMakeLists.txt
+--- a/kremotecontrol/krcdnotifieritem/CMakeLists.txt
++++ b/kremotecontrol/krcdnotifieritem/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES}
@@ -38,8 +38,8 @@ Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotec
set(krcdnotifieritem_SRCS
main.cpp
---- kdeutils-4.7.2.orig/kremotecontrol/dataengine/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/dataengine/CMakeLists.txt
+--- a/kremotecontrol/dataengine/CMakeLists.txt
++++ b/kremotecontrol/dataengine/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
@@ -48,8 +48,8 @@ Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotec
${CMAKE_CURRENT_SOURCE_DIR}/../libkremotecontrol
)
---- kdeutils-4.7.2.orig/kremotecontrol/kcmremotecontrol/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/kcmremotecontrol/CMakeLists.txt
+--- a/kremotecontrol/kcmremotecontrol/CMakeLists.txt
++++ b/kremotecontrol/kcmremotecontrol/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../libkremotecontrol
${KDE4_INCLUDES}
@@ -59,8 +59,8 @@ Applied-Upstream: 4.8, commit:a9bc543c627d3abf582975695dbae78ed44c8dd8 (kremotec
########### next target ###############
---- kdeutils-4.7.2.orig/kremotecontrol/kded/CMakeLists.txt
-+++ kdeutils-4.7.2/kremotecontrol/kded/CMakeLists.txt
+--- a/kremotecontrol/kded/CMakeLists.txt
++++ b/kremotecontrol/kded/CMakeLists.txt
@@ -1,7 +1,6 @@
include_directories(
--
KDE Utilities module packaging
More information about the pkg-kde-commits
mailing list