[SCM] bluedevil packaging branch, master, updated. ed927b2edc48ff46c4a2f4265cf1b8e9d4c30df3

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit ed927b2edc48ff46c4a2f4265cf1b8e9d4c30df3
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Thu Jul 29 17:04:55 2010 +0300

    Avoid useless linking and useless dependency on kdebase-workspace.
---
 debian/control                                 |    2 +-
 debian/patches/01_no_useless_linking.diff      |   47 ++++++++++++++++++++++++
 debian/patches/02_no_useless_dependencies.diff |    8 ++++
 debian/patches/series                          |    2 +
 debian/rules                                   |    6 +++
 5 files changed, 64 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index b6fe8b9..107601f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Florian Reinhard <florian.reinhard at googlemail.com>, George Kiagiadakis <kiagiadakis.george at gmail.com>
 Build-Depends: debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5), cmake, libbluedevil-dev (>= 1.7),
- kdelibs5-dev (>= 4.4), kdebase-workspace-dev (>= 4.4), shared-mime-info
+ kdelibs5-dev (>= 4.4), shared-mime-info
 Standards-Version: 3.9.1
 Homepage: http://gitorious.org/bluedevil
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/bluedevil.git
diff --git a/debian/patches/01_no_useless_linking.diff b/debian/patches/01_no_useless_linking.diff
new file mode 100644
index 0000000..a8ca6ed
--- /dev/null
+++ b/debian/patches/01_no_useless_linking.diff
@@ -0,0 +1,47 @@
+--- 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
new file mode 100644
index 0000000..ef2cc3c
--- /dev/null
+++ b/debian/patches/02_no_useless_dependencies.diff
@@ -0,0 +1,8 @@
+--- 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
new file mode 100644
index 0000000..0881201
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_no_useless_linking.diff
+02_no_useless_dependencies.diff
diff --git a/debian/rules b/debian/rules
index 9495113..f9cac87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,10 @@
 #!/usr/bin/make -f
 
+override_dh_auto_configure:
+	dh_auto_configure --buildsystem=kde -- \
+			-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+			-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+			-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+
 %:
 	dh --parallel --with kde $@

-- 
bluedevil packaging