[Pkg-tcltk-commits] r1136 - in tcl8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sun Jun 26 08:20:47 UTC 2011 

Author: sgolovan
Date: 2011-06-26 08:20:46 +0000 (Sun, 26 Jun 2011)
New Revision: 1136

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/control
   tcl8.5/trunk/debian/patches/confsearch.diff
   tcl8.5/trunk/debian/patches/manpages.diff
   tcl8.5/trunk/debian/patches/non-linux.diff
   tcl8.5/trunk/debian/patches/rpath.diff
   tcl8.5/trunk/debian/patches/tcllibrary.diff
   tcl8.5/trunk/debian/patches/tclpackagepath.diff
   tcl8.5/trunk/debian/patches/tclport.diff
   tcl8.5/trunk/debian/patches/tclprivate.diff
   tcl8.5/trunk/debian/rules
   tcl8.5/trunk/debian/tcl8.5.postinst
Log:
[tcl8.5]
  * New upstream release (closes: #617628).
  * Changed tclsh8.5 alternative priority to 850 to make it higher than
    tclsh8.4 one.
  * Bumped standards version to 3.9.2.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/changelog	2011-06-26 08:20:46 UTC (rev 1136)
@@ -1,8 +1,11 @@
-tcl8.5 (8.5.9-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.10-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release (closes: #617628).
+  * Changed tclsh8.5 alternative priority to 850 to make it higher than
+    tclsh8.4 one.
+  * Bumped standards version to 3.9.2.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 03 Mar 2011 20:13:54 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 26 Jun 2011 11:47:14 +0400
 
 tcl8.5 (8.5.9-2) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/control	2011-06-26 08:20:46 UTC (rev 1136)
@@ -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.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.9.orig/unix/tcl.m4
-+++ tcl8.5-8.5.9/unix/tcl.m4
+--- tcl8.5-8.5.10.orig/unix/tcl.m4
++++ tcl8.5-8.5.10/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,7 +12,7 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do
-@@ -224,6 +225,7 @@
+@@ -223,6 +224,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \

Modified: tcl8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.5/trunk/debian/patches/manpages.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/manpages.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.9.orig/unix/installManPage
-+++ tcl8.5-8.5.9/unix/installManPage
+--- tcl8.5-8.5.10.orig/unix/installManPage
++++ tcl8.5-8.5.10/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tcl8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/trunk/debian/patches/non-linux.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/non-linux.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -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.9.orig/unix/configure
-+++ tcl8.5-8.5.9/unix/configure
+--- tcl8.5-8.5.10.orig/unix/configure
++++ tcl8.5-8.5.10/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,18 +13,18 @@
  	    fi
  	fi
  
-@@ -7317,7 +7320,7 @@
+@@ -7341,7 +7344,7 @@
  fi
  
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)
  	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tcl8.5-8.5.9.orig/unix/Makefile.in
-+++ tcl8.5-8.5.9/unix/Makefile.in
-@@ -172,6 +172,7 @@
+ 
+--- tcl8.5-8.5.10.orig/unix/Makefile.in
++++ tcl8.5-8.5.10/unix/Makefile.in
+@@ -170,6 +170,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
@@ -32,9 +32,9 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.5-8.5.9.orig/unix/tcl.m4
-+++ tcl8.5-8.5.9/unix/tcl.m4
-@@ -964,6 +964,9 @@
+--- tcl8.5-8.5.10.orig/unix/tcl.m4
++++ tcl8.5-8.5.10/unix/tcl.m4
+@@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -44,12 +44,12 @@
  	    fi
  	fi
      ])
-@@ -1410,7 +1413,7 @@
+@@ -1391,7 +1394,7 @@
  	        ])
  	    ])
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)
  	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
