[Debian-astro-commits] [saods9] 02/02: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Fri Dec 11 09:18:09 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 48ef49d59346a2fa7040603914405a59e6c46b5b
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Dec 11 10:06:29 2015 +0100
Adjust patches for new version
---
debian/changelog | 5 +-
debian/patches/ds9_fix_docdir.patch | 2 +-
debian/patches/ds9_use_system_libs.patch | 4 +-
debian/patches/ds9_use_tcltk_packages.patch | 109 +++++++++++++++++-----
debian/patches/saotk_avoid_compile_warnings.patch | 34 +++----
5 files changed, 109 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d489cb8..3c1ff93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-saods9 (7.4~b9+repack-2) UNRELEASED; urgency=low
+saods9 (7.4~b10+repack-1) unstable; urgency=low
* Correct patch for IRAF communication. Closes: #805641
+ * New upstream beta version
- -- Ole Streicher <olebole at debian.org> Fri, 20 Nov 2015 16:36:44 +0100
+ -- Ole Streicher <olebole at debian.org> Fri, 11 Dec 2015 09:55:33 +0100
saods9 (7.4~b9+repack-1) unstable; urgency=low
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index b7ea920..dc2c53e 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
-@@ -198,6 +198,7 @@
+@@ -199,6 +199,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]] ..]]
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index f03c50c..207ca87 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -20,7 +20,7 @@ Description: Link against system libraries.
$(ZDIR)/doc \
--- a/make.include
+++ b/make.include
-@@ -371,12 +371,10 @@
+@@ -384,12 +384,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
-@@ -199,31 +199,33 @@
+@@ -200,31 +200,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 1c475f7..5a05dbc 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -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
-@@ -166,7 +166,7 @@
+@@ -167,7 +167,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) {
-@@ -197,7 +197,7 @@
+@@ -198,7 +198,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
-@@ -213,6 +213,11 @@
+@@ -214,6 +214,11 @@
package require tkcon
package require xmlrpc
package require BLT
@@ -52,60 +52,123 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require Signal
--- a/make.include
+++ b/make.include
-@@ -75,7 +75,7 @@
+@@ -76,7 +76,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
-- --disable-shared --enable-symbols
-+ --enable-shared --enable-symbols
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
tcliis : $(TCLIISDIR)/Makefile
- @echo ""
-@@ -89,7 +89,7 @@
+@@ -91,7 +91,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
-- --disable-shared --enable-symbols
-+ --enable-shared --enable-symbols
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
tclsignal: $(TCLSIGNALDIR)/Makefile
- @echo ""
-@@ -118,7 +118,7 @@
+@@ -106,7 +106,7 @@
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
-- --disable-shared --enable-symbols
-+ --enable-shared --enable-symbols
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ # no parallel
+@@ -122,7 +122,7 @@
+ ./configure \
+ $(WITHTCL) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
tclzvfs : $(TCLZVFSDIR)/Makefile
- @echo ""
-@@ -168,7 +168,7 @@
+@@ -137,7 +137,7 @@
+ ./configure \
+ $(WITHTCL) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ tkblt : $(TKBLTDIR)/Makefile
+@@ -152,7 +152,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ tkcon :
+@@ -175,7 +175,7 @@
+ ./configure \
+ $(WITHTK) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ tkimg : libtiff $(TKIMGDIR)/Makefile
+@@ -191,7 +191,7 @@
+ ./configure CFLAGS='-DPNG_NO_WRITE_gAMA' \
+ $(WITHTK) $(TKIMGFLAGS) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
- --disable-shared --enable-symbols
+ --enable-shared --enable-symbols
- tkimg : libtiff $(TKIMGDIR)/Makefile
+ libtiff : $(TKIMGDIR)/compat/libtiff/Makefile
@echo ""
-@@ -211,7 +211,7 @@
+@@ -206,7 +206,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
-- --disable-shared --enable-symbols
-+ --enable-shared --enable-symbols
+- --disable-shared
++ --enable-shared
- tksao : $(TKSAODIR)/Makefile
+ tkmpeg : $(TKMPEGDIR)/Makefile
@echo ""
-@@ -225,7 +225,7 @@
+@@ -220,7 +220,7 @@
+ ./configure \
+ $(WITHTK) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ tksao : $(TKSAODIR)/Makefile
+@@ -235,7 +235,7 @@
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
- --disable-shared --enable-symbols \
+ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache \
ASTDIR=$(ASTDIR) FUNTOOLSDIR=$(FUNTOOLSDIR)
- # no parallel
+@@ -252,7 +252,7 @@
+ ./configure \
+ $(WITHTK) $(TKTABLEFLAGS) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --config-cache --cache-file=../config.cache
+
+ xmlrpc :
+@@ -275,7 +275,7 @@
+ ./configure \
+ $(WITHTCL) $(XPAFLAGS) \
+ --prefix $(ROOT) --exec-prefix $(ROOT) \
+- --disable-shared --enable-symbols \
++ --enable-shared --enable-symbols \
+ --with-x=disabled --enable-posix_spawn
+
+ #--------------------------language
--- a/tksao1.0/saotk.C
+++ b/tksao1.0/saotk.C
@@ -27,6 +27,7 @@
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index b7eba9c..d949951 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -38,19 +38,19 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid2dPtr = this;
--- a/tksao1.0/frame/fitsimage.C
+++ b/tksao1.0/frame/fitsimage.C
-@@ -1184,7 +1184,7 @@
- if (ast[0] && ast[ii]) {
- AstFrameSet* dep = (AstFrameSet*)astCopy(ast[ii]);
- astInvert(ast[0]);
-- astAddFrame(dep,2,astUnitMap(2,""),ast[0]);
-+ astAddFrame(dep,2,astUnitMap(2,"%s",""),ast[0]);
+@@ -1252,7 +1252,7 @@
+ if (ast_[0] && ast_[ii]) {
+ AstFrameSet* dep = (AstFrameSet*)astCopy(ast_[ii]);
+ astInvert(ast_[0]);
+- astAddFrame(dep,2,astUnitMap(2,""),ast_[0]);
++ astAddFrame(dep,2,astUnitMap(2,"%s",""),ast_[0]);
astSetI(dep,"current",4);
- astAnnul(ast[0]);
- ast[0] = dep;
-@@ -2963,24 +2963,24 @@
- if (ii>=0 && ast && ast[ii]) {
- if (astIsASkyFrame(astGetFrame(ast[ii], AST__CURRENT))) {
- setAstSkyFrame(ast[ii],sky);
+ astAnnul(ast_[0]);
+ ast_[0] = dep;
+@@ -3035,24 +3035,24 @@
+ if (ii>=0 && ast_ && ast_[ii]) {
+ if (astIsASkyFrame(astGetFrame(ast_[ii], AST__CURRENT))) {
+ setAstSkyFrame(ast_[ii],sky);
- for (int ii=0; ii<num; ii++) {
- xin[ii] *= M_PI/180.;
- yin[ii] *= M_PI/180.;
@@ -58,7 +58,7 @@ Description: Avoid compile time warnings in the saotk subsystem
+ xin[ii2] *= M_PI/180.;
+ yin[ii2] *= M_PI/180.;
}
- astTran2(ast[ii], num, xin, yin, 0, xout, yout);
+ astTran2(ast_[ii], num, xin, yin, 0, xout, yout);
if (astOK) {
- for (int ii=0; ii<num; ii++)
- if (checkAst(xout[ii],yout[ii]))
@@ -70,7 +70,7 @@ Description: Avoid compile time warnings in the saotk subsystem
}
}
else {
- astTran2(ast[ii], num, xin, yin, 0, xout, yout);
+ astTran2(ast_[ii], num, xin, yin, 0, xout, yout);
if (astOK) {
- for (int ii=0; ii<num; ii++)
- if (checkAst(xout[ii],yout[ii]))
@@ -81,7 +81,7 @@ Description: Avoid compile time warnings in the saotk subsystem
return out;
}
}
-@@ -3219,7 +3219,7 @@
+@@ -3293,7 +3293,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)
-@@ -3290,7 +3290,7 @@
+@@ -3362,7 +3362,7 @@
astClearStatus;
// new fitschan
@@ -99,7 +99,7 @@ Description: Avoid compile time warnings in the saotk subsystem
if (!astOK || chan == AST__NULL)
return NULL;
-@@ -3352,7 +3352,7 @@
+@@ -3420,7 +3420,7 @@
astClearStatus;
// new fitschan
--
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