[saods9] 03/03: Update patches and changelog to new release
Ole Streicher
olebole-guest at alioth.debian.org
Sun Nov 3 19:47:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository saods9.
commit e950ea72862722bcdc8677aeae489529da95f601
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Nov 3 20:43:23 2013 +0100
Update patches and changelog to new release
---
debian/changelog | 6 +++
debian/patches/ds9_make_linux.patch | 16 ++-----
debian/patches/ds9_use_external_libs.patch | 18 ++++----
debian/patches/ds9_use_filesystem.patch | 4 +-
debian/patches/saotk_add_psscale.patch | 2 +-
debian/patches/saotk_avoid_compile_warnings.patch | 51 ---------------------
6 files changed, 23 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8c8078c..1d91115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3~b5+dfsg-1~exp1) experimental; urgency=low
+
+ * New (beta) upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Sun, 03 Nov 2013 20:38:15 +0100
+
saods9 (7.3~b4+dfsg-1~exp1) experimental; urgency=low
* New (beta) upstream version
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 90e2306..d7804e3 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -3,18 +3,14 @@ Description: Set the compile flags according to the Debian environment. We
also need to propagate the standard CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS here.
--- a/make.linux
+++ b/make.linux
-@@ -1,27 +1,24 @@
- OS = unix
- ARCH = linux
-
--X11INCLUDE=/usr/X11R6/include
-+X11INCLUDE=X11INCLUDE=/usr/include/X11
- X11LIB = /usr/X11R6/lib
+@@ -4,22 +4,21 @@
+ X11INCLUDE=/usr/include/X11
+ X11LIB = /usr/lib
-XX =
+XX := $(CFLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk -I/usr/include/freetype2
YY = -gstabs+ -fno-inline
- # we need this to find M_PI and isfinite() in math.h
+ # we need this to find M_PI, NAN, and isfinite() in math.h Centos5.x
-ZZ = -m32 -D_GNU_SOURCE
+ZZ = -D_GNU_SOURCE
@@ -26,13 +22,11 @@ Description: Set the compile flags according to the Debian environment. We
-NOPTS = ${YY} ${ZZ}
+NOPTS = ${XX} ${ZZ}
--#CXX = g++
-CXX = g++44
+CXX = g++
CXXOPT = ${OPTS} ${AA}
CXXNOPT = ${NOPTS} ${AA}
--#CC = gcc
-CC = gcc44
+CC = gcc
CCOPT = ${OPTS} ${AA}
@@ -86,7 +80,7 @@ Description: Set the compile flags according to the Debian environment. We
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
--- a/Makefile
+++ b/Makefile
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
saotk : FORCE
@echo "Installing SAOTK..."
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index c768ec4..f970963 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -119,7 +119,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
int Signal_ext_Init(Tcl_Interp*);
}
-@@ -121,7 +105,6 @@
+@@ -123,7 +107,6 @@
// Tk
if (Tk_Init(interp) == TCL_ERROR)
return TCL_ERROR;
@@ -127,7 +127,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// tlt
if (Tlt_Init(interp) == TCL_ERROR)
-@@ -129,12 +112,6 @@
+@@ -131,12 +114,6 @@
Tcl_StaticPackage(interp, "tlt", Tlt_Init,
(Tcl_PackageInitProc*)NULL);
@@ -140,7 +140,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -153,12 +130,6 @@
+@@ -155,12 +132,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
(Tcl_PackageInitProc*)NULL);
@@ -153,7 +153,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// IIS
if (Iis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -171,75 +142,5 @@
+@@ -173,75 +144,5 @@
Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
@@ -253,7 +253,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
$(MAKE) -C unix distclean
--- a/Makefile
+++ b/Makefile
-@@ -225,31 +225,8 @@
+@@ -226,31 +226,8 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -286,7 +286,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -258,27 +235,12 @@
+@@ -259,27 +236,12 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
@@ -314,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
$(MAKE) -C $(RICEDIR) distclean
-@@ -291,9 +253,6 @@
+@@ -292,9 +254,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -331,10 +331,10 @@ Description: Compile against external libraries of wcstools, funtools, ast,
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
- if {![namespace exists msgcat]} {
-- source $ds9(root)/tcl8/8.5/msgcat-1.5.0.tm
+- source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
- }
- if {![namespace exists http]} {
-- source $ds9(root)/tcl8/8.6/http-2.8.5.tm
+- source $ds9(root)/tcl8/8.6/http-2.8.7.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 1ba7c73..79085e6 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -62,9 +62,9 @@ Description: Store all files in the usual FHS directories instead of
- Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/src/ds9.tcl",-1);
+ Tcl_Obj *path = Tcl_NewStringObj("/usr/share/saods9/src/ds9.tcl",-1);
Tcl_SetStartupScript(path, NULL);
- }
-@@ -67,37 +59,6 @@
+ return TCL_OK;
+@@ -69,37 +61,6 @@
// save interp for cputs function
global_interp = interp;
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 439594b..dfbe637 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.0/generic/tkCanvas.h"
+-#include "../../tk8.6.1/generic/tkCanvas.h"
+#include <tk-private/generic/tkCanvas.h>
typedef struct TkPostscriptInfo {
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 658cd07..b8171b5 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -1,56 +1,5 @@
Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compile time warnings in the saotk subsystem
---- a/saotk/fitsy++/outchannel.C
-+++ b/saotk/fitsy++/outchannel.C
-@@ -9,7 +9,7 @@
- OutFitsChannel::OutFitsChannel(Tcl_Interp* interp, const char* ch)
- {
- int tclMode;
-- if (ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode))
-+ if ((ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode)))
- valid_ = 1;
- }
-
---- a/saotk/fitsy++/outfile.C
-+++ b/saotk/fitsy++/outfile.C
-@@ -7,7 +7,7 @@
-
- OutFitsFile::OutFitsFile(const char* fn)
- {
-- if (fd_ = fopen(fn, "wb"))
-+ if ((fd_ = fopen(fn, "wb")))
- valid_ = 1;
- }
-
-@@ -35,7 +35,7 @@
-
- OutFitsFileGZ::OutFitsFileGZ(const char* fn)
- {
-- if (fd_ = gzopen(fn, "wb"))
-+ if ((fd_ = gzopen(fn, "wb")))
- valid_ = 1;
- }
-
---- a/saotk/fitsy++/strm.C
-+++ b/saotk/fitsy++/strm.C
-@@ -399,7 +399,7 @@
- if (!(this->pExt_ || (this->pIndex_>0))) {
-
- // we are only looking for a primary image
-- if (this->head_ = this->headRead()) {
-+ if ((this->head_ = this->headRead())) {
- this->found();
- return;
- }
-@@ -455,7 +455,7 @@
- this->head_ = NULL;
- }
-
-- if (this->head_ = this->headRead()) {
-+ if ((this->head_ = this->headRead())) {
- this->ext_++;
- this->found();
- return;
--- a/saotk/colorbar/cbgrid.C
+++ b/saotk/colorbar/cbgrid.C
@@ -122,19 +122,19 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git
More information about the debian-science-commits
mailing list