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

Sun Oct 14 12:22:29 UTC 2012

The following commit has been merged in the debian branch:
commit fe336b60d957e78704e68aaa117c061dcb5906d8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 14 14:19:21 2012 +0200

    Debian packaging updated to new upstream version

diff --git a/debian/changelog b/debian/changelog
index 146bba2..fa1bd22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+saods9 (7.1+dfsg-1~exp1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 14 Oct 2012 13:47:27 +0200
+
 saods9 (7.0.2+dfsg-1~exp1) experimental; urgency=low
 
   * New upstream release
   * Propagate hardening flags
 
- -- Ole Streicher <debian at liska.ath.cx>  Tue, 19 Jul 2012 11:30:00 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Sun, 14 Oct 2012 13:47:20 +0200
 
 saods9 (7.0.1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/blt_fix_crash.patch b/debian/patches/blt_fix_crash.patch
index 200e5bd..db6a85b 100644
--- a/debian/patches/blt_fix_crash.patch
+++ b/debian/patches/blt_fix_crash.patch
@@ -6,7 +6,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
  a better fix.
 --- a/saotk/frame/frblt.C
 +++ b/saotk/frame/frblt.C
-@@ -232,7 +232,7 @@
+@@ -798,7 +798,7 @@
    if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
      goto error;
  
@@ -15,7 +15,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
        TCL_OK)
      goto error;
  
-@@ -240,7 +240,7 @@
+@@ -806,7 +806,7 @@
    if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
      goto error;
  
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 046ddda..26eb143 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -4,7 +4,7 @@ Description: Add the Debian packager to the "About" box
 +++ b/src/help.tcl
 @@ -22,6 +22,8 @@
  
-     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)\nPetr Kubánek"
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observatory)\nMasahiro Tsujimoto (Japan Aerospace Exploration Agency)\nPetr Kubánek (Institute of Physics, Prague)\nAlbert Kong (National Tsing Hua University)\nHao-Yuan Duan (National Tsing Hua University)\n\nSAOImage DS9 development has been made possible by funding from the 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 3-D data visualization."
  
 +    append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
 +
@@ -17,8 +17,8 @@ Description: Add the Debian packager to the "About" box
  
      # Param
      set f [frame $w.param -background white]
--    canvas $f.c -background white -height 550 -width 400
-+    canvas $f.c -background white -height 585 -width 400
+-    canvas $f.c -background white -height 450 -width 550
++    canvas $f.c -background white -height 485 -width 550
      pack $f.c -fill both -expand true
      
      # can't use -file for zvfs
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index aff932d..efc5de0 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -31,11 +31,11 @@ Description: Instead putting the documentation into the common shared
 +    set help(ack) "$ds9(doc)/acknowledgment.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)\nPetr Kubánek"
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observatory)\nMasahiro Tsujimoto (Japan Aerospace Exploration Agency)\nPetr Kubánek (Institute of Physics, Prague)\nAlbert Kong (National Tsing Hua University)\nHao-Yuan Duan (National Tsing Hua University)\n\nSAOImage DS9 development has been made possible by funding from the 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 3-D data visualization."
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -190,6 +190,7 @@
+@@ -187,6 +187,7 @@
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
  set ds9(root) "/usr/share/saods9"
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index dba859d..074336a 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -42,7 +42,7 @@ Description: Set the compile flags according to the Debian environment. We
  
 --- a/Makefile
 +++ b/Makefile
-@@ -281,7 +281,7 @@
+@@ -284,7 +284,7 @@
  
  blt	: FORCE
  	@echo "Installing BLT..."
