Package: saods9 / 8.0.1+repack-2

ds9-Use-FHS-documentation-directory.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
From: Ole Streicher <debian@liska.ath.cx>
Date: Fri, 16 Dec 2016 09:23:38 +0100
Subject: [ds9] Use FHS documentation directory

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.
---
 ds9/library/ds9.tcl  |  1 +
 ds9/library/help.tcl | 18 +++++++++---------
 ds9/library/util.tcl |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index 2fb4d25..8b0d10b 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -202,6 +202,7 @@ switch $ds9(wm) {
 	# set to absolute path so that if -cd command is used,
 	# so we can still find our files
 	set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
+	set ds9(doc) "/usr/share/doc/saods9"
 
 	package require msgcat
 	package require http
diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl
index 11c95aa..1ff071d 100644
--- a/ds9/library/help.tcl
+++ b/ds9/library/help.tcl
@@ -8,15 +8,15 @@ 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(faq) "$ds9(root)/doc/faq.html"
-    set help(release) "$ds9(root)/doc/release/r8.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(vo) "$ds9(root)/doc/ref/vo.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(faq) "$ds9(doc)/faq.html"
+    set help(release) "$ds9(doc)/release/r8.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(vo) "$ds9(doc)/ref/vo.html"
 
     set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
     set help(about) "SAOImageDS9\nVersion $ds9(version,display)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) "
diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
index 9994119..d1bdfe2 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
@@ -842,7 +842,7 @@ proc AboutBox {} {
     
     # can't use -file for zvfs
     # set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif]
-    set ch [open $ds9(root)/doc/sun.gif r]
+    set ch [open $ds9(root)/sun.gif r]
     fconfigure $ch -translation binary -encoding binary
     set dd [read $ch]
     close $ch