[saods9] 02/02: Adjust patches for new version

Ole Streicher olebole at moszumanska.debian.org
Mon Jun 8 15:03:20 UTC 2015 

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit 1a4d2832aee7eba68b0d7d618a7fb17a99c0ddb0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 8 17:04:15 2015 +0200

    Adjust patches for new version
---
 debian/changelog                                 |  5 +++--
 debian/patches/checkdns.patch                    | 13 -------------
 debian/patches/ds9_add_about_debian.patch        |  8 ++++----
 debian/patches/ds9_fix_docdir.patch              |  6 +++---
 debian/patches/ds9_make_linux.patch              |  9 +++++----
 debian/patches/ds9_support_blt.patch             |  4 ++--
 debian/patches/ds9_use_external_libs.patch       | 12 ++++++------
 debian/patches/ds9_use_filesystem.patch          |  2 +-
 debian/patches/saotk_add_ksearch.patch           |  2 +-
 debian/patches/saotk_add_psscale.patch           |  2 +-
 debian/patches/saotk_fix_blt_crash.patch         | 16 ++++++++--------
 debian/patches/saotk_fix_wcstools_includes.patch |  4 ++--
 debian/patches/series                            |  1 -
 13 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a828ff1..0fafe09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-saods9 (7.3.2+repack-3) UNRELEASED; urgency=low
+saods9 (7.4~b1+repack-1) UNRELEASED; urgency=low
 
+  * New upstream beta version
   * Add CI tests (ds9 with and without XPA)
 
- -- Ole Streicher <olebole at debian.org>  Mon, 08 Jun 2015 16:43:39 +0200
+ -- Ole Streicher <olebole at debian.org>  Mon, 08 Jun 2015 16:51:46 +0200
 
 saods9 (7.3.2+repack-2) unstable; urgency=low
 
diff --git a/debian/patches/checkdns.patch b/debian/patches/checkdns.patch
deleted file mode 100644
index 9532cea..0000000
--- a/debian/patches/checkdns.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Justin Pryzby <justinpryzby at users.sf.net>
-Description: Avoid compilation error in (Tcl) DNS checker
---- a/tclcheckdns1.1/checkdns.c
-+++ b/tclcheckdns1.1/checkdns.c
-@@ -15,6 +15,8 @@
- #include <netdb.h>
- #if HAVE_TCL
- #include <tcl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
- #else
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 0c6dc76..3bc672d 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -5,7 +5,7 @@ Description: Add the Debian packager to the "About" box
 @@ -21,6 +21,8 @@
      set help(vo) "$ds9(doc)/ref/vo.html"
  
-     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 Observ [...]
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\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 Cente [...]
 +
 +    append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
  }
@@ -13,12 +13,12 @@ Description: Add the Debian packager to the "About" box
  proc HelpRef {} {
 --- a/src/util.tcl
 +++ b/src/util.tcl
-@@ -681,7 +681,7 @@
+@@ -684,7 +684,7 @@
  
      # Param
      set f [frame $w.param -background white]
--    canvas $f.c -background white -height 450 -width 550
-+    canvas $f.c -background white -height 485 -width 550
+-    canvas $f.c -background white -height 350 -width 500
++    canvas $f.c -background white -height 385 -width 500
      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 759ac83..183cf68 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 (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 Observ [...]
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\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 Cente [...]
  }
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -206,6 +206,7 @@
+@@ -203,6 +203,7 @@
  	} else {
  	    set ds9(root) "/usr/share/saods9"
  	}
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
  	package require http
 --- a/src/util.tcl
 +++ b/src/util.tcl
-@@ -686,7 +686,7 @@
+@@ -689,7 +689,7 @@
      
      # can't use -file for zvfs
      # set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif]
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 9f07de1..b76a929 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -26,7 +26,7 @@ Description: Set the compile flags according to the Debian environment. We
  CXXOPT	= ${OPTS} ${AA}
 --- a/Makefile.unix
 +++ b/Makefile.unix
