[saods9] 01/02: test in html8.5 first in htmlwidget. Closes: #755329 Thanks to Sergei Golovan for thepatch.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian-sid
in repository saods9.

commit 293c1321a5823d91c07eb6a276f72db6fde5e36c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 22 16:33:49 2014 +0200

    test in html8.5 first in htmlwidget. Closes: #755329
    Thanks to Sergei Golovan for thepatch.
---
 debian/changelog                |  6 ++++++
 debian/patches/htmlwidget.patch | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a39435c..af487d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.2+dfsg-5) unstable; urgency=medium
+
+  * test in html8.5 first in htmlwidget. Closes: #755329
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 20 Jul 2014 13:19:03 +0200
+
 saods9 (7.2+dfsg-4) unstable; urgency=low
 
   [Sergei Golovan]
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
index 7c5b3fc..08dd57c 100644
--- a/debian/patches/htmlwidget.patch
+++ b/debian/patches/htmlwidget.patch
@@ -3,8 +3,10 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
  because buggy search. This patch fixes this q&d directly in "configure".
  Since ds9.7 will have an updated htmlwidget, I guess it makes no sense to 
  provide a general patch here.
---- a/htmlwidget/configure.in
-+++ b/htmlwidget/configure.in
+Index: saods9/htmlwidget/configure.in
+===================================================================
+--- saods9.orig/htmlwidget/configure.in	2014-07-22 16:31:44.427122748 +0200
++++ saods9/htmlwidget/configure.in	2014-07-22 16:31:44.427122748 +0200
 @@ -332,9 +332,6 @@
  else
    AC_MSG_RESULT(unknown)
@@ -15,6 +17,15 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
  if test "$CYGWIN" = "yes"; then
    BUILD_EXEEXT=.exe
  else
+@@ -390,7 +387,7 @@
+     fi
+   fi
+   if test "$BUILD_TCLSH" = ""; then
+-    AC_CHECK_PROGS(BUILD_TCLSH, tclsh8.2 tclsh8.1 tclsh81 tclsh8.0 tclsh80 cygtclsh80 tclsh, "")
++    AC_CHECK_PROGS(BUILD_TCLSH, tclsh8.5 tclsh8.1 tclsh81 tclsh8.0 tclsh80 cygtclsh80 tclsh, "")
+   fi
+   if test "$BUILD_TCLSH" = ""; then
+     AC_MSG_ERROR([no working "tclsh" could be found])
 @@ -540,7 +537,7 @@
      cat > conftest.tcl <<\EOF
        regsub {^([A-Za-z]):/} [info library] {//\1/} out
@@ -24,6 +35,15 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
        puts -nonewline $out
        exit
  EOF
+@@ -583,7 +580,7 @@
+     LIBS=$extra
+   else 
+     LIBS=""
+-    AC_SEARCH_LIBS(Tcl_Init, tcl8.2 tcl8.1 tcl8.0 tcl80 tcl,,,$otherlibs)
++    AC_SEARCH_LIBS(Tcl_Init, tcl8.5 tcl8.1 tcl8.0 tcl80 tcl,,,$otherlibs)
+   fi
+   TARGET_TCL_LIBS="$LIBS $otherlibs"
+ fi
 @@ -613,11 +610,11 @@
    AC_CHECK_HEADER(tcl.h, [found=yes])
  fi
@@ -31,7 +51,7 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
 -  for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do
 -    n=$dir/include/tcl.h
 -    AC_CHECK_FILE($dir/include/tcl.h, found=yes)
-+  for dir in /usr/include /usr/include/tcl /usr/include/tcl8.* ; do
++  for dir in /usr/include/tcl8.5 /usr/include/tcl /usr/include/tcl8.* ; do
 +    n=$dir/tcl.h
 +    AC_CHECK_FILE($dir/tcl.h, found=yes)
      if test "$found" = "yes"; then
@@ -40,3 +60,12 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
        break
      fi
    done
+@@ -666,7 +663,7 @@
+     CC=$TARGET_CC
+     otherlibs="$TARGET_X_LIBS $TARGET_TCL_LIBS"
+     LIBS=""
+-    AC_SEARCH_LIBS(Tk_Init, tk8.2 tk8.1 tk8.0 tk80 tk,,,$otherlibs)
++    AC_SEARCH_LIBS(Tk_Init, tk8.5 tk8.1 tk8.0 tk80 tk,,,$otherlibs)
+     TARGET_TK_LIBS=$LIBS
+   fi
+ fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git