[Pkg-tcltk-commits] r724 - in tcl8.6/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Aug 23 08:25:34 UTC 2008 

Author: sgolovan-guest
Date: 2008-08-23 08:25:31 +0000 (Sat, 23 Aug 2008)
New Revision: 724

Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/patches/confsearch.diff
   tcl8.6/trunk/debian/patches/manpages.diff
   tcl8.6/trunk/debian/patches/non-linux.diff
   tcl8.6/trunk/debian/patches/rpath.diff
   tcl8.6/trunk/debian/patches/tcllibrary.diff
   tcl8.6/trunk/debian/patches/tclpackagepath.diff
   tcl8.6/trunk/debian/patches/tclport.diff
   tcl8.6/trunk/debian/patches/tclprivate.diff
   tcl8.6/trunk/debian/rules
Log:
[tcl8.6]
  * New upstream alpha release.
  * Restored DLL unloading for hppa and kfreebsd architectures because this
    bug was worked around in glibc.


Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/changelog	2008-08-23 08:25:31 UTC (rev 724)
@@ -1,8 +1,10 @@
-tcl8.6 (8.6.0~a1-2) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~a2-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream alpha release.
+  * Restored DLL unloading for hppa and kfreebsd architectures because this
+    bug was worked around in glibc.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu,  3 Jul 2008 21:43:18 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 23 Aug 2008 12:19:37 +0400
 
 tcl8.6 (8.6.0~a1-1) experimental; urgency=low
 

Modified: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/confsearch.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a1/unix/tcl.m4
+--- tcl8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a2/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.6/trunk/debian/patches/manpages.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/manpages.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.6-8.6.0~a1.orig/unix/installManPage
-+++ tcl8.6-8.6.0~a1/unix/installManPage
+--- tcl8.6-8.6.0~a2.orig/unix/installManPage
++++ tcl8.6-8.6.0~a2/unix/installManPage
 @@ -48,8 +48,16 @@
      *.n) SECTION=n ;;
  esac

Modified: tcl8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.6/trunk/debian/patches/non-linux.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/non-linux.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tcl8.6-8.6.0~a1.orig/unix/configure
-+++ tcl8.6-8.6.0~a1/unix/configure
-@@ -6536,6 +6536,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure
++++ tcl8.6-8.6.0~a2/unix/configure
+@@ -6154,6 +6154,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -7333,7 +7336,7 @@
+@@ -6951,7 +6954,7 @@
  fi
  
  	    ;;
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tcl8.6-8.6.0~a1.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~a1/unix/Makefile.in
+--- tcl8.6-8.6.0~a2.orig/unix/Makefile.in
++++ tcl8.6-8.6.0~a2/unix/Makefile.in
 @@ -169,6 +169,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
@@ -32,9 +32,9 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a1/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a2/unix/tcl.m4
+@@ -925,6 +925,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -44,7 +44,7 @@
  	    fi
  	fi
      ])
-@@ -1418,7 +1421,7 @@
+@@ -1381,7 +1384,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tcl8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/rpath.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/rpath.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.6-8.6.0~a1.orig/unix/configure
-+++ tcl8.6-8.6.0~a1/unix/configure
-@@ -7344,6 +7344,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure
++++ tcl8.6-8.6.0~a2/unix/configure
+@@ -6962,6 +6962,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -13,8 +13,8 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tcl8.6-8.6.0~a1.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~a1/unix/Makefile.in
+--- tcl8.6-8.6.0~a2.orig/unix/Makefile.in
++++ tcl8.6-8.6.0~a2/unix/Makefile.in
 @@ -742,7 +742,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -27,9 +27,9 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
---- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a1/unix/tcl.m4
-@@ -1429,6 +1429,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a2/unix/tcl.m4
+@@ -1392,6 +1392,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tcl8.6/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tcllibrary.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/tcllibrary.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -1,6 +1,6 @@
---- tcl8.6-8.6.0~a1.orig/unix/configure
-+++ tcl8.6-8.6.0~a1/unix/configure
-@@ -18724,7 +18724,7 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure
++++ tcl8.6-8.6.0~a2/unix/configure
+@@ -18275,7 +18275,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.6-8.6.0~a1.orig/unix/configure.in
-+++ tcl8.6-8.6.0~a1/unix/configure.in
-@@ -713,7 +713,7 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure.in
++++ tcl8.6-8.6.0~a2/unix/configure.in
+@@ -693,7 +693,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -20,8 +20,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.6-8.6.0~a1.orig/library/init.tcl
-+++ tcl8.6-8.6.0~a1/library/init.tcl
+--- tcl8.6-8.6.0~a2.orig/library/init.tcl
++++ tcl8.6-8.6.0~a2/library/init.tcl
 @@ -48,7 +48,7 @@
  }
  namespace eval tcl {

Modified: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -2,9 +2,9 @@
 without adding /usr/lib to it. It helps to put the policy compliant value to
 ::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
 
---- tcl8.6-8.6.0~a1.orig/unix/configure
-+++ tcl8.6-8.6.0~a1/unix/configure
-@@ -18861,9 +18861,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure
++++ tcl8.6-8.6.0~a2/unix/configure
+@@ -18412,9 +18412,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
@@ -16,9 +16,9 @@
  fi
  
  #--------------------------------------------------------------------
---- tcl8.6-8.6.0~a1.orig/unix/configure.in
-+++ tcl8.6-8.6.0~a1/unix/configure.in
-@@ -812,9 +812,9 @@
+--- tcl8.6-8.6.0~a2.orig/unix/configure.in
++++ tcl8.6-8.6.0~a2/unix/configure.in
+@@ -792,9 +792,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then

Modified: tcl8.6/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclport.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/tclport.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- tcl8.6-8.6.0~a1.orig/generic/tclPort.h
-+++ tcl8.6-8.6.0~a1/generic/tclPort.h
+--- tcl8.6-8.6.0~a2.orig/generic/tclPort.h
++++ tcl8.6-8.6.0~a2/generic/tclPort.h
 @@ -24,7 +24,7 @@
  #if defined(__WIN32__)
  #   include "../win/tclWinPort.h"

Modified: tcl8.6/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclprivate.diff	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/patches/tclprivate.diff	2008-08-23 08:25:31 UTC (rev 724)
@@ -2,8 +2,8 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
---- tcl8.6-8.6.0~a1.orig/unix/tclConfig.sh.in
-+++ tcl8.6-8.6.0~a1/unix/tclConfig.sh.in
+--- tcl8.6-8.6.0~a2.orig/unix/tclConfig.sh.in
++++ tcl8.6-8.6.0~a2/unix/tclConfig.sh.in
 @@ -111,7 +111,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules	2008-07-31 05:21:49 UTC (rev 723)
+++ tcl8.6/trunk/debian/rules	2008-08-23 08:25:31 UTC (rev 724)
@@ -23,16 +23,6 @@
 CFLAGS=-g -O2 -fno-unit-at-a-time
 endif
 endif
-# Enable DLL unloading only for non-kfreebsd arches (see bug #488684)
-ifeq (, $(findstring kfreebsd, $(DEB_HOST_ARCH)))
-ifeq (, $(findstring hppa, $(DEB_HOST_ARCH)))
-DLL_UNLOADING=--enable-dll-unloading
-else
-DLL_UNLOADING=--disable-dll-unloading
-endif
-else
-DLL_UNLOADING=--disable-dll-unloading
-endif
 
 unpatch:
 	dh_testdir
@@ -59,7 +49,7 @@
 		      --includedir=/usr/include/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
-		      $(DLL_UNLOADING) \
+		      --enable-dll-unloading \
 		      --disable-rpath \
 		      --mandir=/usr/share/man \
 		      --enable-man-symlinks \
@@ -192,8 +182,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.6_8.6.0~a1.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.6a1-src.tar.gz
+	wget -O tcl8.6_8.6.0~a2.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.6a2-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source

More information about the Pkg-tcltk-commits mailing list