[SCM] bluedevil packaging branch, master, updated. 2751c694a0798543308cb1be1754e3b3e79f247c

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit ecaa199b29e4fbd603683fb761f8dedfa6c94898
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Mon Aug 2 18:57:02 2010 +0300

    Remove the first two patches, they were applied upstream.
---
 ....diff => 01_libbluedevilaction_is_private.diff} |    0
 debian/patches/01_no_useless_linking.diff          |   52 --------------------
 debian/patches/02_no_useless_dependencies.diff     |   13 -----
 debian/patches/series                              |    4 +-
 4 files changed, 1 insertions(+), 68 deletions(-)

diff --git a/debian/patches/03_libbluedevilaction_is_private.diff b/debian/patches/01_libbluedevilaction_is_private.diff
similarity index 100%
rename from debian/patches/03_libbluedevilaction_is_private.diff
rename to debian/patches/01_libbluedevilaction_is_private.diff
diff --git a/debian/patches/01_no_useless_linking.diff b/debian/patches/01_no_useless_linking.diff
deleted file mode 100644
index 0350ac3..0000000
--- a/debian/patches/01_no_useless_linking.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
-Description: Modify CMakeLists.txt to avoid linking with libraries
- that are not actually used.
-Forwarded: no
-
---- a/src/daemon/kded/CMakeLists.txt
-+++ b/src/daemon/kded/CMakeLists.txt
-@@ -17,7 +17,6 @@
- target_link_libraries(kded_bluedevil
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_KDEUI_LIBS}
--    ${KDE4_KUTILS_LIBS}
-     ${KDE4_KFILE_LIBS}
-     ${LibBlueDevil_LIBRARIES}
- )
---- a/src/kcmodule/CMakeLists.txt
-+++ b/src/kcmodule/CMakeLists.txt
-@@ -20,9 +20,9 @@
-             ${kcm_bluedeviladapters}
-             ${kcm_bluedeviltransfer})
- 
--target_link_libraries(kcm_bluedevildevices ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
--target_link_libraries(kcm_bluedeviladapters ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
--target_link_libraries(kcm_bluedeviltransfer ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
-+target_link_libraries(kcm_bluedevildevices ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
-+target_link_libraries(kcm_bluedeviladapters ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
-+target_link_libraries(kcm_bluedeviltransfer ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${LibBlueDevil_LIBRARIES})
- 
- install(TARGETS kcm_bluedevildevices
-                 kcm_bluedeviladapters
---- a/src/monolithic/CMakeLists.txt
-+++ b/src/monolithic/CMakeLists.txt
-@@ -9,7 +9,7 @@
- kde4_add_executable(bluedevil-monolithic ${monolithic_SRCS})
- 
- target_link_libraries(bluedevil-monolithic
--                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY} ${LibBlueDevil_LIBRARIES})
-+                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES})
- 
- install(TARGETS bluedevil-monolithic ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-monolithic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---- a/src/wizard/CMakeLists.txt
-+++ b/src/wizard/CMakeLists.txt
-@@ -22,7 +22,7 @@
- kde4_add_executable(bluedevil-wizard ${wizard_SRCS})
- 
- target_link_libraries(bluedevil-wizard bluedevilaction
--                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${LibBlueDevil_LIBRARIES})
-+                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES})
- 
- install(TARGETS bluedevil-wizard ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-wizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/debian/patches/02_no_useless_dependencies.diff b/debian/patches/02_no_useless_dependencies.diff
deleted file mode 100644
index 9500199..0000000
--- a/debian/patches/02_no_useless_dependencies.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
-Description: Do not search for KDE4Workspace, since it is not used.
- Requires patch 01_no_useless_linking.diff to be applied too.
-Forwarded: no
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,4 @@
- find_package(KDE4 REQUIRED)
--find_package(KDE4Workspace REQUIRED)
- include(KDE4Defaults)
- include(MacroOptionalAddSubdirectory)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1459fd0..b069c6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-01_no_useless_linking.diff
-02_no_useless_dependencies.diff
-03_libbluedevilaction_is_private.diff
+01_libbluedevilaction_is_private.diff

-- 
bluedevil packaging