[Pkg-tcltk-commits] r1096 - in tcl8.5/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri Nov 5 10:35:59 UTC 2010 

Author: sgolovan
Date: 2010-11-05 10:35:57 +0000 (Fri, 05 Nov 2010)
New Revision: 1096

Modified:
   tcl8.5/branches/experimental/debian/changelog
   tcl8.5/branches/experimental/debian/control
   tcl8.5/branches/experimental/debian/copyright
   tcl8.5/branches/experimental/debian/patches/confsearch.diff
   tcl8.5/branches/experimental/debian/patches/manpages.diff
   tcl8.5/branches/experimental/debian/patches/mips.diff
   tcl8.5/branches/experimental/debian/patches/non-linux.diff
   tcl8.5/branches/experimental/debian/patches/rpath.diff
   tcl8.5/branches/experimental/debian/patches/series
   tcl8.5/branches/experimental/debian/patches/tcllibrary.diff
   tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff
   tcl8.5/branches/experimental/debian/patches/tclport.diff
   tcl8.5/branches/experimental/debian/patches/tclprivate.diff
   tcl8.5/branches/experimental/debian/rules
Log:
[tcl8.5]
  * New upstream release.
  * Removed patch which fixed FTBFS on MIPS architectures as it is no longer
    needed.
  * Fixed license in debian/copyright.
  * Bumped standards version to 3.9.1.


Modified: tcl8.5/branches/experimental/debian/changelog
===================================================================
--- tcl8.5/branches/experimental/debian/changelog	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/changelog	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,8 +1,12 @@
-tcl8.5 (8.5.8-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.9-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed patch which fixed FTBFS on MIPS architectures as it is no longer
+    needed.
+  * Fixed license in debian/copyright.
+  * Bumped standards version to 3.9.1.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 22 Nov 2009 14:36:15 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 05 Nov 2010 13:33:59 +0300
 
 tcl8.5 (8.5.8-2) unstable; urgency=low
 

Modified: tcl8.5/branches/experimental/debian/control
===================================================================
--- tcl8.5/branches/experimental/debian/control	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/control	2010-11-05 10:35:57 UTC (rev 1096)
@@ -4,7 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 5.0.0), quilt
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Modified: tcl8.5/branches/experimental/debian/copyright
===================================================================
--- tcl8.5/branches/experimental/debian/copyright	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/copyright	2010-11-05 10:35:57 UTC (rev 1096)
@@ -70,7 +70,7 @@
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
 Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license. 

Modified: tcl8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/confsearch.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/confsearch.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -2,21 +2,21 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.8.orig/unix/tcl.m4
-+++ tcl8.5-8.5.8/unix/tcl.m4
+--- tcl8.5-8.5.9.orig/unix/tcl.m4
++++ tcl8.5-8.5.9/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
 +			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/lib64 2>/dev/null` \
  			; do
- 		    if test -f "$i/tclConfig.sh" ; then
-@@ -223,6 +224,7 @@
+@@ -224,6 +225,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
 +			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/lib64 2>/dev/null` \
  			; do
- 		    if test -f "$i/tkConfig.sh" ; then

Modified: tcl8.5/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/manpages.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/manpages.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -2,22 +2,22 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.8.orig/unix/installManPage
-+++ tcl8.5-8.5.8/unix/installManPage
-@@ -48,8 +48,16 @@
-     *.n) SECTION=n ;;
+--- tcl8.5-8.5.9.orig/unix/installManPage
++++ tcl8.5-8.5.9/unix/installManPage
+@@ -91,8 +91,16 @@
+ 	exit 2 ;;
  esac
  
-+NAME=`basename $MANPAGE .$SECTION`
- SRCDIR=`dirname $MANPAGE`
++Name=`basename $ManPage .$Section`
+ SrcDir=`dirname $ManPage`
  
-+SPECIALS="DString Thread Notifier RegExp"
-+for n in $SPECIALS; do
-+    if [ "$NAME" = "$n" ] ; then
-+	NAMES="$n $NAMES"
++Specials="DString Thread Notifier RegExp"
++for n in $Specials; do
++    if [ "$Name" = "$n" ] ; then
++	Names="$n $Names"
 +    fi
 +done
 +
