[Debian-astro-commits] [saods9] 03/03: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Fri Jul 24 11:19:46 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 b3bf6c08d8fca4d5bd65ef4828f7b6c8ec949e6f
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Jul 24 13:09:30 2015 +0200
Adjust patches for new version
---
debian/changelog | 5 +--
debian/patches/ds9_make_linux.patch | 43 ++------------------------
debian/patches/ds9_use_system_libs.patch | 6 ++--
debian/patches/ds9_use_tcltk_packages.patch | 12 ++++----
debian/patches/saotk_use_system_libs.patch | 47 +++++++++++++++++++++++++++--
5 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f88aa82..6304eb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-saods9 (7.4~b5+repack-2) UNRELEASED; urgency=medium
+saods9 (7.4~b6+repack-1) experimental; urgency=low
+ * New upstream beta version
* Use Tcl/Tk stubs
* Convert to multiarch
- -- Ole Streicher <olebole at debian.org> Wed, 22 Jul 2015 08:51:36 +0200
+ -- Ole Streicher <olebole at debian.org> Fri, 24 Jul 2015 13:14:19 +0200
saods9 (7.4~b5+repack-1) experimental; urgency=low
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 46d900f..2554d8b 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -1,51 +1,14 @@
Author: Ole Streicher <debian at liska.ath.cx>
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,20 +4,20 @@
- X11INCLUDE=/usr/include/X11
- X11LIB = /usr/lib
-
--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 -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 = -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-
- OPTS = ${ZZ}
- NOPTS = ${YY} ${ZZ}
-
- CXX = g++
--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/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
-@@ -1,7 +1,5 @@
- #--------------------------defines
-
--CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
--
- MAINDIR = ../$(TKDIR)/unix
- MAIN = tkAppInit
-
-@@ -63,8 +61,6 @@
+@@ -61,9 +61,6 @@ all: ds9
ifneq (,$(findstring linux,$(ARCH)))
--CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
+-CFLAGS= -g -I../include -I/usr/include/X11
+-CXXFLAGS = $(CFLAGS)
-
ds9 : ds9Base ds9.zip
$(RM) $@
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 9bc28ce..4ec915c 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -34,13 +34,13 @@ Description: Link against system libraries.
-distclean : tclclean tkclean \
- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean tcliisclean tclcheckdnsclean tclsignalclean funtoolsclean \
+- xpaclean tcliisclean tclcheckdnsclean tclsignalclean \
- astclean \
- tksaoclean tclzvfsclean ds9clean \
- srcclean filesclean dirsclean
-+distclean : filesclean \
++distclean : \
+ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
-+ saotkclean ds9clean srcclean dirsclean
++ tksaoclean ds9clean srcclean filesclean dirsclean
#--------------------------distribution
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 135a459..52dec12 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -52,7 +52,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require Signal
--- a/Makefile
+++ b/Makefile
-@@ -130,7 +130,7 @@
+@@ -119,7 +119,7 @@
./configure \
$(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
@@ -61,7 +61,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--enable-symbols
$(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
-@@ -140,7 +140,7 @@
+@@ -129,7 +129,7 @@
./configure \
$(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
@@ -70,7 +70,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--enable-symbols
$(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
-@@ -150,7 +150,7 @@
+@@ -139,7 +139,7 @@
./configure \
$(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
@@ -79,7 +79,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--enable-symbols
$(MAKE) -C $(TCLSIGNALDIR) install
-@@ -198,7 +198,7 @@
+@@ -187,7 +187,7 @@
./configure \
$(WITHTCL) $(WITHTK) \
--prefix $(root) --exec-prefix $(root) \
@@ -88,7 +88,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--enable-symbols
$(MAKE) -C $(TKHTMLDIR) install
-@@ -225,7 +225,7 @@
+@@ -213,7 +213,7 @@
./configure \
$(WITHTCL) $(WITHTK) \
--prefix $(root) --exec-prefix $(root) \
@@ -97,7 +97,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--enable-symbols
$(MAKE) -C $(TKMPEGDIR) -j $(JOBS) install
-@@ -235,7 +235,7 @@
+@@ -223,7 +223,7 @@
./configure \
$(WITHTCL) $(WITHTK) \
--prefix $(root) --exec-prefix $(root) \
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 80620d3..c4aae40 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -1,5 +1,32 @@
Author: Ole Streicher <olebole at debian.org>
-Description: Compile against system library wcstools
+Description: Compile against system library wcstools and funtools
+--- a/tksao1.0/Makefile.in
++++ b/tksao1.0/Makefile.in
+@@ -192,7 +192,7 @@
+
+ binaries: $(BINARIES)
+
+-libraries: funtools
++libraries:
+
+ funtools :
+ make -C funtools-1.4.5 lib
+@@ -434,15 +434,11 @@
+ -test -z "$(BINARIES)" || rm -f $(BINARIES)
+ -rm -f $(PKG_OBJECTS) *.$(OBJEXT) core *.core
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+- cd funtools-1.4.5; \
+- make clean
+
+ distclean: clean
+ -rm -f *.tab.c
+ -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log config.status
+- cd funtools-1.4.5; \
+- make distclean
+
+ #========================================================================
+ # Install binary object libraries. On Windows this includes both .dll and
--- a/tksao1.0/configure.in
+++ b/tksao1.0/configure.in
@@ -266,25 +266,6 @@
@@ -28,7 +55,15 @@ Description: Compile against system library wcstools
widget/truecolor16.C
widget/truecolor24.C
widget/truecolor8.C
-@@ -377,7 +358,7 @@
+@@ -292,7 +273,6 @@
+ ])
+ 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../include -Ifuntools-1.4.5/filter -Ifuntools-1.4.5/fitsy -Ifuntools-1.4.5/util -I/usr/include/libxml2])
+-TEA_ADD_LIBS([funtools-1.4.5/libfuntools.a])
+ TEA_ADD_CFLAGS([])
+ TEA_ADD_STUB_SOURCES([])
+ TEA_ADD_TCL_SOURCES([])
+@@ -377,7 +357,7 @@
AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
@@ -37,6 +72,14 @@ Description: Compile against system library wcstools
#--------------------------------------------------------------------
# This macro generates a line to use when building a library. It
+@@ -405,7 +385,6 @@
+ CC=`echo $CC | sed -e 's/ .*$//'`
+
+ TEA_CONFIG_COLLECT
+-TEA_CONFIG_SUBDIR(funtools-1.4.5, [--with-wcslib=../lib/libwcs.a --with-zlib=../lib/libz.a])
+
+
+ #--------------------------------------------------------------------
--- a/tksao1.0/frame/fitsimage.h
+++ b/tksao1.0/frame/fitsimage.h
@@ -10,7 +10,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-astro-commits
mailing list