[SCM] image display tool for astronomy branch, debian, updated. b3f3e22b05a03c61742ba1e05602f098f3f59b71

[Ole Streicher]

The following commit has been merged in the debian branch:
commit ceab2fbdf6614a7250bbb23a9502ab3d1ca3dc33
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 9 18:48:05 2012 +0200

    First steps to use tkhtml3 as help viewer

diff --git a/debian/patches/fix_docdir.patch b/debian/patches/fix_docdir.patch
new file mode 100644
index 0000000..c73a59d
--- /dev/null
+++ b/debian/patches/fix_docdir.patch
@@ -0,0 +1,46 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Instead putting the documentation into the common shared
+ dir of ds9, debian wants it in /usr/share/doc. This requires the help
+ browser to be adjusted.
+--- a/src/help.tcl
++++ b/src/help.tcl
+@@ -8,18 +8,18 @@ proc HelpDef {} {
+     global help
+     global ds9
+ 
+-    set help(refman) "$ds9(root)/doc/ref/index.html"
+-    set help(command) "$ds9(root)/doc/ref/command.html"
+-    set help(userman) "$ds9(root)/doc/user/index.html"
+-    set help(keyboard) "$ds9(root)/doc/ref/keyboard.html"
+-    set help(faq) "$ds9(root)/doc/faq.html"
+-    set help(new) "$ds9(root)/doc/new.html"
+-    set help(release) "$ds9(root)/doc/release/r6.0.html"
+-    set help(helpdesk) "$ds9(root)/doc/helpdesk.html"
+-    set help(story) "$ds9(root)/doc/story.html"
+-    set help(ack) "$ds9(root)/doc/acknowledgment.html"
++    set help(refman) "$ds9(doc)/ref/index.html"
++    set help(command) "$ds9(doc)/ref/command.html"
++    set help(userman) "$ds9(doc)/user/index.html"
++    set help(keyboard) "$ds9(doc)/ref/keyboard.html"
++    set help(faq) "$ds9(doc)/faq.html"
++    set help(new) "$ds9(doc)/new.html"
++    set help(release) "$ds9(doc)/release/r6.0.html"
++    set help(helpdesk) "$ds9(doc)/helpdesk.html"
++    set help(story) "$ds9(doc)/story.html"
++    set help(ack) "$ds9(doc)/acknowledgment.html"
+     set help(home) "http://hea-www.harvard.edu/RD/ds9/"
+-    set help(vo) "$ds9(root)/doc/ref/vo.html"
++    set help(vo) "$ds9(doc)/ref/vo.html"
+ 
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (SAO)\nEric Mandel (SAO)\nSteve Murray (SAO)\nJohn Roll (SAO)\n\nContributions:\nD.S. Berry (Starlink)\nL. Brown (HEASARC)\nMark Calabretta (ATNF)\nMike Fitzpatrick (NOAO)\nDoug Mink (SAO)\nDoug Tody (NOAO)\nP.T. Wallace (Starlink)\nR.F. Warren-Smith (Starlink)\nPeter Wilson (HEASARC)\n\nOther Contributors:\nMark Adler, Jean-loup Gailly,\nD. Richard Hip, G. Howlett,\nJan Nijtmans, John Ousterhout\n\nTranslations:\nHans-Jakob Grimm (SAO)\nAllan Hornstrup (DNSC)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (SAO)\nMasahiro Tsujimoto (JAXA ISAS)\nElaine Fortin (SAO)\nAnne Lemiere(SAO)"
+ 
+--- a/src/ds9.tcl
++++ b/src/ds9.tcl
+@@ -36,6 +36,7 @@
+ # set to absolute path so that if -cd command is used,
+ # so we can still find our files
+ set ds9(root) "/usr/share/ds9"
++set ds9(doc) "/usr/share/doc/ds9"
+ 
+ # tcl modules
+ package require msgcat
diff --git a/debian/patches/series b/debian/patches/series
index bf2549e..44f4aff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ avoid_compile_warnings_saotk.patch
 use_external_libs_saotk.patch
 use_external_libs_main.patch
 fix_blt.patch
+fix_docdir.patch
diff --git a/debian/patches/use_external_libs_main.patch b/debian/patches/use_external_libs_main.patch
index 0b2ccfa..dda328d 100644
--- a/debian/patches/use_external_libs_main.patch
+++ b/debian/patches/use_external_libs_main.patch
@@ -560,7 +560,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -35,26 +35,35 @@ option add {*Listbox*background} #d9d9d9
+@@ -35,26 +35,36 @@ option add {*Listbox*background} #d9d9d9
  
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
@@ -601,6 +601,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 +package require Tktable 
 +package require tclxpa
 +package require Signal
++package require Tkhtml
 +
 +package require img::base
 +package require img::jpeg

-- 
image display tool for astronomy