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

[Rafael Laboissiere]

Author: rafael
Date: 2009-03-18 13:57:28 +0000 (Wed, 18 Mar 2009)
New Revision: 2732

Added:
   octave/trunk/debian/patches/termios-h-check-3.0.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Sync with the octave3.1 branch and add patch for Bug#520076

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-03-18 13:55:28 UTC (rev 2731)
+++ octave/trunk/debian/changelog	2009-03-18 13:57:28 UTC (rev 2732)
@@ -1,3 +1,11 @@
+octave3.0 (1:3.0.4~rc5-3) UNRELEASED; urgency=low
+
+  * Sync with the octave3.1 branch
+  * debian/patches/termios-h-check-3.0.dpatch: Fix termios.h check, as
+    done below for octave3.1_3.1.54-2
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 18 Mar 2009 11:42:07 +0100
+
 octave3.1 (3.1.54-2) experimental; urgency=low
 
   [ Rafael Laboissiere ]

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-03-18 13:55:28 UTC (rev 2731)
+++ octave/trunk/debian/in/00list	2009-03-18 13:57:28 UTC (rev 2732)
@@ -6,6 +6,7 @@
 glpk-new-api.dpatch
 real-no-history.dpatch
 proper-delete-of-axes-in-clf.dpatch
+termios-h-check-3.0.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/termios-h-check-3.0.dpatch
===================================================================
--- octave/trunk/debian/patches/termios-h-check-3.0.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/termios-h-check-3.0.dpatch	2009-03-18 13:57:28 UTC (rev 2732)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## termios-h-check-3.0.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Small tweak for configure.in/configure to properly detect
+## DP: <termios.h>, making the package build on GNU/kFreeBSD. Thanks to
+## DP: Petr Salinger for the patch.  Closes Bug#520076 for octave3.0.2A
+
+ at DPATCH@
+--- octave3.1-3.1.54.orig/configure.in
++++ octave3.1-3.1.54/configure.in
+@@ -1247,7 +1247,7 @@
+ AC_LANG_POP(C++)
+ 
+ have_termios_h=no
+-AC_CHECK_HEADERS($TERMIOS_H, have_termios_h=yes)
++AC_CHECK_HEADERS(termios.h, have_termios_h=yes)
+ AC_CHECK_HEADERS(termio.h, have_termio_h=yes, have_termio_h=no)
+ AC_CHECK_HEADERS(sgtty.h, have_sgtty_h=yes, have_sgtty_h=no)
+ AC_CHECK_HEADERS(glob.h, have_glob_h=yes, have_glob_h=no)


Property changes on: octave/trunk/debian/patches/termios-h-check-3.0.dpatch
___________________________________________________________________
Name: svn:executable
   + *