[SCM] image display tool for astronomy branch, master, updated. f5493b82e1d0414f4ea8da4e427eafb517792b3c

Ole Streicher debian at liska.ath.cx
Sat May 12 19:40:17 UTC 2012


The following commit has been merged in the master branch:
commit f5493b82e1d0414f4ea8da4e427eafb517792b3c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat May 12 21:36:25 2012 +0200

    Proper patch name and description

diff --git a/debian/patches/hv3_help.patch b/debian/patches/htmlwidget.patch
similarity index 85%
rename from debian/patches/hv3_help.patch
rename to debian/patches/htmlwidget.patch
index 05b46ac..b936d46 100644
--- a/debian/patches/hv3_help.patch
+++ b/debian/patches/htmlwidget.patch
@@ -1,8 +1,8 @@
 Author: Ole Streicher <launchpad-cpl at ole.ath.cx>
-Description: The "htmlwidget" that is distributed with saods9 originates from
- the "tkhtml" widget of wich a newer version is part of Debian. This patch 
- replaces the old code that connects the ds9 help with the htmlwidget by 
- the new code.
+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 @@
diff --git a/debian/patches/series b/debian/patches/series
index f388ed3..88fb15e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,6 @@ fix_docdir.patch
 spellfix.patch
 add_about_debian.patch
 remove_blt_rpath.patch
-hv3_help.patch
+htmlwidget.patch
 optional_doc_package.patch
 fix_bit32_saotk.patch

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list