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

[Mark Purcell]

Author: msp
Date: 2011-10-09 08:59:34 +0000 (Sun, 09 Oct 2011)
New Revision: 18985

Added:
   kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
Modified:
   kde-extras/ctemplate/trunk/debian/changelog
   kde-extras/ctemplate/trunk/debian/control
   kde-extras/ctemplate/trunk/debian/patches/series
   kde-extras/ctemplate/trunk/debian/rules
Log:
* Ack NMU.  Thanks gregor.
* Fixed description-synopsis-starts-with-article
* debian/rules: export PTHREAD_CFLAGS=-lpthread
  - Fixes dpkg-shlibdeps: warning: symbol found in none of the libraries
* Non-maintainer upload.
* Fix "FTBFS: ./src/ctemplate/template_dictionary.h:73:11: error:
  'ptrdiff_t' does not name a type":
  apply patch from Ubuntu / Matthias Klose:
  - Add missing includes to build with g++-4.6. 
    Closes: #625002, LP: #771025.

Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2011-10-09 07:00:12 UTC (rev 18984)
+++ kde-extras/ctemplate/trunk/debian/changelog	2011-10-09 08:59:34 UTC (rev 18985)
@@ -1,9 +1,23 @@
-ctemplate (0.99-1) UNRELEASED; urgency=low
+ctemplate (0.97-4) unstable; urgency=low
 
-  * New Upstream Release 
+  * Ack NMU.  Thanks gregor.
+  * Fixed description-synopsis-starts-with-article
+  * debian/rules: export PTHREAD_CFLAGS=-lpthread
+    - Fixes dpkg-shlibdeps: warning: symbol found in none of the libraries
 
- -- Mark Purcell <msp at debian.org>  Fri, 27 May 2011 21:02:08 +1000
+ -- Mark Purcell <msp at debian.org>  Sun, 09 Oct 2011 19:34:10 +1100
 
+ctemplate (0.97-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: ./src/ctemplate/template_dictionary.h:73:11: error:
+    'ptrdiff_t' does not name a type":
+    apply patch from Ubuntu / Matthias Klose:
+    - Add missing includes to build with g++-4.6. 
+      Closes: #625002, LP: #771025.
+
+ -- gregor herrmann <gregoa at debian.org>  Tue, 04 Oct 2011 17:24:25 +0200
+
 ctemplate (0.97-3) unstable; urgency=low
 
   * Add sparc memory alignment patch from Jurij Smakov <jurij at wooyd.org>

Modified: kde-extras/ctemplate/trunk/debian/control
===================================================================
--- kde-extras/ctemplate/trunk/debian/control	2011-10-09 07:00:12 UTC (rev 18984)
+++ kde-extras/ctemplate/trunk/debian/control	2011-10-09 08:59:34 UTC (rev 18985)
@@ -12,7 +12,7 @@
 Package: libctemplate-dev
 Architecture: any
 Depends: libctemplate0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: A simple but powerful template language for C++ - development files
+Description: Simple but powerful template language for C++ - development files
  This package contains a library implementing a simple but
  powerful template language for C++.  It emphasizes separating logic
  from presentation: it is impossible to embed application logic in this
@@ -25,7 +25,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A simple but powerful template language for C++
+Description: Simple but powerful template language for C++
  This package contains a library implementing a simple but
  powerful template language for C++.  It emphasizes separating logic
  from presentation: it is impossible to embed application logic in this

Added: kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	                        (rev 0)
+++ kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	2011-10-09 08:59:34 UTC (rev 18985)
@@ -0,0 +1,15 @@
+Description: Add missing includes to build with g++-4.6.
+Author: Matthias Klose <doko at ubuntu.com>
+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
+@@ -51,6 +51,7 @@
+ #include <stdarg.h>      // for StringAppendV()
+ #include <sys/types.h>   // for size_t
+ #include <functional>    // for less<>
++#include <cstddef>
+ #include <map>
+ #include <string>
+ #include <vector>

Modified: kde-extras/ctemplate/trunk/debian/patches/series
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/series	2011-10-09 07:00:12 UTC (rev 18984)
+++ kde-extras/ctemplate/trunk/debian/patches/series	2011-10-09 08:59:34 UTC (rev 18985)
@@ -1 +1,2 @@
-#dbug592142-sparc.patch
+dbug592142-sparc.patch
+gcc-4.6.patch

Modified: kde-extras/ctemplate/trunk/debian/rules
===================================================================
--- kde-extras/ctemplate/trunk/debian/rules	2011-10-09 07:00:12 UTC (rev 18984)
+++ kde-extras/ctemplate/trunk/debian/rules	2011-10-09 08:59:34 UTC (rev 18985)
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
+
+export PTHREAD_CFLAGS=-lpthread
+
 %:
 	dh $@ --parallel