[Pkg-octave-commit] [SCM] octave branch, octave3.2, updated. 3d6b62c7f922a903159c00374a963dd9dbd3dda8

[Rafael Laboissiere]

The following commit has been merged in the octave3.2 branch:
commit 2807033059b1aa9101f1f82e48231136f06cce45
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed May 27 14:08:58 2009 +0200

    Drop patch

diff --git a/debian/changelog b/debian/changelog
index 6559ef2..921c17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 octave3.2 (3.2.0~rc4-1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * debian/patches/termios-h-check-3.1.diff: Drop patch (applied upstream)
 
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 27 May 2009 10:56:36 +0200
 
diff --git a/debian/in/series b/debian/in/series
index 5e5f7a8..59120eb 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -13,5 +13,4 @@ datenum-vector-input-any-orientation.diff
 no_pdf_in_print.diff
 dont_set_helvetica-3.1.diff
 normal-markersize.diff
-termios-h-check-3.1.diff
 :]
diff --git a/debian/patches/termios-h-check-3.1.diff b/debian/patches/termios-h-check-3.1.diff
deleted file mode 100644
index ccae31f..0000000
--- a/debian/patches/termios-h-check-3.1.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Small tweak for configure.in/configure to properly detect <termios.h>,
-making the package build on GNU/kFreeBSD. Thanks to Petr Salinger for
-the patch.  Closes Bug#520076 for octave3.1.
-
- -- Rafael Laboissiere <rafael at debian.org>  Thu, 12 Mar 2009 23:32:03 +0100
-
---- a/configure.in
-+++ b/configure.in
-@@ -1537,7 +1537,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)

-- 
octave