-@@ -34,12 +34,17 @@
+@@ -34,13 +34,17 @@
  
  tkblt	: FORCE
  	@echo "Installing Tkblt..."
@@ -37,6 +37,7 @@ Description: Set the compile flags according to the Debian environment. We
  	./configure $(XFLAGS) \
  	--prefix $(root) \
  	--exec-prefix $(root) \
+-	--disable-shared \
 +	--enable-shared \
  	--enable-symbols
 -	$(MAKE) -C $(TKBLTDIR) -j $(JOBS) install
@@ -46,7 +47,7 @@ Description: Set the compile flags according to the Debian environment. We
  
  tktable	: FORCE
  	@echo "Installing Tktable..."
-@@ -64,9 +69,9 @@
+@@ -65,9 +69,9 @@
  tkimg	: libtiff
  	@echo "Installing Tkimg..."
  	cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' \
@@ -58,7 +59,7 @@ Description: Set the compile flags according to the Debian environment. We
  	--prefix $(root) \
  	--disable-shared
  	$(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
-@@ -83,9 +88,9 @@
+@@ -84,9 +88,9 @@
  tkhtml	: $(HTMLDIR)
  	@echo "Installing Tkhtml..."
  	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
@@ -72,7 +73,7 @@ Description: Set the compile flags according to the Debian environment. We
  	$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
 --- a/Makefile
 +++ b/Makefile
-@@ -176,7 +176,7 @@
+@@ -178,7 +178,7 @@
  
  saotk	: FORCE
  	@echo "Installing SAOTK..."
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 7d28698..30c5577 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -61,7 +61,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  
 --- a/src/scale.tcl
 +++ b/src/scale.tcl
-@@ -292,9 +292,9 @@
+@@ -295,9 +295,9 @@
  			 ]
  
      $dscale(hist) legend configure -hide yes
@@ -87,7 +87,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
      PlotChangeMode $varname
 --- a/src/plot.tcl
 +++ b/src/plot.tcl
-@@ -1197,12 +1197,12 @@
+@@ -1196,12 +1196,12 @@
  	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
  
      $var(graph) xaxis configure \
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index f17cbed..977f5f0 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -231,7 +231,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  }
 --- a/Makefile.unix
 +++ b/Makefile.unix
