[SCM] bluedevil packaging branch, master, updated. debian/1.3.1-1-4-gb23a65f
Didier Raboud
odyx at moszumanska.debian.org
Thu May 15 17:40:43 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/bluedevil.git;a=commitdiff;h=e3fa216
The following commit has been merged in the master branch:
commit e3fa2164dd8f0a60c6a9bffaa5567622a73cca3e
Author: Didier Raboud <odyx at debian.org>
Date: Mon Mar 31 19:47:38 2014 +0200
Drop the patch making libbluedevilaction private as it doesn't exist in 2.0~rc1 anymore
---
.../patches/01_libbluedevilaction_is_private.diff | 119 ---------------------
debian/patches/series | 1 -
2 files changed, 120 deletions(-)
diff --git a/debian/patches/01_libbluedevilaction_is_private.diff b/debian/patches/01_libbluedevilaction_is_private.diff
deleted file mode 100644
index 205cc5a..0000000
--- a/debian/patches/01_libbluedevilaction_is_private.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
-Author: Pino Toscano <pino at debian.org>
-Description: Modifies CMakeLists.txt so that libbluedevilaction.so
- is installed in a subdirectory of /usr/lib, as recommended by the
- Debian policy and sets RPATH for everything that uses this library.
- In addition, the command to install actionplugin.h is removed.
-Forwarded: not-needed
-Last-Update: 2013-05-17
-
---- a/src/actionplugins/CMakeLists.txt
-+++ b/src/actionplugins/CMakeLists.txt
-@@ -8,6 +8,5 @@ kde4_add_library(bluedevilaction SHARED
-
- target_link_libraries(bluedevilaction ${KDE4_KDEUI_LIBS})
-
--install(TARGETS bluedevilaction ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS bluedevilaction DESTINATION ${LIB_INSTALL_DIR}/bluedevil)
- install(FILES actionplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
--install(FILES actionplugin.h DESTINATION ${INCLUDE_INSTALL_DIR}/bluedevil)
---- a/src/actionplugins/audio/CMakeLists.txt
-+++ b/src/actionplugins/audio/CMakeLists.txt
-@@ -8,6 +8,7 @@ qt4_add_dbus_interface(bluedevilaudioact
- kde4_add_plugin(bluedevilaudioactionplugin ${bluedevilaudioactionplugin_SRCS})
-
- target_link_libraries(bluedevilaudioactionplugin ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(bluedevilaudioactionplugin PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevilaudioactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES bluedevil-audio.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/src/actionplugins/input/CMakeLists.txt
-+++ b/src/actionplugins/input/CMakeLists.txt
-@@ -9,6 +9,7 @@ qt4_add_dbus_interface(bluedevilinputact
- kde4_add_plugin(bluedevilinputactionplugin ${bluedevilinputactionplugin_SRCS})
-
- target_link_libraries(bluedevilinputactionplugin ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(bluedevilinputactionplugin PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevilinputactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES bluedevil-input.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/src/actionplugins/sendfile/CMakeLists.txt
-+++ b/src/actionplugins/sendfile/CMakeLists.txt
-@@ -12,6 +12,7 @@ set(bluedevilsendfileactionplugin_SRCS s
- kde4_add_plugin(bluedevilsendfileactionplugin ${bluedevilsendfileactionplugin_SRCS})
-
- target_link_libraries(bluedevilsendfileactionplugin ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} bluedevilaction ${LibBlueDevil_LIBRARIES})
-+set_target_properties(bluedevilsendfileactionplugin PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevilsendfileactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES sendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/src/actionplugins/audio/helper/CMakeLists.txt
-+++ b/src/actionplugins/audio/helper/CMakeLists.txt
-@@ -13,6 +13,7 @@ kde4_add_executable(bluedevil-audio ${au
-
- target_link_libraries(bluedevil-audio bluedevilaction
- ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${LibBlueDevil_LIBRARIES} bluedevil)
-+set_target_properties(bluedevil-audio PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevil-audio DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-audio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---- a/src/actionplugins/input/helper/CMakeLists.txt
-+++ b/src/actionplugins/input/helper/CMakeLists.txt
-@@ -14,6 +14,7 @@ kde4_add_executable(bluedevil-input ${in
-
- target_link_libraries(bluedevil-input bluedevilaction
- ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${LibBlueDevil_LIBRARIES} bluedevil)
-+set_target_properties(bluedevil-input PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevil-input DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-input.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---- a/src/wizard/CMakeLists.txt
-+++ b/src/wizard/CMakeLists.txt
-@@ -29,6 +29,7 @@ kde4_add_executable(bluedevil-wizard ${w
-
- target_link_libraries(bluedevil-wizard bluedevilaction
- ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES})
-+set_target_properties(bluedevil-wizard PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevil-wizard ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-wizard.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---- a/src/actionplugins/networkdun/CMakeLists.txt
-+++ b/src/actionplugins/networkdun/CMakeLists.txt
-@@ -4,6 +4,7 @@ set(bluedevilnetworkdunactionplugin_SRCS
- kde4_add_plugin(bluedevilnetworkdunactionplugin ${bluedevilnetworkdunactionplugin_SRCS})
-
- target_link_libraries(bluedevilnetworkdunactionplugin ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(bluedevilnetworkdunactionplugin PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevilnetworkdunactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES bluedevil-network-dun.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/src/actionplugins/networkpanu/CMakeLists.txt
-+++ b/src/actionplugins/networkpanu/CMakeLists.txt
-@@ -4,6 +4,7 @@ set(bluedevilnetworkpanuactionplugin_SRC
- kde4_add_plugin(bluedevilnetworkpanuactionplugin ${bluedevilnetworkpanuactionplugin_SRCS})
-
- target_link_libraries(bluedevilnetworkpanuactionplugin ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(bluedevilnetworkpanuactionplugin PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevilnetworkpanuactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES bluedevil-network-panu.desktop DESTINATION ${SERVICES_INSTALL_DIR})
---- a/src/actionplugins/networkdun/helper/CMakeLists.txt
-+++ b/src/actionplugins/networkdun/helper/CMakeLists.txt
-@@ -13,6 +13,7 @@ kde4_add_executable(bluedevil-network-du
-
- target_link_libraries(bluedevil-network-dun bluedevilaction
- ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${LibBlueDevil_LIBRARIES} bluedevil)
-+set_target_properties(bluedevil-network-dun PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevil-network-dun DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-network-dun.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
---- a/src/actionplugins/networkpanu/helper/CMakeLists.txt
-+++ b/src/actionplugins/networkpanu/helper/CMakeLists.txt
-@@ -13,6 +13,7 @@ kde4_add_executable(bluedevil-network-pa
-
- target_link_libraries(bluedevil-network-panu bluedevilaction
- ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${LibBlueDevil_LIBRARIES} bluedevil)
-+set_target_properties(bluedevil-network-panu PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
-
- install(TARGETS bluedevil-network-panu DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES bluedevil-network-panu.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b069c6b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_libbluedevilaction_is_private.diff
--
bluedevil packaging
More information about the pkg-kde-commits
mailing list