Control: tags -1 patch

Hello,

please find attached a proposed patch/debdiff for the build failure.

Cheers,
  Andreas
diff -Nru granule-1.4.0-7/debian/changelog granule-1.4.0-7/debian/changelog
--- granule-1.4.0-7/debian/changelog    2012-06-19 22:43:29.000000000 +0200
+++ granule-1.4.0-7/debian/changelog    2013-08-11 18:49:22.000000000 +0200
@@ -1,3 +1,9 @@
+granule (1.4.0-7-2) UNRELEASED; urgency=low
+
+  * Fix build with gcc4.8 and -fpermissive (Closes: #701292)
+
+ -- Andreas Moog <[email protected]>  Sun, 11 Aug 2013 16:15:28 +0000
+
 granule (1.4.0-7-1) unstable; urgency=low
 
   * New upstream release. (Closes: #667909)
diff -Nru granule-1.4.0-7/debian/patches/fix-template-with-permissive.patch 
granule-1.4.0-7/debian/patches/fix-template-with-permissive.patch
--- granule-1.4.0-7/debian/patches/fix-template-with-permissive.patch   
1970-01-01 01:00:00.000000000 +0100
+++ granule-1.4.0-7/debian/patches/fix-template-with-permissive.patch   
2013-08-11 18:15:17.000000000 +0200
@@ -0,0 +1,15 @@
+Description: Fix build with gcc4.8 and -fpermissive
+Bug-Debian: http://bugs.debian.org/701292
+Last-Update: 2013-08-11
+
+--- granule-1.4.0-7.orig/src/Granule.cpp
++++ granule-1.4.0-7/src/Granule.cpp
+@@ -56,7 +56,7 @@ ASSA_DECL_SINGLETON(Granule);
+ 
+ static const int TIMEOUT = 2000;  // 2 seconds (1,000 mls = 1 sec).
+ 
+-template <> xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
++xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
+ 
+ 
/*******************************************************************************
+                           Member Functions
diff -Nru granule-1.4.0-7/debian/patches/series 
granule-1.4.0-7/debian/patches/series
--- granule-1.4.0-7/debian/patches/series       1970-01-01 01:00:00.000000000 
+0100
+++ granule-1.4.0-7/debian/patches/series       2013-08-11 18:13:21.000000000 
+0200
@@ -0,0 +1 @@
+fix-template-with-permissive.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to