@@ -51,7 +51,7 @@ Description: Set the compile flags according to the Debian environment. We
  	cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
  	cp $(BLTDIR)/src/*.so* lib/.
  	cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-@@ -313,7 +313,7 @@
+@@ -316,7 +316,7 @@
  
  html	: FORCE
  	@echo "Installing HTMLWIDGET..."
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 9a4a583..d776e6f 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -86,7 +86,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  debug	: null.zip ds9Base $(FILES)
  	$(RM) $@
-@@ -352,18 +312,14 @@
+@@ -354,18 +314,14 @@
  #--------------------------linux
  
  ifneq (,$(findstring linux,$(ARCH)))
@@ -270,7 +270,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
      return TCL_ERROR;
 --- a/Makefile
 +++ b/Makefile
-@@ -281,9 +281,9 @@
+@@ -284,9 +284,9 @@
  
  blt	: FORCE
  	@echo "Installing BLT..."
@@ -283,7 +283,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
  
  zlib  : FORCE
-@@ -298,7 +298,7 @@
+@@ -301,7 +301,7 @@
  
  tkimg	: libtiff
  	@echo "Installing TKIMG..."
@@ -292,7 +292,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd $(TKIMGDIR); $(MAKE) -j $(JOBS) all; $(MAKE) install
  
  libtiff	: FORCE
-@@ -308,18 +308,18 @@
+@@ -311,18 +311,18 @@
  
  tkmpeg	: FORCE
  	@echo "Installing TKMPEG..."
@@ -314,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd $(XPADIR); $(MAKE) -j $(JOBS); $(MAKE) install
  	cd bin; strip xpa*
  
-@@ -374,7 +374,7 @@
+@@ -377,7 +377,7 @@
  
  saotk	: FORCE
  	@echo "Installing SAOTK..."
@@ -323,7 +323,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  zip	: FORCE
  	@echo "Installing ZIP..."
-@@ -398,15 +398,9 @@
+@@ -401,15 +401,9 @@
  endif
  
  distclean : filesclean \
@@ -342,7 +342,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  filesclean: FORCE
  	find . -name "myconfig.cache" -exec rm {} \;
-@@ -415,59 +409,18 @@
+@@ -418,59 +412,18 @@
  dirsclean: FORCE
  	@for d in $(DIRS); do rm -rf $$d; done
  
@@ -403,7 +403,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  riceclean: FORCE
  	cd $(RICEDIR); $(MAKE) distclean
  
-@@ -483,9 +436,6 @@
+@@ -486,9 +439,6 @@
  zipclean: FORCE
  	cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
  
@@ -415,7 +415,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -192,29 +192,35 @@
+@@ -189,29 +189,35 @@
  set ds9(root) "[pwd]/zvfsmntpt"
  
  # tcl modules
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 1f774d5..bf43914 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -18,7 +18,7 @@ Description: Store all files in the usual FHS directories instead of
  	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
  
  debug	: ds9Base ds9.zip
-@@ -185,12 +182,9 @@
+@@ -187,12 +184,9 @@
  
  all: ds9
  
@@ -127,7 +127,7 @@ Description: Store all files in the usual FHS directories instead of
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -189,7 +189,7 @@
+@@ -186,7 +186,7 @@
  
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index bcb022d..8ff9198 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -22,7 +22,7 @@ Description: Avoid compile time warnings in the saotk subsystem
      valid_ = 1;
  }
  
-@@ -23,7 +23,7 @@
+@@ -34,7 +34,7 @@
  
  OutFitsFileGZ::OutFitsFileGZ(const char* fn)
  {
@@ -33,7 +33,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  
 --- a/saotk/fitsy++/strm.C
 +++ b/saotk/fitsy++/strm.C
-@@ -344,7 +344,7 @@
+@@ -387,7 +387,7 @@
    if (!(this->pExt_ || (this->pIndex_>0))) {
  
      // we are only looking for a primary image
@@ -42,7 +42,7 @@ Description: Avoid compile time warnings in the saotk subsystem
        this->found();
        return;
      }
-@@ -400,7 +400,7 @@
+@@ -443,7 +443,7 @@
  	this->head_ = NULL;
        }
  
diff --git a/debian/saods9-doc.doc-base b/debian/saods9-doc.doc-base
index ffcd565..e9d2ad6 100644
--- a/debian/saods9-doc.doc-base
+++ b/debian/saods9-doc.doc-base
@@ -1,5 +1,5 @@
-Document: saods9
-Title: DS9: Astronomical Data Visualization Application
+Document: saods9-ref
+Title: SAOImage DS9 Reference Manual
 Author: William Joye <wjoye at cfa.harvard.edu>
 Abstract: SAOImage DS9 is an astronomical imaging and data
  visualization application. DS9 supports FITS images and binary
@@ -24,5 +24,5 @@ Abstract: SAOImage DS9 is an astronomical imaging and data
 Section: Science/Astronomy
 
 Format: HTML
-Index: /usr/share/doc/saods9-doc/index.html
-Files: /usr/share/doc/saods9-doc/*.html
+Index: /usr/share/doc/saods9-doc/ref/index.html
+Files: /usr/share/doc/saods9-doc/ref/*.html

-- 
image display tool for astronomy

