[Debian-astro-commits] [saods9] 02/03: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Wed Nov 11 12:26:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository saods9.
commit 301afa37ddc814f3fd3632dcd30264f2f33384e8
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Nov 11 13:02:08 2015 +0100
Adjust patches for new version
---
debian/changelog | 8 +++++++-
debian/patches/ds9_add_about_debian.patch | 2 +-
debian/patches/ds9_fix_docdir.patch | 4 ++--
debian/patches/ds9_support_blt.patch | 4 ++--
debian/patches/ds9_use_system_libs.patch | 6 +++---
debian/patches/ds9_use_tcltk_packages.patch | 24 +++++++++++------------
debian/patches/fix_nonlinux.patch | 15 --------------
debian/patches/saotk_avoid_compile_warnings.patch | 16 +++++++--------
debian/patches/saotk_fix_blt_crash.patch | 4 ++--
debian/patches/saotk_use_system_libs.patch | 8 +++++---
debian/patches/series | 1 -
11 files changed, 42 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e075b7..203b560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b8+repack-1) unstable; urgency=low
+
+ * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org> Wed, 11 Nov 2015 13:01:08 +0100
+
saods9 (7.4~b7+repack-4) unstable; urgency=low
* Use external xmlrpc instead of convenience copy
@@ -6,7 +12,7 @@ saods9 (7.4~b7+repack-4) unstable; urgency=low
saods9 (7.4~b7+repack-3) unstable; urgency=low
- * Update configure script to activale last fix
+ * Update configure script to activate last fix
-- Ole Streicher <olebole at debian.org> Mon, 21 Sep 2015 10:17:35 +0200
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index f9f6969..4b44c94 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -13,7 +13,7 @@ Description: Add the Debian packager to the "About" box
proc HelpRef {} {
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
-@@ -684,7 +684,7 @@
+@@ -685,7 +685,7 @@
# Param
set f [frame $w.param -background white]
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index b826114..b7ea920 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -35,7 +35,7 @@ Description: Instead putting the documentation into the common shared
}
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -199,6 +199,7 @@
+@@ -198,6 +198,7 @@
# set to absolute path so that if -cd command is used,
# so we can still find our files
set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
package require http
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
-@@ -689,7 +689,7 @@
+@@ -690,7 +690,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_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 38ab21f..3dc335e 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -41,7 +41,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
}
proc UpdateGraphXAxis {which} {
-@@ -228,13 +226,13 @@
+@@ -234,13 +232,13 @@
set yMax [expr $yMin + 1]
}
@@ -61,7 +61,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
--- a/ds9/library/scale.tcl
+++ b/ds9/library/scale.tcl
-@@ -309,9 +309,9 @@
+@@ -303,9 +303,9 @@
]
$dscale(hist) legend configure -hide yes
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 443b040..f03c50c 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -4,7 +4,7 @@ Description: Link against system libraries.
copies provided by ds9, and use tcl/tk packages wherever possible.
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
-@@ -38,13 +38,6 @@
+@@ -37,13 +37,6 @@
OBJS = ds9.o tkAppInit.o
FILES = \
@@ -20,7 +20,7 @@ Description: Link against system libraries.
$(ZDIR)/doc \
--- a/make.include
+++ b/make.include
-@@ -368,12 +368,10 @@
+@@ -371,12 +371,10 @@
.PHONY : libtiffdistclean tkmpegdistclean tksaodistclean
.PHONY : tktabledistclean xpadistclean
@@ -38,7 +38,7 @@ Description: Link against system libraries.
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -200,31 +200,33 @@
+@@ -199,31 +199,33 @@
# so we can still find our files
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index eb485f2..1c475f7 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -4,15 +4,15 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
initialization.
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
#--------------------------main
-all: $(DS9CMD)
+all: $(FILES)
- tkAppInit.o : tkAppInit.c
- $(CC) $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
+ debug: $(DEBUGCMD)
+
--- /dev/null
+++ b/ds9/ds9
@@ -0,0 +1,2 @@
@@ -20,7 +20,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
+exec wish8.6 -f ${DS9_HOME-/usr/share/saods9}/library/ds9.tcl $*
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -167,7 +167,7 @@
+@@ -166,7 +166,7 @@
}
# who are we?
@@ -29,7 +29,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
# Themes are now hardcoded
switch $ds9(wm) {
-@@ -198,7 +198,7 @@
+@@ -197,7 +197,7 @@
x11 {
# set to absolute path so that if -cd command is used,
# so we can still find our files
@@ -38,7 +38,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require msgcat
package require http
-@@ -214,6 +214,11 @@
+@@ -213,6 +213,11 @@
package require tkcon
package require xmlrpc
package require BLT
@@ -52,7 +52,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require Signal
--- a/make.include
+++ b/make.include
-@@ -72,7 +72,7 @@
+@@ -75,7 +75,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -61,7 +61,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
tcliis : $(TCLIISDIR)/Makefile
@echo ""
-@@ -86,7 +86,7 @@
+@@ -89,7 +89,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -70,7 +70,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
tclsignal: $(TCLSIGNALDIR)/Makefile
@echo ""
-@@ -115,7 +115,7 @@
+@@ -118,7 +118,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -79,7 +79,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
tclzvfs : $(TCLZVFSDIR)/Makefile
@echo ""
-@@ -165,7 +165,7 @@
+@@ -168,7 +168,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -88,7 +88,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
tkimg : libtiff $(TKIMGDIR)/Makefile
@echo ""
-@@ -208,7 +208,7 @@
+@@ -211,7 +211,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -97,7 +97,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
tksao : $(TKSAODIR)/Makefile
@echo ""
-@@ -222,7 +222,7 @@
+@@ -225,7 +225,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
diff --git a/debian/patches/fix_nonlinux.patch b/debian/patches/fix_nonlinux.patch
deleted file mode 100644
index 8786226..0000000
--- a/debian/patches/fix_nonlinux.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Allow build on Debian/kfreebsd and Debian/hurd
- All Debian variants are handled like the Linux case, so we just extend
- the switch here.
---- a/ds9/unix/configure.in
-+++ b/ds9/unix/configure.in
-@@ -89,7 +89,7 @@
- DS9CMD=ds9
- AC_CHECK_LIB([jbig],[jbg_enc_init])
- ;;
-- Linux* )
-+ Linux*|GNU* )
- DS9CMD=ds9
- ;;
- *)
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 116cf6e..7c6e5a5 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -38,7 +38,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid2dPtr = this;
--- a/tksao1.0/frame/fitsimage.C
+++ b/tksao1.0/frame/fitsimage.C
-@@ -1170,7 +1170,7 @@
+@@ -1158,7 +1158,7 @@
if (ast[0] && ast[ii]) {
AstFrameSet* dep = (AstFrameSet*)astCopy(ast[ii]);
astInvert(ast[0]);
@@ -47,7 +47,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astSetI(dep,"current",4);
astAnnul(ast[0]);
ast[0] = dep;
-@@ -3020,24 +3020,24 @@
+@@ -2953,24 +2953,24 @@
if (ii>=0 && ast && ast[ii]) {
if (astIsASkyFrame(astGetFrame(ast[ii], AST__CURRENT))) {
setAstSkyFrame(ast[ii],sky);
@@ -81,7 +81,7 @@ Description: Avoid compile time warnings in the saotk subsystem
return out;
}
}
-@@ -3252,7 +3252,7 @@
+@@ -3205,7 +3205,7 @@
ostringstream str;
str << "Format(" << id << ")=" << format << ends;
@@ -90,7 +90,7 @@ Description: Avoid compile time warnings in the saotk subsystem
}
void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
-@@ -3323,7 +3323,7 @@
+@@ -3276,7 +3276,7 @@
astClearStatus;
// new fitschan
@@ -99,7 +99,7 @@ Description: Avoid compile time warnings in the saotk subsystem
if (!astOK || chan == AST__NULL)
return NULL;
-@@ -3385,7 +3385,7 @@
+@@ -3338,7 +3338,7 @@
astClearStatus;
// new fitschan
@@ -193,7 +193,7 @@ Description: Avoid compile time warnings in the saotk subsystem
}
--- a/tksao1.0/frame/grid3d.C
+++ b/tksao1.0/frame/grid3d.C
-@@ -118,16 +118,16 @@
+@@ -119,16 +119,16 @@
astSetI(wcs, "Base", idata);
// Create two 1D Frames and a 1D Mapping describing the third axis
@@ -214,7 +214,7 @@ Description: Avoid compile time warnings in the saotk subsystem
// Use astGetFrame and astGetMapping to get the base and current
// Frames from the 2D FrameSet, and the base->current Mapping.
-@@ -136,14 +136,14 @@
+@@ -137,14 +137,14 @@
AstMapping* wcsmap = (AstMapping*)astGetMapping(wcs,AST__BASE,AST__CURRENT);
// Combine the 2D and 1D base Frames into a 3D CmpFrame
// Likewise, combine the 2D and 1D current Frames into a 3D CmpFrame
@@ -233,7 +233,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astAddFrame(frameSet, AST__CURRENT, cmpwcsmap, cmpwcscurr);
}
}
-@@ -186,26 +186,26 @@
+@@ -187,26 +187,26 @@
double ss[] = {mx.matrix(0,0),mx.matrix(1,0),
mx.matrix(0,1),mx.matrix(1,1)};
AstMatrixMap* mm;
diff --git a/debian/patches/saotk_fix_blt_crash.patch b/debian/patches/saotk_fix_blt_crash.patch
index 6b4c05a..8d492cf 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/tksao1.0/frame/frblt.C
+++ b/tksao1.0/frame/frblt.C
-@@ -947,7 +947,7 @@
+@@ -951,7 +951,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;
-@@ -955,7 +955,7 @@
+@@ -959,7 +959,7 @@
if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
goto error;
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 5f711f3..968e347 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -96,17 +96,19 @@ Description: Compile against system library wcstools and funtools
#include "smooth.h"
--- a/tksao1.0/fitsy++/hist.C
+++ b/tksao1.0/fitsy++/hist.C
-@@ -13,8 +13,8 @@
+@@ -13,10 +13,10 @@
#include "hist.h"
#include "util.h"
-#include "fitsy.h"
--#include "filter.h"
+#include <funtools/fitsy.h>
+
+ #ifndef __WIN32
+-#include "filter.h"
+#include <funtools/filter.h>
+ #endif
#ifdef __CYGWIN__
- // limit size, cygwin pipe to 64K / (4 args x 4 bytes)
--- a/tksao1.0/fitsy++/hpx.C
+++ b/tksao1.0/fitsy++/hpx.C
@@ -18,7 +18,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index dcd3b81..d884e22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,3 @@ saotk_spellfix.patch
tcliis.patch
tkhtml.patch
fix_configure.patch
-fix_nonlinux.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-astro-commits
mailing list