-@@ -109,14 +109,10 @@
+@@ -110,14 +110,10 @@
  	--enable-symbols
  	$(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
  
@@ -252,7 +252,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/Makefile
 +++ b/Makefile
-@@ -215,32 +215,6 @@
+@@ -217,32 +217,6 @@
  dirsclean: FORCE
  	@for d in $(DIRS); do rm -rf $$d; done
  
@@ -285,7 +285,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  tkmpegclean: FORCE
  	$(MAKE) -C $(TKMPEGDIR) distclean
  
-@@ -248,27 +222,12 @@
+@@ -250,27 +224,12 @@
  #	cd $(HTMLDIR); $(MAKE) distclean
  	rm -rf $(HTMLDIR)
  
@@ -313,7 +313,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  riceclean: FORCE
  	$(MAKE) -C $(RICEDIR) distclean
  
-@@ -281,9 +240,6 @@
+@@ -283,9 +242,6 @@
  saotkclean : FORCE
  	$(MAKE) -C $(SAOTKDIR) distclean
  
@@ -325,7 +325,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -202,31 +202,34 @@
+@@ -199,31 +199,34 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
@@ -333,7 +333,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	    source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
 -	}
 -	if {![namespace exists http]} {
--	    source $ds9(root)/tcl8/8.6/http-2.8.7.tm
+-	    source $ds9(root)/tcl8/8.6/http-2.8.8.tm
 -	}
 -
 -	source $ds9(root)/tk8.6/tearoff.tcl
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 3597e16..0af19b6 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -100,7 +100,7 @@ Description: Store all files in the usual FHS directories
      return TCL_ERROR;
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -198,9 +198,14 @@
+@@ -195,9 +195,14 @@
  
  switch $ds9(wm) {
      x11 {
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 3a4df04..69eb0c1 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -3,7 +3,7 @@ Description: Insert the "ksearchh" routine that was originated by Doub Mink
  in wcssubs so that fitsImage.c will compile.
 --- a/saotk/frame/fitsimage.C
 +++ b/saotk/frame/fitsimage.C
-@@ -31,7 +31,97 @@
+@@ -32,7 +32,97 @@
  extern "C" {
    FitsHead* wcshead = NULL;
    FitsHead* wcsprim = NULL;
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 33c8638..bcfe8e2 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -29,7 +29,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
  #endif
  
  // copied from tkCanvPs.c
--#include "../../tk8.6.1/generic/tkCanvas.h"
+-#include "../../tk8.6.4/generic/tkCanvas.h"
 +#include <tk-private/generic/tkCanvas.h>
  
  typedef struct TkPostscriptInfo {
diff --git a/debian/patches/saotk_fix_blt_crash.patch b/debian/patches/saotk_fix_blt_crash.patch
index e014969..650e0eb 100644
--- a/debian/patches/saotk_fix_blt_crash.patch
+++ b/debian/patches/saotk_fix_blt_crash.patch
@@ -5,7 +5,7 @@ Description: BLT crashes when it reaches this code. This fix is
  a better fix.
 --- a/saotk/frame/frblt.C
 +++ b/saotk/frame/frblt.C
-@@ -841,7 +841,7 @@
+@@ -947,7 +947,7 @@
    if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
      goto error;
  
@@ -14,7 +14,7 @@ Description: BLT crashes when it reaches this code. This fix is
        TCL_OK)
      goto error;
  
-@@ -849,7 +849,7 @@
+@@ -955,7 +955,7 @@
    if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
      goto error;
  
@@ -25,7 +25,7 @@ Description: BLT crashes when it reaches this code. This fix is
  
 --- a/saotk/frame/marker.C
 +++ b/saotk/frame/marker.C
-@@ -1191,19 +1191,19 @@
+@@ -1258,19 +1258,19 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -48,8 +48,8 @@ Description: BLT crashes when it reaches this code. This fix is
 +  Blt_ResetVector(yyc, yc, num, num*sizeof(double), TCL_STATIC);
  }
  
- void Marker::analysisPlot3dResult(char* xname, char* yname, 
-@@ -1212,11 +1212,11 @@
+ void Marker::analysisXYResult(char* xname, char* yname, double* x, double* y, 
+@@ -1278,11 +1278,11 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -62,8 +62,8 @@ Description: BLT crashes when it reaches this code. This fix is
 +  Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC);
  }
  
- void Marker::analysisPandaResult(double* x, double* y, double* e, int num)
-@@ -1233,15 +1233,15 @@
+ void Marker::analysisXYEResult(char* xname, char* yname, char* ename,
+@@ -1290,15 +1290,15 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -81,4 +81,4 @@ Description: BLT crashes when it reaches this code. This fix is
 +  Blt_ResetVector(ee, e, num, num*sizeof(double), TCL_STATIC);
  }
  
- Matrix Marker::fwdMatrix()
+ void Marker::analysisXYEResult(double* x, double* y, double* e, int num)
diff --git a/debian/patches/saotk_fix_wcstools_includes.patch b/debian/patches/saotk_fix_wcstools_includes.patch
index 29b67c1..18e4795 100644
--- a/debian/patches/saotk_fix_wcstools_includes.patch
+++ b/debian/patches/saotk_fix_wcstools_includes.patch
@@ -10,6 +10,6 @@ Description: There is a ambiguity in the name "wcs.h" which could either come
  #include "file.h"
 -#include "wcs.h"
 +#include <wcstools/wcs.h>
+ #include "head.h"
  
- extern "C" {
-   #include "ast.h"
+ #include "smooth.h"
diff --git a/debian/patches/series b/debian/patches/series
index b28e6b1..367ebba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-checkdns.patch
 htmlwidget.patch
 iis.patch
 saotk_fix_blt_crash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git

More information about the debian-science-commits mailing list