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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit a4e7963bddff4195e424e9c31d8d90c6b201c723
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 19 11:51:50 2012 +0200

    Keep "help" menu enabled and disable help items
    This is needed since the "about" menu moved here now and should be
    available even without the "doc" package.

diff --git a/debian/patches/ds9_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index e940e05..9b4a6f5 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -2,18 +2,50 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Make the "-doc" package optional by disabling the help menu 
 --- a/src/mhelp.tcl
 +++ b/src/mhelp.tcl
-@@ -8,8 +8,13 @@
+@@ -8,30 +8,37 @@
  
  proc HelpMenu {mb} {
      global ds9
 +    global help
  
--    $mb add cascade -label [msgcat::mc {Help}] -menu $mb.help
+     $mb add cascade -label [msgcat::mc {Help}] -menu $mb.help
+ 
 +    if [ file exists $help(refman) ] {
-+	$mb add cascade -label [msgcat::mc {Help}] -menu $mb.help
++	set helpstate normal
 +    } else {
-+	$mb add cascade -label [msgcat::mc {Help}] -state disabled
++	set helpstate disabled
 +    }
- 
++
      menu $mb.help
      $mb.help add command -label [msgcat::mc {Reference Manual}]\
+-	-command HelpRef
++	-command HelpRef -state $helpstate
+     $mb.help add command -label [msgcat::mc {User Manual}]\
+-	-command HelpUser
++	-command HelpUser -state $helpstate
+     $mb.help add command -label [msgcat::mc {Mouse & Keyboard}] \
+-	-command HelpKeyboard
++	-command HelpKeyboard -state $helpstate
+     $mb.help add separator
+     $mb.help add command -label [msgcat::mc {FAQ}] \
+-	-command HelpFAQ
++	-command HelpFAQ -state $helpstate
+     $mb.help add command -label [msgcat::mc {New Features}] \
+-	-command HelpNew
++	-command HelpNew -state $helpstate
+     $mb.help add command -label [msgcat::mc {Release Notes}] \
+-	-command HelpRelease
++	-command HelpRelease -state $helpstate
+     $mb.help add command -label [msgcat::mc {Help Desk}] \
+-	-command HelpDesk
++	-command HelpDesk -state $helpstate
+     $mb.help add separator
+     $mb.help add command -label [msgcat::mc {Story of SAOImage DS9}] \
+-	-command HelpStory
++	-command HelpStory -state $helpstate
+     $mb.help add command -label [msgcat::mc {Acknowledgment}] \
+-	-command HelpAck
++	-command HelpAck -state $helpstate
+ 
+     switch $ds9(wm) {
+ 	x11 -

-- 
image display tool for astronomy