[saods9] 02/02: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Sat Jul 4 12:30:47 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 1c43c318225acdd6de825bab6f312f90cfa8346a
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 4 14:11:57 2015 +0200
Adjust patches for new version
---
debian/changelog | 6 ++
debian/copyright | 2 +-
debian/patches/ds9_make_linux.patch | 63 +++++++++++++--------
debian/patches/ds9_use_external_libs.patch | 90 +++++++++++++++++-------------
debian/patches/ds9_use_filesystem.patch | 2 +-
debian/patches/saotk_add_psscale.patch | 2 +-
6 files changed, 102 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4ecac0c..f46472d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b4+repack-1) experimental; urgency=low
+
+ * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org> Sat, 04 Jul 2015 14:11:18 +0200
+
saods9 (7.4~b3+repack-1) experimental; urgency=low
* New upstream beta version
diff --git a/debian/copyright b/debian/copyright
index 5294de8..48672f3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: SAOImage DS9
Upstream-Author: William Joye <wjoye at cfa.harvard.edu>
Source: http://ds9.si.edu/site/Download.html
Files-Excluded: funtools* tcl8.* tcllib-* tk8.* tkimg* signal_ext*
- tktable* tkcon-* tclxml-* saotk/wcssubs* xpa-* tkblt* win zlib-*
+ tktable* tkcon-* tclxml-* saotk/wcssubs* xpa-* tkblt* tkwin-* zlib-*
compilers ast-* zvfs tkmacosx*
Files: *
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index c9c02c4..cec4b99 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -3,33 +3,42 @@ 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
-@@ -4,16 +4,15 @@
+@@ -4,20 +4,20 @@
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
+-YY = -gstabs+ -fno-inline
++YY =
# we need this to find M_PI, NAN, and isfinite() in math.h Centos5.x
-ZZ = -m32 -D_GNU_SOURCE
-+ZZ = -D_GNU_SOURCE
++ZZ = -D_GNU_SOURCE -I/usr/include/tcl -I/usr/include/tk -I/usr/include/freetype2
-AA = -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+AA =
++AA = -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- OPTS = ${XX} ${ZZ}
--#OPTS = ${YY} ${ZZ}
--NOPTS = ${YY} ${ZZ}
-+NOPTS = ${XX} ${ZZ}
+ OPTS = ${ZZ}
+ NOPTS = ${YY} ${ZZ}
CXX = g++
- CXXOPT = ${OPTS} ${AA}
+-CXXOPT = ${OPTS} ${AA}
+-CXXNOPT = ${NOPTS} ${AA}
++CXXOPT = ${CXXFLAGS} ${CPPFLAGS} ${OPTS} ${AA}
++CXXNOPT = ${CXXFLAGS} ${CPPFLAGS} ${NOPTS} ${AA}
+
+ CC = gcc
+-CCOPT = ${OPTS} ${AA}
+-CCNOPT = ${NOPTS} ${AA}
++CCOPT = ${CFLAGS} ${CPPFLAGS} ${OPTS} ${AA}
++CCNOPT = ${CFLAGS} ${CPPFLAGS} ${NOPTS} ${AA}
+
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -87,10 +87,10 @@
+@@ -40,11 +40,11 @@
+
tkhtml : $(HTMLDIR)
@echo "Installing $@..."
- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
+- cd $(HTMLDIR); CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
++ cd $(HTMLDIR); CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' \
+ CPPFLAGS='$(CPPFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
$(root)/htmlwidget/configure \
@@ -39,15 +48,6 @@ Description: Set the compile flags according to the Debian environment. We
--prefix $(root) --exec-prefix $(root) \
--enable-shared=no
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
-@@ -99,6 +99,8 @@
- tkimg : libtiff
- @echo "Installing $@..."
- cd $(TKIMGDIR); CFLAGS='-DPNG_NO_WRITE_gAMA' \
-+ CPPFLAGS='$(CPPFLAGS)' \
-+ LDFLAGS='$(LDFLAGS)' \
- ./configure \
- --prefix $(root) --exec-prefix $(root) \
- --disable-shared \
--- a/ds9/Makefile
+++ b/ds9/Makefile
@@ -9,7 +9,7 @@
@@ -79,3 +79,22 @@ Description: Set the compile flags according to the Debian environment. We
append cc " @TARGET_X_INC@"
append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
puts "$n: $src $dep"
+--- a/ds9/Makefile.unix
++++ b/ds9/Makefile.unix
+@@ -1,6 +1,6 @@
+ #--------------------------defines
+
+-CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
++CFLAGS:= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
+
+ MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
+ MAIN = tkAppInit
+@@ -30,7 +30,7 @@
+
+ ifneq (,$(findstring linux,$(ARCH)))
+
+-CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
++CXXFLAGS := $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
+
+ ds9 : ds9Base ds9.zip
+ $(RM) $@
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index c13bc93..5f2b1aa 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -227,17 +227,17 @@ Description: Compile against external libraries of wcstools, funtools, ast,
}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -124,13 +124,9 @@
- --enable-symbols
- $(MAKE) -C $(XPADIR) -j $(JOBS) install
+@@ -50,13 +50,9 @@
+ $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
+ cp $(HTMLDIR)/libtkhtml.a lib/.
-distclean : tclclean tkclean \
- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
- astclean \
-- saotkclean zvfsclean ds9clean srcclean \
-- filesclean dirsclean
+- saotkclean zvfsclean ds9clean \
+- srcclean filesclean dirsclean
+distclean : filesclean \
+ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
+ saotkclean ds9clean srcclean dirsclean
@@ -246,9 +246,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/Makefile
+++ b/Makefile
-@@ -181,32 +181,6 @@
- dirsclean: FORCE
- @for d in $(DIRS); do rm -rf $$d; done
+@@ -282,68 +282,21 @@
+ find . -name "*stackdump*" -exec rm {} \;
+ endif
-tclclean : FORCE
- $(MAKE) -C $(TCLDIRDIR) distclean
@@ -256,18 +256,36 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-tkclean : FORCE
- $(MAKE) -C $(TKDIRDIR) distclean
-
--tktableclean: FORCE
-- $(MAKE) -C $(TKTABLEDIR) distclean
+-astclean: FORCE
+- $(MAKE) -C $(ASTDIR) distclean
-
--tkbltclean: FORCE
-- $(MAKE) -C $(TKBLTDIR) distclean
+-funtoolsclean: FORCE
+- $(MAKE) -C $(FUNTOOLSDIR) distclean
-
--zlibclean: FORCE
-- $(MAKE) -C $(ZLIBDIR) distclean
+ saotkclean : FORCE
+ $(MAKE) -C $(SAOTKDIR) distclean
+
+-signalclean : FORCE
+- $(MAKE) -C $(SIGNALDIR) distclean
-
+ tclcheckdnsclean : FORCE
+ $(MAKE) -C $(TCLCHECKDNSDIR) distclean
+
+ tcliisclean : FORCE
+ $(MAKE) -C $(TCLIISDIR) distclean
+
-tclxmlclean: FORCE
- $(MAKE) -C $(TCLXMLDIR) distclean
-
+-tktableclean: FORCE
+- $(MAKE) -C $(TKTABLEDIR) distclean
+-
+-tkbltclean: FORCE
+- $(MAKE) -C $(TKBLTDIR) distclean
+-
+ tkhtmlclean: FORCE
+ rm -rf $(HTMLDIR)
+
-tkimgclean: libtiffclean
- rm -fr $(TKIMGDIR)/Img/*
- rm -fr lib/Img1.*
@@ -276,39 +294,26 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-libtiffclean: FORCE
- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
-
+-tkmacosxclean : FORCE
+- $(MAKE) -C $(TKMACOSXDIR) distclean
+-
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -214,30 +188,15 @@
- # cd $(HTMLDIR); $(MAKE) distclean
- rm -rf $(HTMLDIR)
-
+-tkwinclean : FORCE
+- $(MAKE) -C $(TKWINDIR) distclean
+-
-xpaclean : FORCE
- $(MAKE) -C $(XPADIR) distclean
-
- tcliisclean : FORCE
- $(MAKE) -C $(TCLIISDIR) distclean
-
- tclcheckdnsclean : FORCE
- $(MAKE) -C $(TCLCHECKDNSDIR) distclean
-
--signalclean : FORCE
-- $(MAKE) -C $(SIGNALDIR) distclean
--
--funtoolsclean: FORCE
-- $(MAKE) -C $(FUNTOOLSDIR) distclean
--
--astclean: FORCE
-- $(MAKE) -C $(ASTDIR) distclean
+-zlibclean: FORCE
+- $(MAKE) -C $(ZLIBDIR) distclean
-
- saotkclean : FORCE
- $(MAKE) -C $(SAOTKDIR) distclean
-
-zvfsclean: FORCE
- $(MAKE) -C $(ZVFSDIR) distclean
-
- ds9clean : FORCE
- $(MAKE) -C $(DS9DIR) distclean
+ srcclean : FORCE
+ $(MAKE) -C $(SRCDIR) distclean
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
@@ -418,7 +423,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/tcliis1.0/configure.in
+++ b/tcliis1.0/configure.in
-@@ -160,7 +160,7 @@
+@@ -162,7 +162,7 @@
# link against the non-stubbed Tcl library. Add Tk too if necessary.
#--------------------------------------------------------------------
@@ -515,3 +520,12 @@ Description: Compile against external libraries of wcstools, funtools, ast,
widget/truecolor16.C
widget/truecolor24.C
widget/truecolor8.C
+@@ -375,7 +356,7 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
+
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 234f692..f4abeb7 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -10,7 +10,7 @@ Description: Store all files in the usual FHS directories
+++ b/ds9/Makefile.unix
@@ -32,13 +32,8 @@
- CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
+ CXXFLAGS := $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
-ds9 : ds9Base ds9.zip
- $(RM) $@
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index bcfe8e2..d685c86 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,
-@@ -580,7 +582,7 @@
+@@ -585,7 +587,7 @@
XColor* cc= NULL;
// starting with tk8.6, colors are W3C based, not X11
if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))
--
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