- FIRST=""
- for f in $NAMES; do
-     f=$f.$SECTION$SUFFIX
+ ########################################################################
+ ### Process Page to Create Target Pages
+ ###

Modified: tcl8.5/branches/experimental/debian/patches/mips.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/mips.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/mips.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,23 +0,0 @@
-Patch by Sergei Golovan "fixes" building Tcl 8.5.8 for MIPS architectures
-until a proper solution isn't suggested.
-
---- tcl8.5-8.5.8.orig/generic/tclStrToD.c
-+++ tcl8.5-8.5.8/generic/tclStrToD.c
-@@ -73,7 +73,7 @@
-  * MIPS floating-point units need special settings in control registers
-  * to use gradual underflow as we expect.
-  */
--#if defined(__mips)
-+#if 0 && defined(__mips)
- #include <sys/fpu.h>
- #endif
- /*
-@@ -2166,7 +2166,7 @@
-     } bitwhack;
- #endif
- 
--#if defined(__mips)
-+#if 0 && defined(__mips)
-     union fpc_csr mipsCR;
- 
-     mipsCR.fc_word = get_fpc_csr();

Modified: tcl8.5/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/non-linux.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/non-linux.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tcl8.5-8.5.8.orig/unix/configure
-+++ tcl8.5-8.5.8/unix/configure
+--- tcl8.5-8.5.9.orig/unix/configure
++++ tcl8.5-8.5.9/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -7340,7 +7343,7 @@
+@@ -7317,7 +7320,7 @@
  fi
  
  	    ;;
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tcl8.5-8.5.8.orig/unix/Makefile.in
-+++ tcl8.5-8.5.8/unix/Makefile.in
+--- tcl8.5-8.5.9.orig/unix/Makefile.in
++++ tcl8.5-8.5.9/unix/Makefile.in
 @@ -172,6 +172,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.5-8.5.8.orig/unix/tcl.m4
-+++ tcl8.5-8.5.8/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tcl8.5-8.5.9.orig/unix/tcl.m4
++++ tcl8.5-8.5.9/unix/tcl.m4
+@@ -964,6 +964,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -44,7 +44,7 @@
  	    fi
  	fi
      ])
-@@ -1422,7 +1425,7 @@
+@@ -1410,7 +1413,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tcl8.5/branches/experimental/debian/patches/rpath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/rpath.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/rpath.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.8.orig/unix/configure
-+++ tcl8.5-8.5.8/unix/configure
-@@ -7351,6 +7351,9 @@
+--- tcl8.5-8.5.9.orig/unix/configure
++++ tcl8.5-8.5.9/unix/configure
+@@ -7328,6 +7328,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -13,9 +13,9 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tcl8.5-8.5.8.orig/unix/Makefile.in
-+++ tcl8.5-8.5.8/unix/Makefile.in
-@@ -729,7 +729,10 @@
+--- tcl8.5-8.5.9.orig/unix/Makefile.in
++++ tcl8.5-8.5.9/unix/Makefile.in
+@@ -726,7 +726,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -24,12 +24,12 @@
 +	ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
 +	ln -sf "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 ./
 +	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
- 	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
- 	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
- 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
---- tcl8.5-8.5.8.orig/unix/tcl.m4
-+++ tcl8.5-8.5.8/unix/tcl.m4
-@@ -1433,6 +1433,9 @@
+ 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
+ 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
+ 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+--- tcl8.5-8.5.9.orig/unix/tcl.m4
++++ tcl8.5-8.5.9/unix/tcl.m4
+@@ -1421,6 +1421,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tcl8.5/branches/experimental/debian/patches/series
===================================================================
--- tcl8.5/branches/experimental/debian/patches/series	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/series	2010-11-05 10:35:57 UTC (rev 1096)
@@ -6,4 +6,3 @@
 rpath.diff
 non-linux.diff
 manpages.diff
-mips.diff

Modified: tcl8.5/branches/experimental/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tcllibrary.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/tcllibrary.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.8.orig/unix/configure
-+++ tcl8.5-8.5.8/unix/configure
-@@ -18808,7 +18808,7 @@
+--- tcl8.5-8.5.9.orig/unix/configure
++++ tcl8.5-8.5.9/unix/configure
+@@ -18740,7 +18740,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.8.orig/unix/configure.in
-+++ tcl8.5-8.5.8/unix/configure.in
-@@ -734,7 +734,7 @@
+--- tcl8.5-8.5.9.orig/unix/configure.in
++++ tcl8.5-8.5.9/unix/configure.in
+@@ -736,7 +736,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -20,8 +20,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.8.orig/library/init.tcl
-+++ tcl8.5-8.5.8/library/init.tcl
+--- tcl8.5-8.5.9.orig/library/init.tcl
++++ tcl8.5-8.5.9/library/init.tcl
 @@ -48,7 +48,7 @@
  }
  namespace eval tcl {

Modified: tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -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.5-8.5.8.orig/unix/configure
-+++ tcl8.5-8.5.8/unix/configure
-@@ -18945,9 +18945,9 @@
+--- tcl8.5-8.5.9.orig/unix/configure
++++ tcl8.5-8.5.9/unix/configure
+@@ -18863,9 +18863,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
@@ -16,9 +16,9 @@
  fi
  
  #--------------------------------------------------------------------
---- tcl8.5-8.5.8.orig/unix/configure.in
-+++ tcl8.5-8.5.8/unix/configure.in
-@@ -833,9 +833,9 @@
+--- tcl8.5-8.5.9.orig/unix/configure.in
++++ tcl8.5-8.5.9/unix/configure.in
+@@ -821,9 +821,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then

Modified: tcl8.5/branches/experimental/debian/patches/tclport.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclport.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/tclport.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -1,14 +1,14 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- tcl8.5-8.5.8.orig/generic/tclPort.h
-+++ tcl8.5-8.5.8/generic/tclPort.h
+--- tcl8.5-8.5.9.orig/generic/tclPort.h
++++ tcl8.5-8.5.9/generic/tclPort.h
 @@ -24,7 +24,7 @@
- #if defined(__WIN32__)
- #   include "tclWinPort.h"
- #else
+ #endif
+ #include "tcl.h"
+ #if !defined(_WIN32)
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
  
- #if !defined(LLONG_MIN)
+ #if defined(__CYGWIN__)

Modified: tcl8.5/branches/experimental/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2010-11-05 10:35:57 UTC (rev 1096)
@@ -2,9 +2,9 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
---- tcl8.5-8.5.8.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.8/unix/tclConfig.sh.in
-@@ -111,7 +111,7 @@
+--- tcl8.5-8.5.9.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.9/unix/tclConfig.sh.in
+@@ -102,7 +102,7 @@
  
  # String to pass to linker to pick up the Tcl library from its
  # build directory.
@@ -13,7 +13,7 @@
  
  # String to pass to linker to pick up the Tcl library from its
  # installed directory.
-@@ -146,7 +146,7 @@
+@@ -137,7 +137,7 @@
  # different place than the directory containing the source files, this
  # points to the location of the sources, not the location where Tcl was
  # compiled.
@@ -22,7 +22,7 @@
  
  # List of standard directories in which to look for packages during
  # "package require" commands.  Contains the "prefix" directory plus also
-@@ -164,14 +164,14 @@
+@@ -155,14 +155,14 @@
  
  # String to pass to linker to pick up the Tcl stub library from its
  # build directory.

Modified: tcl8.5/branches/experimental/debian/rules
===================================================================
--- tcl8.5/branches/experimental/debian/rules	2010-11-05 10:32:36 UTC (rev 1095)
+++ tcl8.5/branches/experimental/debian/rules	2010-11-05 10:35:57 UTC (rev 1096)
@@ -186,8 +186,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.5_8.5.8.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.8-src.tar.gz
+	wget -O tcl8.5_8.5.9.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.9-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