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

[Pino Toscano]

Author: pino
Date: 2016-05-04 07:23:26 +0000 (Wed, 04 May 2016)
New Revision: 20449

Modified:
   kde-extras/ctemplate/trunk/debian/changelog
   kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
   kde-extras/ctemplate/trunk/debian/patches/r129.patch
Log:
refresh patches


Modified: kde-extras/ctemplate/trunk/debian/changelog
===================================================================
--- kde-extras/ctemplate/trunk/debian/changelog	2016-05-04 07:19:01 UTC (rev 20448)
+++ kde-extras/ctemplate/trunk/debian/changelog	2016-05-04 07:23:26 UTC (rev 20449)
@@ -19,6 +19,8 @@
       with the next SONAME break
   * Make the .install files a bit more specific (especially for the
     libraries), and sort them.
+  * Refresh patches (just to simplify the diff header), and improve
+    DEP3 headers.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 04 May 2016 08:11:11 +0200
 

Modified: kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	2016-05-04 07:19:01 UTC (rev 20448)
+++ kde-extras/ctemplate/trunk/debian/patches/gcc-4.6.patch	2016-05-04 07:23:26 UTC (rev 20449)
@@ -1,12 +1,10 @@
 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-Debian: https://bugs.debian.org/625002
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/771025
 
-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
+--- a/src/ctemplate/template_dictionary.h.in
++++ b/src/ctemplate/template_dictionary.h.in
 @@ -51,6 +51,7 @@
  #include <stdlib.h>      // for NULL
  #include <sys/types.h>

Modified: kde-extras/ctemplate/trunk/debian/patches/r129.patch
===================================================================
--- kde-extras/ctemplate/trunk/debian/patches/r129.patch	2016-05-04 07:19:01 UTC (rev 20448)
+++ kde-extras/ctemplate/trunk/debian/patches/r129.patch	2016-05-04 07:23:26 UTC (rev 20449)
@@ -1,11 +1,9 @@
 Description: Fix g++-4.7 -std=c++0x issue
-Deb-Bugs: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665360
+Bug-Debian: https://bugs.debian.org/665360
 
-Index: ctemplate-2.2/src/ctemplate/template_string.h.in
-===================================================================
---- ctemplate-2.2.orig/src/ctemplate/template_string.h.in	2012-04-19 07:49:56.000000000 +1000
-+++ ctemplate-2.2/src/ctemplate/template_string.h.in	2012-06-20 22:52:46.000000000 +1000
-@@ -337,7 +337,7 @@
+--- a/src/ctemplate/template_string.h.in
++++ b/src/ctemplate/template_string.h.in
+@@ -337,7 +337,7 @@ class @ac_windows_dllexport@ StaticTempl
  
  // Don't use this.  This is used only in auto-generated .varnames.h files.
  #define STS_INIT_WITH_HASH(name, str, hash)                                   \
@@ -14,11 +12,9 @@
    namespace ctemplate_sts_init {                                              \
    static const @ac_google_namespace@::StaticTemplateStringInitializer name##_init(&name); \
    }
-Index: ctemplate-2.2/src/template_dictionary.cc
-===================================================================
---- ctemplate-2.2.orig/src/template_dictionary.cc	2012-04-19 07:49:56.000000000 +1000
-+++ ctemplate-2.2/src/template_dictionary.cc	2012-06-20 22:53:11.000000000 +1000
-@@ -861,7 +861,7 @@
+--- a/src/template_dictionary.cc
++++ b/src/template_dictionary.cc
+@@ -861,7 +861,7 @@ class TemplateDictionary::DictionaryPrin
  
    string GetDictNum(size_t index, size_t size) const {
      char buf[64];   // big enough for two ints