Control: tag -1 patch

Dear maintainer,

Please consider applying below patch to resolve FTBFS with gcc-4.9.

diff -Nru cadabra-1.29/debian/changelog cadabra-1.29/debian/changelog
--- cadabra-1.29/debian/changelog	2011-07-05 19:42:55.000000000 +0100
+++ cadabra-1.29/debian/changelog	2014-05-15 01:42:02.000000000 +0100
@@ -1,3 +1,10 @@
+cadabra (1.29-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc-4.9 (Closes: 746833)
+
+ -- Dimitri John Ledkov <[email protected]>  Thu, 15 May 2014 01:41:44 +0100
+
 cadabra (1.29-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru cadabra-1.29/debian/patches/gcc4.9.patch cadabra-1.29/debian/patches/gcc4.9.patch
--- cadabra-1.29/debian/patches/gcc4.9.patch	1970-01-01 01:00:00.000000000 +0100
+++ cadabra-1.29/debian/patches/gcc4.9.patch	2014-05-15 01:42:32.000000000 +0100
@@ -0,0 +1,15 @@
+Description: avoid redeclaraion of err, by renaming one of them
+Author: Dimitri John Ledkov <[email protected]>
+Bug-Debian: http://bugs.debian.org/746833
+
+--- cadabra-1.29.orig/gui/widgets.cc
++++ cadabra-1.29/gui/widgets.cc
+@@ -347,7 +347,7 @@ void TeXEngine::convert_set(std::set<TeX
+ 			 throw TeXException(err); 
+ 			 }
+ 		}
+-	catch(std::logic_error& err) {
++	catch(std::logic_error& error) {
+ 		erase_file(std::string(templ)+".tex");
+ 		erase_file(std::string(templ)+".dvi");
+ 		erase_file(std::string(templ)+".aux");
diff -Nru cadabra-1.29/debian/patches/series cadabra-1.29/debian/patches/series
--- cadabra-1.29/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ cadabra-1.29/debian/patches/series	2014-05-15 01:42:10.000000000 +0100
@@ -0,0 +1 @@
+gcc4.9.patch
Regards,

Dimitri.

Reply via email to