[saods9] 01/03: Re-create htmlwidget/configure. Fixes FTBS on MIPS.

[Ole Streicher]

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

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

commit 2a5782ee611be511067bb3ff6cda523ac4b9bd2f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Sep 28 15:31:27 2013 +0200

    Re-create htmlwidget/configure. Fixes FTBS on MIPS.
---
 debian/changelog                |    6 +++++
 debian/clean                    |    1 +
 debian/control                  |    1 +
 debian/patches/htmlwidget.patch |   47 ++++++++++++++++-----------------------
 debian/rules                    |    5 ++++-
 5 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 533ef32..169b482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.2+dfsg-3) unstable; urgency=low
+
+  * Re-create htmlwidget/configure. Fixes FTBS on MIPS.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sat, 28 Sep 2013 15:29:28 +0200
+
 saods9 (7.2+dfsg-2) unstable; urgency=low
 
   * Create make.linux on clean, closes: #724082
diff --git a/debian/clean b/debian/clean
index 473d016..088e5a5 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,3 +14,4 @@ blt3.0.1/src/bltHash.h
 blt3.0.1/src/config.h
 blt3.0.1/src/shared/Makefile
 blt3.0.1/src/*.o
+htmlwidget/configure
diff --git a/debian/control b/debian/control
index 003c282..e6a7ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: autotools-dev,
                debhelper (>= 9),
+	       dh-autoreconf,
                html2text,
                cpio,
                libfuntools-dev,
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
index 1df6267..7c5b3fc 100644
--- a/debian/patches/htmlwidget.patch
+++ b/debian/patches/htmlwidget.patch
@@ -3,10 +3,20 @@ 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
-+++ b/htmlwidget/configure
-@@ -1462,7 +1462,7 @@
-         cat > conftest.tcl <<\EOF
+--- a/htmlwidget/configure.in
++++ b/htmlwidget/configure.in
+@@ -332,9 +332,6 @@
+ else
+   AC_MSG_RESULT(unknown)
+ fi
+-if test "$CYGWIN" != "yes"; then
+-  AC_CYGWIN
+-fi
+ if test "$CYGWIN" = "yes"; then
+   BUILD_EXEEXT=.exe
+ else
+@@ -540,7 +537,7 @@
+     cat > conftest.tcl <<\EOF
        regsub {^([A-Za-z]):/} [info library] {//\1/} out
        regsub {/tcl7.6} $out {tk4.2} out
 -      regsub {/tcl([^/]*)} $out {/tk\1} out
@@ -14,38 +24,19 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
        puts -nonewline $out
        exit
  EOF
-@@ -1802,19 +1802,19 @@
- 
+@@ -613,11 +610,11 @@
+   AC_CHECK_HEADER(tcl.h, [found=yes])
  fi
  if test "$found" = "no"; then
 -  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
 +    n=$dir/tcl.h
-     
--ac_safe=`echo "$dir/include/tcl.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $dir/include/tcl.h""... $ac_c" 1>&6
--echo "configure:1811: checking for $dir/include/tcl.h" >&5
-+ac_safe=`echo "$dir/tcl.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $dir/tcl.h""... $ac_c" 1>&6
-+echo "configure:1811: checking for $dir/tcl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-     { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
- else
--  if test -r $dir/include/tcl.h; then
-+  if test -r $dir/tcl.h; then
-     eval "ac_cv_file_$ac_safe=yes"
-   else
-     eval "ac_cv_file_$ac_safe=no"
-@@ -1830,7 +1830,7 @@
- fi
- 
++    AC_CHECK_FILE($dir/tcl.h, found=yes)
      if test "$found" = "yes"; then
 -      TARGET_TCL_INC="-I$dir/include"
-+      TARGET_TCL_INC="-I$dir/"
++      TARGET_TCL_INC="-I$dir"
        break
      fi
    done
diff --git a/debian/rules b/debian/rules
index 957a563..1e580a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,14 @@ get-orig-source:
 	sh ./debian/repack-dfsg.sh
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 make.include:
 	ln -sf make.linux make.include
 
+override_dh_autoreconf:
+	(cd htmlwidget; autoreconf -i -f)
+
 override_dh_auto_build: make.include
 	dh_auto_build -- $(BUILDPARTS)
 	chmod ugo-x ds9/zipdir/zvfsmntpt/src/*.tcl

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