[saods9] 02/02: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Thu Jun 11 08:43:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to tag debian/7.4b1+repack-1
in repository saods9.
commit f0ab04683cd5efacd83c4c0ee53d582185bacaf5
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Jun 11 10:21:01 2015 +0200
Adjust patches for new version
---
debian/changelog | 6 ++++
debian/patches/ds9_make_linux.patch | 53 +++++++++---------------------
debian/patches/ds9_use_external_libs.patch | 16 ++++-----
debian/patches/iis.patch | 9 -----
4 files changed, 29 insertions(+), 55 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0cb587d..eff0cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b2+repack-1) experimental; urgency=low
+
+ * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org> Thu, 11 Jun 2015 10:10:28 +0200
+
saods9 (7.4~b1+repack-1) unstable; urgency=low
* New upstream beta version
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index b76a929..e1bc17d 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -26,54 +26,31 @@ Description: Set the compile flags according to the Debian environment. We
CXXOPT = ${OPTS} ${AA}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -34,13 +34,17 @@
-
- tkblt : FORCE
- @echo "Installing Tkblt..."
-- cd $(TKBLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' \
-+ cd $(TKBLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' \
-+ CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' \
-+ LDFLAGS='$(LDFLAGS) $(LIBS)' \
- ./configure $(XFLAGS) \
- --prefix $(root) \
- --exec-prefix $(root) \
-- --disable-shared \
-+ --enable-shared \
- --enable-symbols
-- $(MAKE) -C $(TKBLTDIR) -j $(JOBS) install
-+ $(MAKE) -C $(TKBLTDIR) -j $(JOBS)
-+ cp $(TKBLTDIR)/*.so* lib/
-+ cp $(TKBLTDIR)/*.h include/
-
- tktable : FORCE
- @echo "Installing Tktable..."
-@@ -65,9 +69,9 @@
- tkimg : libtiff
- @echo "Installing Tkimg..."
- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' \
-+ CPPFLAGS='$(CPPFLAGS)' \
-+ LDFLAGS='$(LDFLAGS)' \
- ./configure $(XFLAGS) \
-- --with-tcl=$(root)/$(TCLDIRDIR) \
-- --with-tk=$(root)/$(TKDIRDIR) \
- --prefix $(root) \
- --disable-shared
- $(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
-@@ -84,9 +88,9 @@
+@@ -79,10 +79,10 @@
tkhtml : $(HTMLDIR)
- @echo "Installing Tkhtml..."
+ @echo "Installing $@..."
cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
+ CPPFLAGS='$(CPPFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
- $(root)/htmlwidget/configure $(XFLAGS) \
+ $(root)/htmlwidget/configure \
+ --x-includes=$(X11INCLUDE) --x-libraries=$(X11LIB) \
- --with-tcl=$(root)/$(TCLDIR) \
- --with-tk=$(root)/$(TKDIR) \
- --prefix $(root) \
+ --prefix $(root) --exec-prefix $(root) \
--enable-shared=no
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
+@@ -91,6 +91,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/Makefile
+++ b/Makefile
-@@ -178,7 +178,7 @@
+@@ -165,7 +165,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 977f5f0..bd7dff7 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -231,9 +231,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -110,14 +110,10 @@
+@@ -116,14 +116,10 @@
--enable-symbols
- $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
+ $(MAKE) -C $(XPADIR) -j $(JOBS) install
-distclean : tclclean tkclean \
- tktableclean tkbltclean \
@@ -252,7 +252,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/Makefile
+++ b/Makefile
-@@ -217,32 +217,6 @@
+@@ -204,32 +204,6 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -285,7 +285,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -250,27 +224,12 @@
+@@ -237,27 +211,12 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
@@ -313,7 +313,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
$(MAKE) -C $(RICEDIR) distclean
-@@ -283,9 +242,6 @@
+@@ -270,9 +229,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -427,8 +427,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-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++'
- #--------------------------------------------------------------------
--- a/tcliis1.0/configure.in
+++ b/tcliis1.0/configure.in
@@ -160,7 +160,7 @@
@@ -438,8 +438,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-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++'
- #--------------------------------------------------------------------
--- a/tkmpeg1.0/configure.in
+++ b/tkmpeg1.0/configure.in
@@ -158,8 +158,8 @@
@@ -450,6 +450,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
#--------------------------------------------------------------------
- # This macro generates a line to use when building a library. It
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index 1d247d1..8e8ae00 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -12,15 +12,6 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->xim = (XtPointer) xim;
chan->type = IO_FIFO;
chan->datain = datain;
-@@ -360,7 +360,7 @@
- fcntl(s, F_SETFD, FD_CLOEXEC);
-
- /* Allocate and fill in i/o channel descriptor. */
-- if (chan = get_iochan(xim)) {
-+ if ((chan = get_iochan(xim))) {
- chan->xim = (XtPointer) xim;
- chan->type = IO_UNIX;
- chan->datain = s;
--- a/tcliis1.0/xim.C
+++ b/tcliis1.0/xim.C
@@ -19,7 +19,7 @@
--
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