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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 2b6156f752d3c5b18413024c02d1d16a44ff28b2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 16 14:25:40 2013 +0200

    Fix some minor documentation glitches that produce an errornous manpage

diff --git a/debian/patches/ds9_fix_documentation.patch b/debian/patches/ds9_fix_documentation.patch
new file mode 100644
index 0000000..a573fcc
--- /dev/null
+++ b/debian/patches/ds9_fix_documentation.patch
@@ -0,0 +1,92 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix some minor documentation glitches that produce an errornous
+ manpage.
+--- a/doc/ref/command.html
++++ b/doc/ref/command.html
+@@ -27,7 +27,7 @@
+         <a href="#align">align</a><br>
+         <a href="#analysis">analysis</a><br>
+         <a href="#array">array</a><br>
+-        <a href="asinh">asinh</a><br>
++        <a href="#asinh">asinh</a><br>
+         <a href="#background">background</a><br>
+         <a href="#backup">backup</a><br>
+         <a href="#bin">bin</a><br>
+@@ -39,7 +39,7 @@
+         <a href="#colorbar">colorbar</a><br>
+         <a href="#console">console</a><br>
+         <a href="#contour">contour</a><br>
+-        <a href="crop">crop</a><br>
++        <a href="#crop">crop</a><br>
+         <a href="#crosshair">crosshair</a><br>
+         <a href="#cube">cube</a><br>
+         <a href="#cursor">cursor</a><br>
+@@ -51,12 +51,12 @@
+         <a href="#fifo">fifo</a><br>
+         <a href="#fifo_only">fifo_only</a><br>
+         <a href="#first">first</a><br>
+-        <a href="command.html#fits">fits</a><br>
++        <a href="#fits">fits</a><br>
+         <a href="#frame">frame</a><br>
+         <a href="#geometry">geometry</a><br>
+         <a href="#gif">gif</a><br>
+         <a href="#green">green</a><br>
+-        <a href="#geometry">grid</a><br>
++        <a href="#grid">grid</a><br>
+         <a href="#header">header</a><br>
+         <a href="#height">height</a><br>
+         <a href="#help">help</a><br>
+@@ -78,12 +78,11 @@
+         <a href="#mecube">mecube</a><br>
+         <a href="#minmax">minmax</a><br>
+         <a href="#mode">mode</a><br>
+-      </tt><tt><a href="#mode"><tt></tt></a><tt><a href="#mosaic">mosaic</a></tt><br>
++	<a href="#mosaic">mosaic</a><br>
+         <a href="#mosaicimage">mosaicimage</a><br>
+-        <a href="#movie">movie</a></tt><br>
+-      <tt><tt><a
+-            href="file:///Users/joye/saods9/doc/ref/command.html#msg">msg</a><br>
+-        </tt><a href="#multiframe">multiframe</a><br>
++        <a href="#movie">movie</a><br>
++        <a href="#msg">msg</a><br>
++        <a href="#multiframe">multiframe</a><br>
+         <a href="#nameserver">nameserver</a><br>
+         <a href="#nan">nan</a><br>
+         <a href="#nrrd">nrrd</a><br>
+@@ -105,8 +104,8 @@
+         <a href="#exit">quit</a><br>
+         <a href="#raise">raise</a><br>
+         <a href="#regions">regions</a><br>
+-      </tt><tt><a href="#red">red</a><br>
+-      </tt><tt><a href="#restore">restore</a><br>
++        <a href="#red">red</a><br>
++        <a href="#restore">restore</a><br>
+         <a href="#rgb">rgb</a><br>
+         <a href="#rgbarray">rgbarray</a><br>
+         <a href="#rgbcube">rgbcube</a><br>
+@@ -257,16 +256,6 @@
+         $ds9 -analysis text '{This is text}';<br>
+       </tt>
+       <p><b> <a name="array"></a>array</b></p>
+-      <p>Load raw data array into current frame.<br>
+-      </p>
+-      <tt> Syntax:<br>
+-        -array
+-<filename>[[xdim=<x>,ydim=<y>|dim=<dim>],zdim=<z>,bitpix=<b>,skip=<s>,endian=[little|big]]<br>
+-         <br>
+-        Example: <br>
+-        $ds9 -array foo.arr[dim=512,bitpix=-32,endian=little]</tt><br>
+-      <tt>$cat foo.arr | ds9 -array -[dim=512,bitpix=-32,endian=little]</tt><br>
+-      <p><b> <a name="array"></a>array</b></p>
+       <p>Load an array. </p>
+       <tt> Syntax: <br>
+         -array
+@@ -1325,7 +1314,7 @@
+         $ds9 -height 512<br>
+       </tt>
+       <p><b> <a name="help"></a>help</b></p>
+-      <p>Display help information. To maintain backward compatability,
++      <p>Display help information. To maintain backward compatibility,
+         -help will display a brief help message and exit. --help will
+         display all command line options within the built-in help
+         facility.</p>
diff --git a/debian/patches/series b/debian/patches/series
index 85283f9..4ca3e8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ ds9_use_filesystem.patch
 ds9_fix_docdir.patch
 ds9_optional_doc_package.patch
 ds9_add_about_debian.patch
+ds9_fix_documentation.patch

-- 
image display tool for astronomy