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

[Ole Streicher]

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

    Fix documentation

diff --git a/debian/patches/fix_docdir.patch b/debian/patches/fix_docdir.patch
index c73a59d..da0d24f 100644
--- a/debian/patches/fix_docdir.patch
+++ b/debian/patches/fix_docdir.patch
@@ -39,8 +39,8 @@ Description: Instead putting the documentation into the common shared
 @@ -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"
+ set ds9(root) "/usr/share/saods9"
++set ds9(doc) "/usr/share/doc/saods9"
  
  # tcl modules
  package require msgcat
diff --git a/debian/patches/use_external_libs_main.patch b/debian/patches/use_external_libs_main.patch
index dda328d..7b9bb5e 100644
--- a/debian/patches/use_external_libs_main.patch
+++ b/debian/patches/use_external_libs_main.patch
@@ -187,7 +187,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -
    // invoke startup script
 -  TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+  TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl");
++  TclSetStartupScriptFileName("/usr/share/saods9/src/ds9.tcl");
  }
  
  Tcl_Interp *global_interp;
@@ -565,7 +565,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
 -set ds9(root) "[pwd]/zvfsmntpt"
-+set ds9(root) "/usr/share/ds9"
++set ds9(root) "/usr/share/saods9"
  
  # tcl modules
 -source $ds9(root)/tcl8/8.5/msgcat-1.4.2.tm
diff --git a/debian/saods9.doc-base.ds9doc b/debian/saods9.doc-base.ds9doc
index dc24230..1145f85 100644
--- a/debian/saods9.doc-base.ds9doc
+++ b/debian/saods9.doc-base.ds9doc
@@ -21,8 +21,8 @@ Abstract: SAOImage DS9 is an astronomical imaging and data
  widget set.  It also incorporates the X Public Access (XPA) mechanism
  to allow external processes to access and control its data, GUI
  functions, and algorithms.
-Section: Apps/Science
+Section: Science/Astronomy
 
 Format: HTML
-Index: /usr/share/doc/saods9/ds9doc/index.html
-Files: /usr/share/doc/saods9/html/*.html
+Index: /usr/share/doc/saods9/index.html
+Files: /usr/share/doc/saods9/*.html
diff --git a/debian/saods9.doc-base.ds9reference b/debian/saods9.doc-base.ds9reference
index 930462e..d44544e 100644
--- a/debian/saods9.doc-base.ds9reference
+++ b/debian/saods9.doc-base.ds9reference
@@ -15,7 +15,7 @@ Abstract: DS9 is the next version of the popular SAOtng display program.
  arbitrary zoom, rotation, pan, and a variety of coordinate systems
  (including Image, Physical, Detector, and WCS). DS9 also supports FTP
  and HTTP access. The GUI for DS9 is user configurable.
-Section: Apps/Science
+Section: Science/Astronomy
 
 Format: HTML
 Index: /usr/share/doc/saods9/ref/index.html
diff --git a/debian/saods9.doc-base.ds9release b/debian/saods9.doc-base.ds9release
index 202d7ee..97c78c1 100644
--- a/debian/saods9.doc-base.ds9release
+++ b/debian/saods9.doc-base.ds9release
@@ -1,8 +1,8 @@
 Document: saods9-release-notes
 Title: DS9 Release Notes
 Author: William Joye <wjoye at cfa.harvard.edu>
-Abstract: SAOImage DS9 Version 4.0 Release Notes
-Section: Apps/Science
+Abstract: SAOImage DS9 Release Notes
+Section: Science/Astronomy
 
 Format: HTML
 Index: /usr/share/doc/saods9/release/r4.0.html
diff --git a/debian/saods9.docs b/debian/saods9.docs
new file mode 100644
index 0000000..30d29de
--- /dev/null
+++ b/debian/saods9.docs
@@ -0,0 +1 @@
+doc/*
diff --git a/debian/saods9.install b/debian/saods9.install
index 7a14e14..af211af 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -1,6 +1,5 @@
 bin/ds9 usr/bin/
 debian/saods9.desktop usr/share/applications
 debian/ds9.xpm usr/share/pixmaps
-src/* /usr/share/ds9/src
-blt3.0/library /usr/share/ds9/blt3.0
-doc/* /usr/share/ds9/doc
+src/* /usr/share/saods9/src
+blt3.0/library /usr/share/saods9/blt3.0

-- 
image display tool for astronomy