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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Apr 18 09:25:56 UTC 2013 

Author: sgolovan
Date: 2013-04-18 09:25:56 +0000 (Thu, 18 Apr 2013)
New Revision: 1336

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-experimental]


Modified: tcl8.5/branches/experimental/debian/changelog
===================================================================
--- tcl8.5/branches/experimental/debian/changelog	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/changelog	2013-04-18 09:25:56 UTC (rev 1336)
@@ -1,8 +1,9 @@
-tcl8.5 (8.5.13-2) UNRELEASED; urgency=low
+tcl8.5 (8.5.14-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 24 Nov 2012 12:07:05 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Apr 2013 13:05:59 +0400
 
 tcl8.5 (8.5.13-1) experimental; urgency=low
 

Modified: tcl8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/confsearch.diff	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/confsearch.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.13.orig/unix/tcl.m4
-+++ tcl8.5-8.5.13/unix/tcl.m4
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/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	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/manpages.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.13.orig/unix/installManPage
-+++ tcl8.5-8.5.13/unix/installManPage
+--- tcl8.5-8.5.14.orig/unix/installManPage
++++ tcl8.5-8.5.14/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	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/non-linux.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -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.13.orig/unix/configure
-+++ tcl8.5-8.5.13/unix/configure
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,17 +13,8 @@
  	    fi
  	fi
  
-@@ -7417,7 +7420,7 @@
- fi
- 
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 
---- tcl8.5-8.5.13.orig/unix/Makefile.in
-+++ tcl8.5-8.5.13/unix/Makefile.in
+--- tcl8.5-8.5.14.orig/unix/Makefile.in
++++ tcl8.5-8.5.14/unix/Makefile.in
 @@ -172,6 +172,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
@@ -32,8 +23,8 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.5-8.5.13.orig/unix/tcl.m4
-+++ tcl8.5-8.5.13/unix/tcl.m4
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/unix/tcl.m4
 @@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -44,12 +35,3 @@
  	    fi
  	fi
      ])
-@@ -1412,7 +1415,7 @@
- 	        ])
- 	    ])
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 

Modified: tcl8.5/branches/experimental/debian/patches/rpath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/rpath.diff	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/rpath.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -1,8 +1,8 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.13.orig/unix/configure
-+++ tcl8.5-8.5.13/unix/configure
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
 @@ -7427,6 +7427,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.5-8.5.13.orig/unix/Makefile.in
-+++ tcl8.5-8.5.13/unix/Makefile.in
+--- tcl8.5-8.5.14.orig/unix/Makefile.in
++++ tcl8.5-8.5.14/unix/Makefile.in
 @@ -719,7 +719,10 @@
  	    done;
  	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@ -27,8 +27,8 @@
  	@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.13.orig/unix/tcl.m4
-+++ tcl8.5-8.5.13/unix/tcl.m4
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/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	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/tcllibrary.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.13.orig/unix/configure
-+++ tcl8.5-8.5.13/unix/configure
-@@ -18903,7 +18903,7 @@
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
+@@ -18888,7 +18888,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,8 +9,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.13.orig/unix/configure.in
-+++ tcl8.5-8.5.13/unix/configure.in
+--- tcl8.5-8.5.14.orig/unix/configure.in
++++ tcl8.5-8.5.14/unix/configure.in
 @@ -755,7 +755,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,9 +20,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.13.orig/library/init.tcl
-+++ tcl8.5-8.5.13/library/init.tcl
-@@ -46,7 +46,7 @@
+--- tcl8.5-8.5.14.orig/library/init.tcl
++++ tcl8.5-8.5.14/library/init.tcl
+@@ -47,7 +47,7 @@
  }
  namespace eval tcl {
      variable Dir

Modified: tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/tclpackagepath.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -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.13.orig/unix/configure
-+++ tcl8.5-8.5.13/unix/configure
-@@ -19026,9 +19026,9 @@
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
+@@ -19011,9 +19011,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.13.orig/unix/configure.in
-+++ tcl8.5-8.5.13/unix/configure.in
+--- tcl8.5-8.5.14.orig/unix/configure.in
++++ tcl8.5-8.5.14/unix/configure.in
 @@ -840,9 +840,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"

Modified: tcl8.5/branches/experimental/debian/patches/tclport.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclport.diff	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/tclport.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -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.13.orig/generic/tclPort.h
-+++ tcl8.5-8.5.13/generic/tclPort.h
-@@ -22,7 +22,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
+--- tcl8.5-8.5.14.orig/generic/tclPort.h
++++ tcl8.5-8.5.14/generic/tclPort.h
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ #   include "tclWinPort.h"
+ #else
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
+ #include "tcl.h"
  
- #if !defined(LLONG_MIN)

Modified: tcl8.5/branches/experimental/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/patches/tclprivate.diff	2013-04-18 09:25:56 UTC (rev 1336)
@@ -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.13.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.13/unix/tclConfig.sh.in
+--- tcl8.5-8.5.14.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.14/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	2013-02-06 19:28:43 UTC (rev 1335)
+++ tcl8.5/branches/experimental/debian/rules	2013-04-18 09:25:56 UTC (rev 1336)
@@ -106,14 +106,14 @@
 	touch install-stamp
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'tcl$(v) (>= 8.5.0)' -XTcltest
+	dh_makeshlibs -V 'tcl$(v) (>= $(v).0)' -XTcltest
 
 override_dh_shlibdeps:
 	dh_shlibdeps -ldebian/tcl$(v)/usr/lib
 
 get-orig-source:
-	wget -O tcl8.5_8.5.13.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.13-src.tar.gz
+	wget -O tcl$(v)_$(v).14.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl$(v).14-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