+ 

Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/rpath.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.9.orig/unix/configure
-+++ tcl8.5-8.5.9/unix/configure
-@@ -7328,6 +7328,9 @@
+--- tcl8.5-8.5.10.orig/unix/configure
++++ tcl8.5-8.5.10/unix/configure
+@@ -7351,6 +7351,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.9.orig/unix/Makefile.in
-+++ tcl8.5-8.5.9/unix/Makefile.in
-@@ -726,7 +726,10 @@
+--- tcl8.5-8.5.10.orig/unix/Makefile.in
++++ tcl8.5-8.5.10/unix/Makefile.in
+@@ -719,7 +719,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -27,9 +27,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 @@
+--- tcl8.5-8.5.10.orig/unix/tcl.m4
++++ tcl8.5-8.5.10/unix/tcl.m4
+@@ -1401,6 +1401,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.9.orig/unix/configure
-+++ tcl8.5-8.5.9/unix/configure
-@@ -18740,7 +18740,7 @@
+--- tcl8.5-8.5.10.orig/unix/configure
++++ tcl8.5-8.5.10/unix/configure
+@@ -18769,7 +18769,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,8 +9,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.9.orig/unix/configure.in
-+++ tcl8.5-8.5.9/unix/configure.in
+--- tcl8.5-8.5.10.orig/unix/configure.in
++++ tcl8.5-8.5.10/unix/configure.in
 @@ -736,7 +736,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,9 +20,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.9.orig/library/init.tcl
-+++ tcl8.5-8.5.9/library/init.tcl
-@@ -48,7 +48,7 @@
+--- tcl8.5-8.5.10.orig/library/init.tcl
++++ tcl8.5-8.5.10/library/init.tcl
+@@ -46,7 +46,7 @@
  }
  namespace eval tcl {
      variable Dir

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -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.9.orig/unix/configure
-+++ tcl8.5-8.5.9/unix/configure
-@@ -18863,9 +18863,9 @@
+--- tcl8.5-8.5.10.orig/unix/configure
++++ tcl8.5-8.5.10/unix/configure
+@@ -18892,9 +18892,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
@@ -16,8 +16,8 @@
  fi
  
  #--------------------------------------------------------------------
---- tcl8.5-8.5.9.orig/unix/configure.in
-+++ tcl8.5-8.5.9/unix/configure.in
+--- tcl8.5-8.5.10.orig/unix/configure.in
++++ tcl8.5-8.5.10/unix/configure.in
 @@ -821,9 +821,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"

Modified: tcl8.5/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclport.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/tclport.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -1,9 +1,9 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- tcl8.5-8.5.9.orig/generic/tclPort.h
-+++ tcl8.5-8.5.9/generic/tclPort.h
-@@ -24,7 +24,7 @@
+--- tcl8.5-8.5.10.orig/generic/tclPort.h
++++ tcl8.5-8.5.10/generic/tclPort.h
+@@ -22,7 +22,7 @@
  #endif
  #include "tcl.h"
  #if !defined(_WIN32)

Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff	2011-06-26 08:20:46 UTC (rev 1136)
@@ -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.9.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.9/unix/tclConfig.sh.in
-@@ -102,7 +102,7 @@
+--- tcl8.5-8.5.10.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.10/unix/tclConfig.sh.in
+@@ -100,7 +100,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.
-@@ -137,7 +137,7 @@
+@@ -135,7 +135,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
-@@ -155,14 +155,14 @@
+@@ -153,14 +153,14 @@
  
  # String to pass to linker to pick up the Tcl stub library from its
  # build directory.

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/rules	2011-06-26 08:20:46 UTC (rev 1136)
@@ -183,8 +183,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.5_8.5.9.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.9-src.tar.gz
+	wget -O tcl8.5_8.5.10.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Modified: tcl8.5/trunk/debian/tcl8.5.postinst
===================================================================
--- tcl8.5/trunk/debian/tcl8.5.postinst	2011-04-06 14:13:11 UTC (rev 1135)
+++ tcl8.5/trunk/debian/tcl8.5.postinst	2011-06-26 08:20:46 UTC (rev 1136)
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = "configure" ]; then
-    update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh8.5 840 \
+    update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh8.5 850 \
 			--slave /usr/share/man/man1/tclsh.1.gz tclsh.1 \
 				/usr/share/man/man1/tclsh8.5.1.gz
 fi

More information about the Pkg-tcltk-commits mailing list