rev 18987 - in kde-extras/ctemplate/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2011-10-09 09:40:47 +0000 (Sun, 09 Oct 2011)
New Revision: 18987

Removed:
   kde-extras/ctemplate/trunk/debian/patches/dbug592142-sparc.patch
Modified:
   kde-extras/ctemplate/trunk/debian/changelog
   kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
   kde-extras/ctemplate/trunk/debian/patches/series
Log:
* New upstream release 
  - Fixes "New Version: 1.0" (Closes: #642009)
* Drop dbug592142-sparc.patch incorporated upstream 0.98

Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2011-10-09 09:04:58 UTC (rev 18986)
+++ kde-extras/ctemplate/trunk/debian/changelog	2011-10-09 09:40:47 UTC (rev 18987)
@@ -1,3 +1,11 @@
+ctemplate (1.0-1) unstable; urgency=low
+
+  * New upstream release 
+    - Fixes "New Version: 1.0" (Closes: #642009)
+  * Drop dbug592142-sparc.patch incorporated upstream 0.98
+
+ -- Mark Purcell <msp at debian.org>  Sun, 09 Oct 2011 20:39:41 +1100
+
 ctemplate (0.97-4) unstable; urgency=low
 
   * Ack NMU.  Thanks gregor.

Modified: kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	2011-10-09 09:04:58 UTC (rev 18986)
+++ kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	2011-10-09 09:40:47 UTC (rev 18987)
@@ -3,11 +3,13 @@
 Bug-Debian: http://bugs.debian.org/625002
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/771025
 
---- ctemplate-0.97.orig/src/ctemplate/template_dictionary.h.in
-+++ ctemplate-0.97/src/ctemplate/template_dictionary.h.in
+Index: ctemplate-1.0/src/ctemplate/template_dictionary.h.in
+===================================================================
+--- ctemplate-1.0.orig/src/ctemplate/template_dictionary.h.in	2011-08-27 06:24:47.000000000 +1000
++++ ctemplate-1.0/src/ctemplate/template_dictionary.h.in	2011-10-09 20:37:16.000000000 +1100
 @@ -51,6 +51,7 @@
- #include <stdarg.h>      // for StringAppendV()
- #include <sys/types.h>   // for size_t
+ #include <stdlib.h>      // for NULL
+ #include <sys/types.h>
  #include <functional>    // for less<>
 +#include <cstddef>
  #include <map>

Modified: kde-extras/ctemplate/trunk/debian/patches/series
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/series	2011-10-09 09:04:58 UTC (rev 18986)
+++ kde-extras/ctemplate/trunk/debian/patches/series	2011-10-09 09:40:47 UTC (rev 18987)
@@ -1,2 +1 @@
-dbug592142-sparc.patch
 gcc-4.6.patch