[SCM] Kio-ftps Debian packaging branch, master, updated. upstream/0.2+dfsg-4-g5eb93c5

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 5eb93c5860bf16a6c96e4f6766495608bf5f9843
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Fri Sep 4 02:33:48 2009 +0200

    Update patch.
---
 ...pdate-CMakeLists.txt-to-build-for-KDE-4.2.patch |   22 ++++++++++++++++++++
 debian/patches/cmakelists_kde42_fix.diff           |   13 -----------
 debian/patches/series                              |    2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-Update-CMakeLists.txt-to-build-for-KDE-4.2.patch b/debian/patches/0001-Update-CMakeLists.txt-to-build-for-KDE-4.2.patch
new file mode 100644
index 0000000..344eda1
--- /dev/null
+++ b/debian/patches/0001-Update-CMakeLists.txt-to-build-for-KDE-4.2.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
+Date: Fri, 4 Sep 2009 02:33:10 +0200
+Subject: [PATCH] Update CMakeLists.txt to build for KDE >= 4.2.
+
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8d0c04..d9abaf9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(mySources ftp.cpp)
+ 
+ kde4_add_plugin( kio_ftps ${mySources} )
+ 
+-target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
++target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+ 
+ install(TARGETS kio_ftps  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ install( FILES ftps.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
+-- 
diff --git a/debian/patches/cmakelists_kde42_fix.diff b/debian/patches/cmakelists_kde42_fix.diff
deleted file mode 100644
index 5d7d096..0000000
--- a/debian/patches/cmakelists_kde42_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# Update CMakeLists.txt to build for KDE 4.2.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(mySources ftp.cpp)
- 
- kde4_add_plugin( kio_ftps ${mySources} )
- 
--target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
-+target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
- 
- install(TARGETS kio_ftps  DESTINATION ${PLUGIN_INSTALL_DIR} )
- install( FILES ftps.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
diff --git a/debian/patches/series b/debian/patches/series
index 7d7e68d..408ebd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-cmakelists_kde42_fix.diff
+0001-Update-CMakeLists.txt-to-build-for-KDE-4.2.patch

-- 
Kio-ftps Debian packaging