[Debian-astro-commits] [funtools] 01/05: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Tue Oct 25 20:09:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository funtools.
commit 952cc9b1afbbd81a7eb7eb5ce4886a988703f5c3
Author: Ole Streicher <olebole at debian.org>
Date: Tue Oct 25 21:54:41 2016 +0200
Rediff patches
Added Build-the-Tcl-extension-as-a-shared-library.patch: <REASON>
Added Use-the-shared-libwcstools-package-instead-of-the-convien.patch: <REASON>
Added Link-the-executables-against-libfuntools.so.patch: <REASON>
Added Copy-files-to-the-correct-destinations-according-to-multi.patch: <REASON>
Added Sort-object-files.patch: <REASON>
Dropped link_to_so.patch: <REASON>
Dropped multiarch.patch: <REASON>
Dropped sort-object-files.patch: <REASON>
Dropped build_tclfun.patch: <REASON>
Dropped use_shared_libwcstools.patch: <REASON>
---
...ld-the-Tcl-extension-as-a-shared-library.patch} | 92 +++++++++++++---------
...-correct-destinations-according-to-multi.patch} | 18 +++--
...k-the-executables-against-libfuntools.so.patch} | 52 +++++++-----
...-object-files.patch => Sort-object-files.patch} | 19 +++--
...bwcstools-package-instead-of-the-convien.patch} | 81 +++++++++++++------
debian/patches/series | 10 +--
6 files changed, 175 insertions(+), 97 deletions(-)
diff --git a/debian/patches/build_tclfun.patch b/debian/patches/Build-the-Tcl-extension-as-a-shared-library.patch
similarity index 75%
rename from debian/patches/build_tclfun.patch
rename to debian/patches/Build-the-Tcl-extension-as-a-shared-library.patch
index 1d23664..78cc202 100644
--- a/debian/patches/build_tclfun.patch
+++ b/debian/patches/Build-the-Tcl-extension-as-a-shared-library.patch
@@ -1,8 +1,20 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Build the Tcl extension as a shared library.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 25 Oct 2016 21:52:53 +0200
+Subject: Build the Tcl extension as a shared library.
+
+---
+ Makefile.in | 22 +++++++++++++++++-----
+ configure.ac | 3 +++
+ funtclmainlib.c | 6 ++++++
+ mkfunmainlib | 6 ++++++
+ util/tclmainlib.c | 8 +++++++-
+ 5 files changed, 39 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ba32411..03eabd1 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
# Directory in which to install the .a or .so binary for the FUNTOOLS library:
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
@@ -10,7 +22,7 @@ Description: Build the Tcl extension as a shared library.
# Directory in which to install the program wish:
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -67,8 +68,12 @@
+@@ -67,8 +68,12 @@ WCS_LIBS = -lwcstools
FILTER_INC = -I./filter
# FILTER_LIBS = -L./filter -lfilter
@@ -24,7 +36,7 @@ Description: Build the Tcl extension as a shared library.
# extra libs
EXTRA_LIBS = @EXTRA_LIBS@
-@@ -137,7 +142,7 @@
+@@ -137,7 +142,7 @@ EXE = @EXEEXT@
CC = @CC@
@@ -33,7 +45,7 @@ Description: Build the Tcl extension as a shared library.
DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
-@@ -249,9 +254,9 @@
+@@ -249,9 +254,9 @@ tclfun: $(LIB) tclmainlib.o tclfun.o
shtclfun: tclfun
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
@@ -45,7 +57,7 @@ Description: Build the Tcl extension as a shared library.
rm -rf $(PACKAGE)tmp; \
test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
SHLIB=libtclfun.so; \
-@@ -393,6 +398,8 @@
+@@ -393,6 +398,8 @@ install:: install-man
install:: install-share
@@ -54,7 +66,7 @@ Description: Build the Tcl extension as a shared library.
install:: install-data
FORCE:
-@@ -405,7 +412,7 @@
+@@ -405,7 +412,7 @@ FORCE:
_install:
shlib_install:
@@ -63,7 +75,7 @@ Description: Build the Tcl extension as a shared library.
do \
if [ -h $$i ] ; then \
echo "Installing link $$i" ; \
-@@ -417,6 +424,11 @@
+@@ -417,6 +424,11 @@ shlib_install:
fi; \
done;)
@@ -75,9 +87,11 @@ Description: Build the Tcl extension as a shared library.
install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
+diff --git a/configure.ac b/configure.ac
+index de90b88..8a286ae 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -194,6 +194,9 @@
+@@ -192,6 +192,9 @@ AC_MSG_RESULT($fun_ok)
SC_PATH_TCLCONFIG
if test x"${no_tcl}" = x ; then
AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
@@ -87,33 +101,11 @@ Description: Build the Tcl extension as a shared library.
fi
AC_PROG_AWK
---- a/util/tclmainlib.c
-+++ b/util/tclmainlib.c
-@@ -280,7 +280,7 @@
- else{
- Tcl_Channel chan;
- /* create a tcl channel corresponding to the pipe */
-- if( !(chan = Tcl_MakeFileChannel((ClientData)got, TCL_READABLE)) ){
-+ if( !(chan = Tcl_MakeFileChannel((ClientData)(intptr_t)got, TCL_READABLE)) ){
- Tcl_SetResult(interp, "can't create Tcl chan for pipe", TCL_STATIC);
- return TCL_ERROR;
- }
-@@ -485,6 +485,12 @@
- {
- Tcl_Interp *interp = (Tcl_Interp *)vinterp;
-
-+#ifdef USE_TCL_STUBS
-+ if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
-+ return TCL_ERROR;
-+ }
-+#endif
-+
- /* add mainlib commands to this interpreter */
- Tcl_CreateObjCommand(interp, TCL_MAINLIB_NAME,
- MainLibProcess_Tcl,
+diff --git a/funtclmainlib.c b/funtclmainlib.c
+index e2f9569..bc84609 100644
--- a/funtclmainlib.c
+++ b/funtclmainlib.c
-@@ -16,6 +16,12 @@
+@@ -16,6 +16,12 @@ int Funtools_Init (void *vinterp)
{
Tcl_Interp *interp = (Tcl_Interp *)vinterp;
@@ -126,9 +118,11 @@ Description: Build the Tcl extension as a shared library.
Tcl_CreateObjCommand(interp, "funcen", MainLib_Tcl,
(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateObjCommand(interp, "funcnts", MainLib_Tcl,
+diff --git a/mkfunmainlib b/mkfunmainlib
+index 3cbc6bd..c96b13c 100755
--- a/mkfunmainlib
+++ b/mkfunmainlib
-@@ -49,6 +49,12 @@
+@@ -49,6 +49,12 @@ END{
printf("{\n")
printf(" Tcl_Interp *interp = (Tcl_Interp *)vinterp;\n")
printf("\n")
@@ -141,3 +135,29 @@ Description: Build the Tcl extension as a shared library.
for(i=0; i<j; i++){
printf(" Tcl_CreateObjCommand(interp, \"%s\", MainLibProcess_Tcl,\n", name[i])
printf(" (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);\n")
+diff --git a/util/tclmainlib.c b/util/tclmainlib.c
+index 0503915..37a7ed5 100644
+--- a/util/tclmainlib.c
++++ b/util/tclmainlib.c
+@@ -280,7 +280,7 @@ int MainLibProcess_Tcl(clientData, interp, objc, objv)
+ else{
+ Tcl_Channel chan;
+ /* create a tcl channel corresponding to the pipe */
+- if( !(chan = Tcl_MakeFileChannel((ClientData)got, TCL_READABLE)) ){
++ if( !(chan = Tcl_MakeFileChannel((ClientData)(intptr_t)got, TCL_READABLE)) ){
+ Tcl_SetResult(interp, "can't create Tcl chan for pipe", TCL_STATIC);
+ return TCL_ERROR;
+ }
+@@ -485,6 +485,12 @@ int Tclmainlib_Init (vinterp)
+ {
+ Tcl_Interp *interp = (Tcl_Interp *)vinterp;
+
++#ifdef USE_TCL_STUBS
++ if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
++ return TCL_ERROR;
++ }
++#endif
++
+ /* add mainlib commands to this interpreter */
+ Tcl_CreateObjCommand(interp, TCL_MAINLIB_NAME,
+ MainLibProcess_Tcl,
diff --git a/debian/patches/multiarch.patch b/debian/patches/Copy-files-to-the-correct-destinations-according-to-multi.patch
similarity index 70%
rename from debian/patches/multiarch.patch
rename to debian/patches/Copy-files-to-the-correct-destinations-according-to-multi.patch
index 2074117..61605f0 100644
--- a/debian/patches/multiarch.patch
+++ b/debian/patches/Copy-files-to-the-correct-destinations-according-to-multi.patch
@@ -1,10 +1,18 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Copy files to the correct destinations according to multiarch.
- The corresponding variables are set with debhelper compat 9.
- tcl-funtools is not multiarch yet.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 25 Oct 2016 21:52:53 +0200
+Subject: Copy files to the correct destinations according to multiarch.
+
+The corresponding variables are set with debhelper compat
+9. tcl-funtools is not multiarch yet.
+---
+ Makefile.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 03eabd1..fe6557c 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -37,20 +37,20 @@
+@@ -37,20 +37,20 @@ exec_prefix = @exec_prefix@
INSTALL_ROOT = $(DESTDIR)
# Directory in which to install the .a or .so binary for the FUNTOOLS library:
diff --git a/debian/patches/link_to_so.patch b/debian/patches/Link-the-executables-against-libfuntools.so.patch
similarity index 65%
rename from debian/patches/link_to_so.patch
rename to debian/patches/Link-the-executables-against-libfuntools.so.patch
index 2993ed4..f6b6ce3 100644
--- a/debian/patches/link_to_so.patch
+++ b/debian/patches/Link-the-executables-against-libfuntools.so.patch
@@ -1,9 +1,19 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Link the executables agains libfuntools.so and link libfuntools.so
- against the needed libs.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 25 Oct 2016 21:52:53 +0200
+Subject: Link the executables against libfuntools.so
+
+and link libfuntools.so against the needed libs.
+---
+ Makefile.in | 6 +++---
+ configure.ac | 4 +---
+ mklib | 1 -
+ 3 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 99a8299..95c10e2 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ LIB = @LIB@
# this is used in the link line
# LLIB = $(LIB)
@@ -12,7 +22,7 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
# libraries containing main as subroutines
MAINLIB = lib$(PACKAGE)MainLib.a
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ shlib: sublib $(LIBOBJS)
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
CC='$(CC)' CXX=$(CXX) \
@@ -21,7 +31,7 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
rm -rf $(PACKAGE)tmp;)
mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
-@@ -462,7 +462,7 @@
+@@ -462,7 +462,7 @@ install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
install-man:
@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -30,19 +40,11 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
chmod 755 $(MAN_INSTALL_DIR); \
else true; \
fi;
---- a/mklib
-+++ b/mklib
-@@ -34,7 +34,6 @@
- PATCH=""
- DEPS=""
- LINK=""
--LDFLAGS=""
- CPLUSPLUS=0
- STATIC=0
- DLOPEN=0
+diff --git a/configure.ac b/configure.ac
+index c2c3496..de90b88 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ AC_SUBST(DEFLIB)
AC_MSG_CHECKING(for external zlib)
AC_ARG_WITH(zlib, [ --with-zlib=LIB library name],
@@ -51,7 +53,7 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
AC_MSG_RESULT($zlib)
AC_MSG_CHECKING(for external wcslib)
-@@ -99,7 +99,6 @@
+@@ -99,7 +99,6 @@ if test "$fun_ok" != "no"; then
if test "$have_dl" = yes; then
using_shlib="yes"
fpic="yes"
@@ -59,7 +61,7 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
if test `$CC -v -rdynamic 2>&1 | grep -c unrecognized` = "0" ; then
LDFLAGS="$LDFLAGS -rdynamic"
fi
-@@ -136,7 +135,6 @@
+@@ -136,7 +135,6 @@ if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
if test "$have_dl" = yes; then
USE_DL="-DUSE_DL=1"
fpic="yes"
@@ -67,3 +69,15 @@ Description: Link the executables agains libfuntools.so and link libfuntools.so
if test `$CC -v -rdynamic 2>&1 | grep -c unrecognized` = "0" ; then
LDFLAGS="$LDFLAGS -rdynamic"
fi
+diff --git a/mklib b/mklib
+index c900b3e..2f99336 100755
+--- a/mklib
++++ b/mklib
+@@ -34,7 +34,6 @@ MINOR=0
+ PATCH=""
+ DEPS=""
+ LINK=""
+-LDFLAGS=""
+ CPLUSPLUS=0
+ STATIC=0
+ DLOPEN=0
diff --git a/debian/patches/sort-object-files.patch b/debian/patches/Sort-object-files.patch
similarity index 71%
rename from debian/patches/sort-object-files.patch
rename to debian/patches/Sort-object-files.patch
index 8e5b626..b5bc87a 100644
--- a/debian/patches/sort-object-files.patch
+++ b/debian/patches/Sort-object-files.patch
@@ -1,10 +1,17 @@
-Description: Sort object files
- Sort object files to pass to mklib, to make the build reproducible.
-Author: Alexis Bienvenüe <pado at passoire.fr>
+From: =?utf-8?q?Alexis_Bienven=C3=BCe?= <pado at passoire.fr>
+Date: Tue, 25 Oct 2016 21:52:53 +0200
+Subject: Sort object files
+Sort object files to pass to mklib, to make the build reproducible.
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index fe6557c..5d8c6d4 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -233,7 +233,7 @@
+@@ -233,7 +233,7 @@ shlib: sublib $(LIBOBJS)
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
CC='$(CC)' CXX=$(CXX) \
@@ -13,7 +20,7 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
rm -rf $(PACKAGE)tmp;)
mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ shmainlib: mainlib
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
CC='$(CC)' CXX='$(CXX)' \
@@ -22,7 +29,7 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
rm -rf $(PACKAGE)tmp;)
tclfun: $(LIB) tclmainlib.o tclfun.o
-@@ -256,7 +256,7 @@
+@@ -256,7 +256,7 @@ shtclfun: tclfun
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
CC='$(CC)' CXX='$(CXX)' \
diff --git a/debian/patches/use_shared_libwcstools.patch b/debian/patches/Use-the-shared-libwcstools-package-instead-of-the-convien.patch
similarity index 63%
rename from debian/patches/use_shared_libwcstools.patch
rename to debian/patches/Use-the-shared-libwcstools-package-instead-of-the-convien.patch
index 25f1deb..59552e6 100644
--- a/debian/patches/use_shared_libwcstools.patch
+++ b/debian/patches/Use-the-shared-libwcstools-package-instead-of-the-convien.patch
@@ -1,8 +1,23 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use the shared libwcstools package instead of the convienence copy.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Tue, 25 Oct 2016 21:52:53 +0200
+Subject: Use the shared libwcstools package instead of the convienence copy.
+
+---
+ Makefile.in | 6 +++---
+ filter/filter.h | 2 +-
+ funcen.c | 2 +-
+ funmerge.c | 2 +-
+ funtools.h | 2 +-
+ funtoolsP.h | 2 +-
+ funwcs.c | 2 +-
+ ofuntools.h | 2 +-
+ 8 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 95c10e2..ba32411 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -60,8 +60,8 @@
+@@ -60,8 +60,8 @@ FITSY_INC = -I./fitsy
# FITSY_LIBS = -L./fitsy -lfitsy
# wcs files are in the wcs subdirectory
@@ -13,7 +28,7 @@ Description: Use the shared libwcstools package instead of the convienence copy.
# filter files are in the filter subdirectory
FILTER_INC = -I./filter
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ DEVEL =
# Subdirectories to run make in for the primary targets.
@@ -22,6 +37,21 @@ Description: Use the shared libwcstools package instead of the convienence copy.
SUBDIRS = $(SUBLIBS) gnu funtest faq
+diff --git a/filter/filter.h b/filter/filter.h
+index 7a49bdc..71a7da5 100644
+--- a/filter/filter.h
++++ b/filter/filter.h
+@@ -46,7 +46,7 @@
+ #include "fitsy.h"
+ #undef USE_XFILEIO
+ #include "idx.h"
+-#include "wcs.h"
++#include <wcstools/wcs.h>
+ #include "column.h"
+ #include "tl.h"
+ #include "dl.h"
+diff --git a/funcen.c b/funcen.c
+index a2efae0..d571a6b 100644
--- a/funcen.c
+++ b/funcen.c
@@ -21,7 +21,7 @@
@@ -33,6 +63,8 @@ Description: Use the shared libwcstools package instead of the convienence copy.
#include <xalloc.h>
#define MAXROW 8192
+diff --git a/funmerge.c b/funmerge.c
+index f141716..e3cfc36 100644
--- a/funmerge.c
+++ b/funmerge.c
@@ -4,7 +4,7 @@
@@ -44,6 +76,8 @@ Description: Use the shared libwcstools package instead of the convienence copy.
#include <gio.h>
#include <tl.h>
#include <word.h>
+diff --git a/funtools.h b/funtools.h
+index 7488821..e237850 100644
--- a/funtools.h
+++ b/funtools.h
@@ -31,7 +31,7 @@
@@ -55,6 +89,21 @@ Description: Use the shared libwcstools package instead of the convienence copy.
typedef void *Fun;
#endif
+diff --git a/funtoolsP.h b/funtoolsP.h
+index 14953ea..9a9b685 100644
+--- a/funtoolsP.h
++++ b/funtoolsP.h
+@@ -36,7 +36,7 @@
+ #define USE_XFILEIO 1
+ #include "fitsy.h"
+ #undef USE_XFILEIO
+-#include "wcs.h"
++#include <wcstools/wcs.h>
+ #include "filter.h"
+ #include "file.h"
+ #include "swap.h"
+diff --git a/funwcs.c b/funwcs.c
+index 02ae97b..6af08fd 100644
--- a/funwcs.c
+++ b/funwcs.c
@@ -3,7 +3,7 @@
@@ -66,6 +115,8 @@ Description: Use the shared libwcstools package instead of the convienence copy.
/*
*
+diff --git a/ofuntools.h b/ofuntools.h
+index 7488821..e237850 100644
--- a/ofuntools.h
+++ b/ofuntools.h
@@ -31,7 +31,7 @@
@@ -77,25 +128,3 @@ Description: Use the shared libwcstools package instead of the convienence copy.
typedef void *Fun;
#endif
---- a/funtoolsP.h
-+++ b/funtoolsP.h
-@@ -36,7 +36,7 @@
- #define USE_XFILEIO 1
- #include "fitsy.h"
- #undef USE_XFILEIO
--#include "wcs.h"
-+#include <wcstools/wcs.h>
- #include "filter.h"
- #include "file.h"
- #include "swap.h"
---- a/filter/filter.h
-+++ b/filter/filter.h
-@@ -46,7 +46,7 @@
- #include "fitsy.h"
- #undef USE_XFILEIO
- #include "idx.h"
--#include "wcs.h"
-+#include <wcstools/wcs.h>
- #include "column.h"
- #include "tl.h"
- #include "dl.h"
diff --git a/debian/patches/series b/debian/patches/series
index f95202b..5c613e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-link_to_so.patch
-use_shared_libwcstools.patch
-build_tclfun.patch
-multiarch.patch
-sort-object-files.patch
+Link-the-executables-against-libfuntools.so.patch
+Use-the-shared-libwcstools-package-instead-of-the-convien.patch
+Build-the-Tcl-extension-as-a-shared-library.patch
+Copy-files-to-the-correct-destinations-according-to-multi.patch
+Sort-object-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/funtools.git
More information about the Debian-astro-commits
mailing list