[Debian-astro-commits] [saods9] 02/02: Adjust patches for RC version
Ole Streicher
olebole at moszumanska.debian.org
Thu Sep 15 21:36:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit df71be6b38df1e3ec3e811b692518434f424ce8d
Author: Ole Streicher <olebole at debian.org>
Date: Thu Sep 15 23:35:42 2016 +0200
Adjust patches for RC version
---
debian/changelog | 6 ++++++
debian/patches/ds9_use_system_libs.patch | 6 ++++--
debian/patches/ds9_use_tcltk_packages.patch | 2 +-
debian/patches/saotk_add_psscale.patch | 13 +------------
debian/patches/saotk_avoid_compile_warnings.patch | 22 +++++++++++-----------
debian/patches/saotk_use_system_libs.patch | 6 +++---
6 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e3897c4..cacc7fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.5~rc+repack-1) UNRELEASED; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <olebole at debian.org> Thu, 15 Sep 2016 23:29:09 +0200
+
saods9 (7.5~b4+repack-1) experimental; urgency=low
* Imported Upstream version 7.5~b4+repack
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 6bc1488..3441de0 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -76,7 +76,7 @@ Description: Link against system libraries.
dirsdistclean:
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -183,30 +183,32 @@
+@@ -183,31 +183,33 @@
# so we can still find our files
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
@@ -84,7 +84,8 @@ Description: Link against system libraries.
- source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
- }
- if {![namespace exists http]} {
-- source $ds9(root)/tcl8/8.6/http-2.8.8.tm
+- source $ds9(root)/tcl8/8.6/http-2.8.9.tm
+- source $ds9(root)/library/htp.tcl
- }
-
- source $ds9(root)/tk8.6/tearoff.tcl
@@ -106,6 +107,7 @@ Description: Link against system libraries.
- source $ds9(root)/tkblt/graph.tcl
+ package require msgcat
+ package require http
++ source $ds9(root)/library/htp.tcl
+ package require xml
+
+ package require base64
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index daf8e78..d4a7d45 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -38,7 +38,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require msgcat
package require http
-@@ -196,6 +196,11 @@
+@@ -197,6 +197,11 @@
package require tkcon
package require tkblt
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 6f6b456..334c408 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -14,7 +14,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
// Tk Canvas Widget Functions Declaration
int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item,
-@@ -587,7 +589,7 @@
+@@ -592,7 +594,7 @@
XColor* cc= NULL;
// starting with tk8.6, colors are W3C based, not X11
if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))
@@ -23,14 +23,3 @@ Description: The original code from ds9 uses a patched postscript code to allow
else
cc = Tk_GetColor(interp, tkwin, str);
---- a/tksao/util/tkpostscript.h
-+++ b/tksao/util/tkpostscript.h
-@@ -13,7 +13,7 @@
- #endif
-
- // copied from tkCanvPs.c
--#include "../../tk8.6/generic/tkCanvas.h"
-+#include <tk-private/generic/tkCanvas.h>
-
- typedef struct TkPostscriptInfo {
- int x, y, width, height; /* Area to print, in canvas pixel
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 582f955..f6e1cc3 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -2,7 +2,7 @@ Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compile time warnings in the saotk subsystem
--- a/tksao/colorbar/cbgrid.C
+++ b/tksao/colorbar/cbgrid.C
-@@ -122,19 +122,19 @@
+@@ -120,19 +120,19 @@
if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"")))
goto error;
@@ -27,7 +27,7 @@ Description: Avoid compile time warnings in the saotk subsystem
goto error;
}
-@@ -196,7 +196,7 @@
+@@ -194,7 +194,7 @@
pbox[3] = 0;
}
@@ -76,7 +76,7 @@ Description: Avoid compile time warnings in the saotk subsystem
--- a/tksao/frame/grid25d.C
+++ b/tksao/frame/grid25d.C
-@@ -114,7 +114,7 @@
+@@ -113,7 +113,7 @@
// and now create astGrid
astGrid25dPtr = this;
@@ -85,7 +85,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid(plot);
astEnd; // now, clean up memory
-@@ -128,14 +128,14 @@
+@@ -127,14 +127,14 @@
mx.matrix(0,1),mx.matrix(1,1)};
double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
@@ -107,7 +107,7 @@ Description: Avoid compile time warnings in the saotk subsystem
return frameSet;
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
AstFrameSet* frameSet = NULL;
AstPlot* plot = NULL;
@@ -116,7 +116,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astEnd;
return 0;
}
-@@ -78,7 +78,7 @@
+@@ -77,7 +77,7 @@
// this will link frame 2 of frameset to frame 3 wcs with unitMap
// set the current of frameset to last
astInvert(wcsfs);
@@ -125,7 +125,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astSetI(frameSet,"current",astGetI(frameSet,"nframe"));
}
}
-@@ -124,7 +124,7 @@
+@@ -123,7 +123,7 @@
// and now create astGrid
astGrid2dPtr = this;
@@ -134,7 +134,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid(plot);
astEnd; // now, clean up memory
-@@ -141,18 +141,18 @@
+@@ -140,18 +140,18 @@
double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
AstMatrixMap* mm;
@@ -159,7 +159,7 @@ Description: Avoid compile time warnings in the saotk subsystem
}
--- a/tksao/frame/grid3d.C
+++ b/tksao/frame/grid3d.C
-@@ -121,16 +121,16 @@
+@@ -120,16 +120,16 @@
astSetI(wcs, "Base", idata);
// Create two 1D Frames and a 1D Mapping describing the third axis
@@ -180,7 +180,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.
-@@ -139,14 +139,14 @@
+@@ -138,14 +138,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
@@ -199,7 +199,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astAddFrame(frameSet, AST__CURRENT, cmpwcsmap, cmpwcscurr);
}
}
-@@ -189,26 +189,26 @@
+@@ -188,26 +188,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_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index a266998..1d89085 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <olebole at debian.org>
Description: Compile against system library wcstools and funtools
--- a/tksao/configure.in
+++ b/tksao/configure.in
-@@ -258,25 +258,6 @@
+@@ -260,25 +260,6 @@
util/util.C
vector/vector.C
vector/vector3d.C
@@ -28,7 +28,7 @@ Description: Compile against system library wcstools and funtools
widget/truecolor16.C
widget/truecolor24.C
widget/truecolor8.C
-@@ -285,7 +266,7 @@
+@@ -287,7 +268,7 @@
TEA_ADD_HEADERS([])
TEA_ADD_INCLUDES([-I. -I./colorbar -I./fitsy++ -I./frame -I./list -I./magnifier -I./panner -I./util -I./vector -I./wcssubs -I./widget -I${prefix}/include])
@@ -37,7 +37,7 @@ Description: Compile against system library wcstools and funtools
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([])
TEA_ADD_TCL_SOURCES([])
-@@ -379,6 +360,7 @@
+@@ -381,6 +362,7 @@
#--------------------------------------------------------------------
AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
--
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