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

[Rafael Laboissiere]

Author: rafael
Date: 2008-07-22 20:13:15 +0000 (Tue, 22 Jul 2008)
New Revision: 2346

Removed:
   octave/trunk/debian/patches/fix-comma-in-configure.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Drop patch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-07-22 19:27:59 UTC (rev 2345)
+++ octave/trunk/debian/changelog	2008-07-22 20:13:15 UTC (rev 2346)
@@ -5,6 +5,8 @@
     + Do not install octave.st for octave3.1 (avoid conflict with
       octave3.0)
     + Set alternatives priority value for octave3.1
+  * debian/patches/fix-comma-in-configure.dpatch: Drop patch (applied
+    upstream)
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Jul 2008 17:30:55 +0200
 

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2008-07-22 19:27:59 UTC (rev 2345)
+++ octave/trunk/debian/in/00list	2008-07-22 20:13:15 UTC (rev 2346)
@@ -27,5 +27,4 @@
 dont_set_helvetica-3.1.dpatch
 add-acx_blas_f77_func.m4.dpatch
 add-gl-render-cc.dpatch
-fix-comma-in-configure.dpatch
 :]

Deleted: octave/trunk/debian/patches/fix-comma-in-configure.dpatch
===================================================================
--- octave/trunk/debian/patches/fix-comma-in-configure.dpatch	2008-07-22 19:27:59 UTC (rev 2345)
+++ octave/trunk/debian/patches/fix-comma-in-configure.dpatch	2008-07-22 20:13:15 UTC (rev 2346)
@@ -1,23 +0,0 @@
-#! /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])