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

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-21 23:13:21 +0000 (Mon, 21 Jul 2008)
New Revision: 2333

Added:
   octave/trunk/debian/patches/fix-comma-in-configure.dpatch
Removed:
   octave/trunk/debian/patches/drop-comma-in-configure.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Fix another syntax error in aclocal.m4


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-21 22:51:24 UTC (rev 2332)
+++ octave/trunk/debian/changelog	2008-07-21 23:13:21 UTC (rev 2333)
@@ -6,8 +6,8 @@
     octave3.1
   * debian/patches/add-gl-render-cc.dpatch: Add patch for including a file
     lacking in the upstream tarball
-  * debian/patches/drop-comma-in-configure.dpatch: Add patch for avoiding
-    a syntax error in configure
+  * debian/patches/fix-comma-in-configure.dpatch: Add patch for avoiding
+    syntax errors in configure
   * debian/in/control: Build-depend on libgl1-mesa-swx11-dev and
     libglu1-mesa-dev
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2008-07-21 22:51:24 UTC (rev 2332)
+++ octave/trunk/debian/in/00list	2008-07-21 23:13:21 UTC (rev 2333)
@@ -27,5 +27,5 @@
 dont_set_helvetica-3.1.dpatch
 add-acx_blas_f77_func.m4.dpatch
 add-gl-render-cc.dpatch
-drop-comma-in-configure.dpatch
+fix-comma-in-configure.dpatch
 :]

Deleted: octave/trunk/debian/patches/drop-comma-in-configure.dpatch
===================================================================
--- octave/trunk/debian/patches/drop-comma-in-configure.dpatch	2008-07-21 22:51:24 UTC (rev 2332)
+++ octave/trunk/debian/patches/drop-comma-in-configure.dpatch	2008-07-21 23:13:21 UTC (rev 2333)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## drop-comma-in-configure.dpatch by Rafael Laboissiere <rafael at debian.org>
-## 
-## DP: Fix syntax error in the configure script
-
- at DPATCH@
-
---- octave3.1-3.1.50.orig/aclocal.m4
-+++ octave3.1-3.1.50/aclocal.m4
-@@ -1071,7 +1071,7 @@
-     have_opengl_incs=yes, break], [], [
- #ifdef HAVE_WINDOWS_H
- # include <windows.h>
--#endif ]), break], [], [
-+#endif ]) break], [], [
- #ifdef HAVE_WINDOWS_H
- # include <windows.h>
- #endif])

Copied: octave/trunk/debian/patches/fix-comma-in-configure.dpatch (from rev 2330, octave/trunk/debian/patches/drop-comma-in-configure.dpatch)
===================================================================
--- octave/trunk/debian/patches/fix-comma-in-configure.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/fix-comma-in-configure.dpatch	2008-07-21 23:13:21 UTC (rev 2333)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## fix-comma-in-configure.dpatch by Rafael Laboissiere <rafael at debian.org>
+## 
+## DP: Fix syntax errors in the configure script
+
+ at DPATCH@
+
+--- octave3.1-3.1.50.orig/aclocal.m4
++++ octave3.1-3.1.50/aclocal.m4
+@@ -1068,10 +1068,10 @@
+ have_opengl_incs=no
+ AC_CHECK_HEADERS(GL/gl.h OpenGL/gl.h, [
+   AC_CHECK_HEADERS(GL/glu.h OpenGL/glu.h, [
+-    have_opengl_incs=yes, break], [], [
++    have_opengl_incs=yes; break], [], [
+ #ifdef HAVE_WINDOWS_H
+ # include <windows.h>
+-#endif ]), break], [], [
++#endif ]) break], [], [
+ #ifdef HAVE_WINDOWS_H
+ # include <windows.h>
+ #endif])


Property changes on: octave/trunk/debian/patches/fix-comma-in-configure.dpatch
___________________________________________________________________
Name: svn:mergeinfo
   +