[Debian-astro-commits] [xpa] 02/03: Adjust patches for new version

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository xpa.

commit 904d28afe6338dd6265fd6f8182829b4833ec222
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 20 10:11:39 2015 +0200

    Adjust patches for new version
---
 debian/changelog                    |  6 ++++++
 debian/patches/fix_paths.patch      |  6 +++---
 debian/patches/hardening.patch      |  4 ++--
 debian/patches/install_tclxpa.patch | 30 +++++-------------------------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 379e132..770039d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xpa (2.1.17-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 20 Oct 2015 10:08:54 +0200
+
 xpa (2.1.16-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/fix_paths.patch b/debian/patches/fix_paths.patch
index 7e6b0a2..bff12e4 100644
--- a/debian/patches/fix_paths.patch
+++ b/debian/patches/fix_paths.patch
@@ -24,7 +24,7 @@ Description: Fix the paths for a chroot build and for FHS
  
  # Top-level directory for share entries:
  MAN_SHARE_DIR =		$(INSTALL_ROOT)$(prefix)/share/xpa
-@@ -273,7 +273,7 @@
+@@ -275,7 +275,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
@@ -33,7 +33,7 @@ Description: Fix the paths for a chroot build and for FHS
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -295,14 +295,22 @@
+@@ -297,14 +297,22 @@
  install-man:
  	@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
  	    echo "Making directory $(MAN_INSTALL_DIR)"; \
@@ -59,7 +59,7 @@ Description: Fix the paths for a chroot build and for FHS
  		M="$(MAN_INSTALL_DIR)/man$$E"; \
  		if [ ! -d $$M ] ; then \
  		    echo "Making directory $$M"; \
-@@ -312,6 +320,9 @@
+@@ -314,6 +322,9 @@
  		fi; \
  		echo "Installing $$B" ; \
  		$(INSTALL_DATA) $$i $$M/$$B; \
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index e27eef2..dcaede3 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -11,7 +11,7 @@ Description: Add hardening flags
  
  DEPEND_SWITCHES = -I. ${CFLAGS} ${PKG_CFLAGS} ${AC_FLAGS}
  
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
  		rm -f lib$(PACKAGE).tmp/xt*.o; \
  		rm -f lib$(PACKAGE).tmp/tcl*.o; \
  		CC='$(CC)' CXX=$(CXX) \
@@ -20,7 +20,7 @@ Description: Add hardening flags
  		rm -rf lib$(PACKAGE).tmp)
  
  mingw-dll:	$(LIBOBJS)
-@@ -202,7 +202,7 @@
+@@ -204,7 +204,7 @@
  		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
  		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
  		CC='$(CC)' CXX='$(CXX)' \
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index 0b49475..00430d3 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -20,16 +20,16 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  LIB =	libxpa.a
  
  # used in link line
-@@ -167,6 +168,8 @@
+@@ -169,6 +170,8 @@
  
- install::	install-share
+ install::	install-data
  
 +install::	tclxpa_install
 +
  lib:		$(LIB) $(DOSHARED)
  
  $(LIB):		$(LIBOBJS)
-@@ -190,14 +193,17 @@
+@@ -192,14 +195,17 @@
  		-Wl,--output-def,libxpa.def,--out-implib,libxpa_dll.a,-no-undefined,--enable-runtime-pseudo-reloc -o libxpa.dll \
  		-lwsock32
  
@@ -55,7 +55,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  
  diff:
  		-(for f in `ls *.c`;					\
-@@ -256,7 +262,7 @@
+@@ -258,7 +264,7 @@
  _install:
  
  shlib_install:
@@ -64,7 +64,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  	   do \
  	   if [ -h $$i ] ; then \
  		echo "Installing link $$i" ; \
-@@ -268,6 +274,11 @@
+@@ -270,6 +276,11 @@
  	   fi; \
  	   done;)
  
@@ -76,23 +76,3 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  install-binaries: $(LIB) $(PROGS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
---- a/tcl.c
-+++ b/tcl.c
-@@ -971,7 +971,7 @@
-     /* create new tcl variable for this socket */
-     else{
-       /* create a tcl channel corresponding to the xpa socket */
--      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_cmdfd(xpa))) ){
-+      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_cmdfd(xpa))) ){
- 	Tcl_SetResult(interp, "XPA$ERROR: could not map XPA cmdfd to tcl",
- 		      TCL_STATIC);
- 	result = TCL_ERROR;
-@@ -1013,7 +1013,7 @@
-     }
-     /* create new tcl variable for this socket */
-     else{
--      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)xpa_datafd(xpa))) ){
-+      if( !(chan = Tcl_MakeTcpClientChannel((ClientData)(intptr_t)xpa_datafd(xpa))) ){
- 	Tcl_SetResult(interp, "XPA$ERROR: could not map XPA datafd to tcl",
- 		      TCL_STATIC);
- 	result = TCL_ERROR;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git