[SCM] image display tool for astronomy branch, debian, updated. upstream/7.0.1+dfsg-182-gbeb9217

Ole Streicher debian at liska.ath.cx
Tue Jan 22 10:09:00 UTC 2013


The following commit has been merged in the debian branch:
commit beb9217830461256a09881d4ba8d3325dcb47082
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jan 22 11:08:49 2013 +0100

    Remove explicite link to tcl8.5 in htmlwidget; fixes FTBS on alpha and sh4

diff --git a/debian/changelog b/debian/changelog
index 5afd46b..868d9dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+saods9 (7.1+dfsg-1~exp3) experimental; urgency=low
+
+  * Remove explicite link to tcl8.5 in htmlwidget; fixes FTBS on alpha
+    and sh4
+
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 22 Jan 2013 11:10:00 +0100
+
 saods9 (7.1+dfsg-1~exp2) experimental; urgency=low
 
   * Fix crashes on 2D marker plots, closes: #693807
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
index b936d46..1df6267 100644
--- a/debian/patches/htmlwidget.patch
+++ b/debian/patches/htmlwidget.patch
@@ -20,7 +20,7 @@ Description: The configure script of htmklwidget does not find tk.tcl and tk.h
  if test "$found" = "no"; then
 -  for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do
 -    n=$dir/include/tcl.h
-+  for dir in /usr/include/tcl8.5 /usr/pkg /usr/contrib /usr; do
++  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_%'`

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list