[Pkg-octave-commit] r1106 - in octplot/trunk/debian: . patches

[Rafael Laboissiere]

tags 455452 pending
thanks

Author: rafael
Date: 2007-12-18 16:05:17 +0000 (Tue, 18 Dec 2007)
New Revision: 1106

Added:
   octplot/trunk/debian/patches/50_no_redefine_preproc.patch
Modified:
   octplot/trunk/debian/changelog
Log:
Patch for undefining some preprocessor directives that are both in the
package's config.h and in Octave's config.h.

Modified: octplot/trunk/debian/changelog
===================================================================
--- octplot/trunk/debian/changelog	2007-12-18 14:32:45 UTC (rev 1105)
+++ octplot/trunk/debian/changelog	2007-12-18 16:05:17 UTC (rev 1106)
@@ -5,6 +5,10 @@
     touch the aclocal.m4 and configure files after the patches are
     applied.  This should avoid time skew issues and the package should
     build correctly on alpha, sparc, and powerpc architectures.
+  * debian/patches/50_no_redefine_preproc.patch: Added patch for
+    undefining some preprocessor directives that are both in the package's
+    config.h and in Octave's config.h.  This should make the package
+    compile with gcc-4.3 (closes: #455452).
   * debian/control:
     + Dropped the Homepage pseudo-header from the extended description
     + Bumped Standards-Version to 3.7.3

Added: octplot/trunk/debian/patches/50_no_redefine_preproc.patch
===================================================================
--- octplot/trunk/debian/patches/50_no_redefine_preproc.patch	                        (rev 0)
+++ octplot/trunk/debian/patches/50_no_redefine_preproc.patch	2007-12-18 16:05:17 UTC (rev 1106)
@@ -0,0 +1,13 @@
+--- octplot-0.4.0.orig/src/octplot_command.cc
++++ octplot-0.4.0/src/octplot_command.cc
+@@ -34,6 +34,10 @@
+ #include <signal.h>
+ 
+ #include "op_com.h"
++#undef PACKAGE_NAME
++#undef PACKAGE_STRING
++#undef PACKAGE_TARNAME
++#undef PACKAGE_VERSION
+ #include "../config.h"
+ 
+ static bool ShouldWeRedraw=false;