rev 14120 - in trunk/packages/kdebase-workspace/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-03-23 09:28:58 +0000 (Mon, 23 Mar 2009)
New Revision: 14120

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/56_solid_changes_kdebluetooth.diff
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
disable the patch fathi committed, it breaks abi of public libraries

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-03-21 12:01:20 UTC (rev 14119)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-03-23 09:28:58 UTC (rev 14120)
@@ -3,11 +3,6 @@
   TODO: split kdm greeters in a package. (Closes: #520426)
         kdm and kdebase-workspace(-bin) should depends on this new package.
 
-  +++ Changes by Fathi Boudra:
-
-  * Add 56_solid_changes_kdebluetooth.diff (stolen from kubuntu):
-    - Fix kdebluetooth 0.3 build (patch from KDE svn trunk)
-
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Mar 2009 19:06:26 +0100
 
 kdebase-workspace (4:4.2.1-2) experimental; urgency=low

Modified: trunk/packages/kdebase-workspace/debian/patches/56_solid_changes_kdebluetooth.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/56_solid_changes_kdebluetooth.diff	2009-03-21 12:01:20 UTC (rev 14119)
+++ trunk/packages/kdebase-workspace/debian/patches/56_solid_changes_kdebluetooth.diff	2009-03-23 09:28:58 UTC (rev 14120)
@@ -1,3 +1,5 @@
+This patch is abi-breaking and should not be applied in debian as it is now.
+
 --- a/solid/bluez/bluez-bluetoothinterface.cpp
 +++ b/solid/bluez/bluez-bluetoothinterface.cpp
 @@ -25,6 +25,7 @@

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2009-03-21 12:01:20 UTC (rev 14119)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2009-03-23 09:28:58 UTC (rev 14120)
@@ -14,5 +14,5 @@
 23_do_not_depend_on_bindings.diff
 24_do_not_search_for_libeet.diff
 25_task.h_forward_decl_netwininfo.diff
-56_solid_changes_kdebluetooth.diff
+#56_solid_changes_kdebluetooth.diff
 97_fix_target_link_libraries.diff