[SCM] bluedevil packaging branch, master, updated. debian/1.1-1-8-g82f8afb

Pino Toscano pino at alioth.debian.org
Fri Mar 30 18:23:56 UTC 2012 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/bluedevil.git;a=commitdiff;h=82f8afb

The following commit has been merged in the master branch:
commit 82f8afb349c368ec0cb3ff6797a6ca8ff1d622fe
Author: Pino Toscano <pino at debian.org>
Date:   Fri Mar 30 20:23:43 2012 +0200

    01_libbluedevilaction_is_private.diff: refresh, and add more targets
---
 debian/changelog                                   |    1 +
 .../patches/01_libbluedevilaction_is_private.diff  |   56 +++++++++++++++++---
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95f1aee..2dbdc4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bluedevil (1.2.2-0r1) UNRELEASED; urgency=low
   * New upstream release. (Closes: #658313)
 
   [ Pino Toscano ]
+  * Patch 01_libbluedevilaction_is_private.diff: refresh, and add more targets.
   * Small description fixes. (Closes: #630442)
   * Add a watch file.
   * Bump Standards-Version to 3.9.3, no changes required.
diff --git a/debian/patches/01_libbluedevilaction_is_private.diff b/debian/patches/01_libbluedevilaction_is_private.diff
index e7589d2..3c21b34 100644
--- a/debian/patches/01_libbluedevilaction_is_private.diff
+++ b/debian/patches/01_libbluedevilaction_is_private.diff
@@ -1,13 +1,15 @@
 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: 2012-03-30
 
 --- a/src/actionplugins/CMakeLists.txt
 +++ b/src/actionplugins/CMakeLists.txt
-@@ -6,6 +6,5 @@
+@@ -8,6 +8,5 @@ kde4_add_library(bluedevilaction SHARED
  
  target_link_libraries(bluedevilaction ${KDE4_KDEUI_LIBS})
  
@@ -17,7 +19,7 @@ Forwarded: not-needed
 -install(FILES actionplugin.h DESTINATION include/)
 --- a/src/actionplugins/audio/CMakeLists.txt
 +++ b/src/actionplugins/audio/CMakeLists.txt
-@@ -8,6 +8,7 @@
+@@ -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)
@@ -27,7 +29,7 @@ Forwarded: not-needed
  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 @@
+@@ -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)
@@ -37,7 +39,7 @@ Forwarded: not-needed
  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 @@
+@@ -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})
@@ -47,7 +49,7 @@ Forwarded: not-needed
  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 @@
+@@ -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)
@@ -57,7 +59,7 @@ Forwarded: not-needed
  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 @@
+@@ -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)
@@ -67,7 +69,7 @@ Forwarded: not-needed
  install(FILES bluedevil-input.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 --- a/src/wizard/CMakeLists.txt
 +++ b/src/wizard/CMakeLists.txt
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ kde4_add_executable(bluedevil-wizard ${w
  
  target_link_libraries(bluedevil-wizard bluedevilaction
                        ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${LibBlueDevil_LIBRARIES})
@@ -75,3 +77,43 @@ Forwarded: not-needed
  
  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})

-- 
bluedevil packaging

More information about the pkg-kde-commits mailing list