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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sat Jul 28 06:33:05 UTC 2012 

Author: sgolovan
Date: 2012-07-28 06:33:05 +0000 (Sat, 28 Jul 2012)
New Revision: 1286

Modified:
   tcl8.5/branches/experimental/debian/changelog
   tcl8.5/branches/experimental/debian/patches/confsearch.diff
   tcl8.5/branches/experimental/debian/patches/manpages.diff
   tcl8.5/branches/experimental/debian/patches/non-linux.diff
   tcl8.5/branches/experimental/debian/patches/rpath.diff
   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.
  * Refreshed patches in debian/patches directory.


Modified: tcl8.5/branches/experimental/debian/changelog
===================================================================
--- tcl8.5/branches/experimental/debian/changelog	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/changelog	2012-07-28 06:33:05 UTC (rev 1286)
@@ -1,8 +1,9 @@
-tcl8.5 (8.5.11-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.12-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 28 May 2012 17:38:23 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 28 Jul 2012 09:57:40 +0400
 
 tcl8.5 (8.5.11-2) unstable; urgency=low
 

Modified: tcl8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/confsearch.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/confsearch.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
+--- tcl8.5.12.orig/unix/tcl.m4
++++ tcl8.5.12/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.5/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/manpages.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/manpages.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.11.orig/unix/installManPage
-+++ tcl8.5-8.5.11/unix/installManPage
+--- tcl8.5.12.orig/unix/installManPage
++++ tcl8.5.12/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tcl8.5/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/non-linux.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/non-linux.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -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.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
+--- tcl8.5.12.orig/unix/configure
++++ tcl8.5.12/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
  
-@@ -7341,7 +7344,7 @@
+@@ -7417,7 +7420,7 @@
  fi
  
  	    ;;
@@ -22,9 +22,9 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
  
---- tcl8.5-8.5.11.orig/unix/Makefile.in
-+++ tcl8.5-8.5.11/unix/Makefile.in
-@@ -170,6 +170,7 @@
+--- tcl8.5.12.orig/unix/Makefile.in
++++ tcl8.5.12/unix/Makefile.in
+@@ -171,6 +171,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.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tcl8.5.12.orig/unix/tcl.m4
++++ tcl8.5.12/unix/tcl.m4
+@@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -44,7 +44,7 @@
  	    fi
  	fi
      ])
-@@ -1391,7 +1394,7 @@
+@@ -1412,7 +1415,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tcl8.5/branches/experimental/debian/patches/rpath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/rpath.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/rpath.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -7351,6 +7351,9 @@
+--- tcl8.5.12.orig/unix/configure
++++ tcl8.5.12/unix/configure
+@@ -7427,6 +7427,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -13,23 +13,23 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tcl8.5-8.5.11.orig/unix/Makefile.in
-+++ tcl8.5-8.5.11/unix/Makefile.in
-@@ -721,7 +721,10 @@
+--- tcl8.5.12.orig/unix/Makefile.in
++++ tcl8.5.12/unix/Makefile.in
+@@ -722,7 +722,10 @@
  	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
--	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
-+	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
+-	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
++	ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
++	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
  	@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.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
-@@ -1401,6 +1401,9 @@
+--- tcl8.5.12.orig/unix/tcl.m4
++++ tcl8.5.12/unix/tcl.m4
+@@ -1422,6 +1422,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/tcllibrary.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tcllibrary.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/tcllibrary.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -18771,7 +18771,7 @@
+--- tcl8.5.12.orig/unix/configure
++++ tcl8.5.12/unix/configure
+@@ -18903,7 +18903,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.11.orig/unix/configure.in
-+++ tcl8.5-8.5.11/unix/configure.in
-@@ -738,7 +738,7 @@
+--- tcl8.5.12.orig/unix/configure.in
++++ tcl8.5.12/unix/configure.in
+@@ -755,7 +755,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -20,8 +20,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.11.orig/library/init.tcl
-+++ tcl8.5-8.5.11/library/init.tcl
+--- tcl8.5.12.orig/library/init.tcl
++++ tcl8.5.12/library/init.tcl
 @@ -46,7 +46,7 @@
  }
  namespace eval tcl {

Modified: tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -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.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -18894,9 +18894,9 @@
+--- tcl8.5.12.orig/unix/configure
++++ tcl8.5.12/unix/configure
+@@ -19026,9 +19026,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.11.orig/unix/configure.in
-+++ tcl8.5-8.5.11/unix/configure.in
-@@ -823,9 +823,9 @@
+--- tcl8.5.12.orig/unix/configure.in
++++ tcl8.5.12/unix/configure.in
+@@ -840,9 +840,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	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/tclport.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -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.5-8.5.11.orig/generic/tclPort.h
-+++ tcl8.5-8.5.11/generic/tclPort.h
+--- tcl8.5.12.orig/generic/tclPort.h
++++ tcl8.5.12/generic/tclPort.h
 @@ -22,7 +22,7 @@
  #endif
  #include "tcl.h"
@@ -11,4 +11,4 @@
 +#   include "../unix/tclUnixPort.h"
  #endif
  
- #if defined(__CYGWIN__)
+ #if !defined(LLONG_MIN)

Modified: tcl8.5/branches/experimental/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2012-07-28 06:33:05 UTC (rev 1286)
@@ -2,8 +2,8 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
---- tcl8.5-8.5.11.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.11/unix/tclConfig.sh.in
+--- tcl8.5.12.orig/unix/tclConfig.sh.in
++++ tcl8.5.12/unix/tclConfig.sh.in
 @@ -100,7 +100,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.5/branches/experimental/debian/rules
===================================================================
--- tcl8.5/branches/experimental/debian/rules	2012-07-28 05:55:18 UTC (rev 1285)
+++ tcl8.5/branches/experimental/debian/rules	2012-07-28 06:33:05 UTC (rev 1286)
@@ -112,8 +112,8 @@
 	dh_shlibdeps -ldebian/tcl$(v)/usr/lib
 
 get-orig-source:
-	wget -O tcl8.5_8.5.11.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.11-src.tar.gz
+	wget -O tcl8.5_8.5.12.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.12-src.tar.gz
 
 .PHONY: override_dh_auto_configure override_dh_auto_install override_dh_makeshlibs override_dh_shlibdeps get-orig-source

More information about the Pkg-tcltk-commits mailing list