[SCM] bluedevil packaging branch, master, updated. debian/1.0.rc2-1-2-gf2e216d

George Kiagiadakis gkiagia-guest at alioth.debian.org
Sun Sep 5 12:52:04 UTC 2010


The following commit has been merged in the master branch:
commit f2e216d4809307f3e24b566dcb015fb77d1635f7
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Sep 5 15:51:22 2010 +0300

    Update to rc3.
---
 debian/changelog                                   |    6 +++-
 .../patches/01_libbluedevilaction_is_private.diff  |   25 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd8ed3e..d487921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-bluedevil (1.0~rc2-2) UNRELEASED; urgency=low
+bluedevil (1.0~rc3-1) UNRELEASED; urgency=low
 
+  * New upstream release candidate.
   * Add transitional kbluetooth and kdebluetooth packages.
+  * Refresh patch 01_libbluedevilaction_is_private.diff.
 
- -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sun, 05 Sep 2010 14:10:54 +0300
+ -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sun, 05 Sep 2010 15:38:24 +0300
 
 bluedevil (1.0~rc2-1) unstable; urgency=low
 
diff --git a/debian/patches/01_libbluedevilaction_is_private.diff b/debian/patches/01_libbluedevilaction_is_private.diff
index 7fa1875..6b986b4 100644
--- a/debian/patches/01_libbluedevilaction_is_private.diff
+++ b/debian/patches/01_libbluedevilaction_is_private.diff
@@ -18,33 +18,32 @@ Forwarded: not-needed
 --- a/src/actionplugins/audio/CMakeLists.txt
 +++ b/src/actionplugins/audio/CMakeLists.txt
 @@ -8,6 +8,7 @@
- kde4_add_plugin(audio ${audio_SRCS})
+ kde4_add_plugin(bluedevilaudioactionplugin ${bluedevilaudioactionplugin_SRCS})
  
- target_link_libraries(audio ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(audio PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
+ 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 audio DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(TARGETS bluedevilaudioactionplugin DESTINATION ${PLUGIN_INSTALL_DIR})
  install(FILES bluedevil-audio.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-\ No newline at end of file
 --- a/src/actionplugins/input/CMakeLists.txt
 +++ b/src/actionplugins/input/CMakeLists.txt
 @@ -9,6 +9,7 @@
- kde4_add_plugin(input ${input_SRCS})
+ kde4_add_plugin(bluedevilinputactionplugin ${bluedevilinputactionplugin_SRCS})
  
- target_link_libraries(input ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${LibBlueDevil_LIBRARIES} bluedevilaction)
-+set_target_properties(input PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
+ 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 input DESTINATION ${PLUGIN_INSTALL_DIR})
+ 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 @@
- kde4_add_plugin(sendfile ${sendfile_SRCS})
+ kde4_add_plugin(bluedevilsendfileactionplugin ${bluedevilsendfileactionplugin_SRCS})
  
- target_link_libraries(sendfile ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} bluedevilaction ${LibBlueDevil_LIBRARIES})
-+set_target_properties(sendfile PROPERTIES INSTALL_RPATH ${LIB_INSTALL_DIR}/bluedevil)
+ 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 sendfile DESTINATION ${PLUGIN_INSTALL_DIR})
+ 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

-- 
bluedevil packaging



More information about the pkg-kde-commits mailing list