rev 15396 - in trunk/packages/kdebindings/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-07-27 23:30:38 +0000 (Mon, 27 Jul 2009)
New Revision: 15396

Removed:
   trunk/packages/kdebindings/debian/patches/12_fix_nre_in_SmokeMarshallers.diff
   trunk/packages/kdebindings/debian/patches/13_fix_locking_in_SmokeMarshallers.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/series
Log:
merged upstream


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2009-07-27 23:03:56 UTC (rev 15395)
+++ trunk/packages/kdebindings/debian/changelog	2009-07-27 23:30:38 UTC (rev 15396)
@@ -2,6 +2,9 @@
 
   * New upstream release, RC3.
 
+  * Remove 12_fix_nre_in_SmokeMarshallers.diff and
+    13_fix_locking_in_SmokeMarshallers.diff, merged upstream.
+
   +++ Changes by Frederik Schwarzer
 
   * Fix typos and casing in packages descriptions

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2009-07-27 23:03:56 UTC (rev 15395)
+++ trunk/packages/kdebindings/debian/patches/series	2009-07-27 23:30:38 UTC (rev 15396)
@@ -8,5 +8,3 @@
 08_csharp_plasma_examples.diff
 10_fix_kimono_dllimports.diff
 11_make_pykde4_respect_sip_flags.diff
-12_fix_nre_in_SmokeMarshallers.diff
-13_fix_locking_in_SmokeMarshallers.diff