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

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Wed Dec 19 08:07:13 UTC 2007


Author: sgolovan-guest
Date: 2007-12-19 08:07:13 +0000 (Wed, 19 Dec 2007)
New Revision: 418

Added:
   tcl8.5/trunk/debian/watch
Removed:
   tcl8.5/trunk/debian/patches/stack.diff
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/series
   tcl8.5/trunk/debian/patches/tcllibrary.diff
   tcl8.5/trunk/debian/patches/tclpackagepath.diff
   tcl8.5/trunk/debian/patches/tclprivate.diff
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * New upstream release.
  * Removed unneeded patches.
  * Changed tcl8.5 version in shlibs to 8.5.0.
  * Bumped standards version to 3.7.3.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/changelog	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,9 +1,11 @@
-tcl8.5 (0.b3-4) UNRELEASED; urgency=low
+tcl8.5 (8.5.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * Removed unneeded patch.
+  * New upstream release.
+  * Removed unneeded patches.
+  * Changed tcl8.5 version in shlibs to 8.5.0.
+  * Bumped standards version to 3.7.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 28 Nov 2007 11:44:17 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 19 Dec 2007 10:26:52 +0300
 
 tcl8.5 (0.b3-3) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/control	2007-12-19 08:07:13 UTC (rev 418)
@@ -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.7.2
+Standards-Version: 3.7.3
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -2,10 +2,10 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
-Index: tcl8.5-0.b3/unix/tcl.m4
+Index: tcl8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tcl8.5-0.b3.orig/unix/tcl.m4	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/tcl.m4	2007-11-21 18:21:28.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/tcl.m4	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/tcl.m4	2007-12-19 10:33:40.000000000 +0300
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.5/trunk/debian/patches/manpages.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/manpages.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -2,10 +2,10 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
-Index: tcl8.5-0.b3/unix/installManPage
+Index: tcl8.5-8.5.0/unix/installManPage
 ===================================================================
---- tcl8.5-0.b3.orig/unix/installManPage	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/installManPage	2007-11-21 18:26:34.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/installManPage	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/installManPage	2007-12-19 10:33:52.000000000 +0300
 @@ -48,8 +48,16 @@
      *.n) SECTION=n ;;
  esac

Modified: tcl8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/trunk/debian/patches/non-linux.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/non-linux.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,10 +1,10 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
-Index: tcl8.5-0.b3/unix/configure
+Index: tcl8.5-8.5.0/unix/configure
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure	2007-11-21 18:26:17.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure	2007-11-21 18:26:23.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure	2007-12-19 10:33:43.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure	2007-12-19 10:33:49.000000000 +0300
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -24,10 +24,10 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
-Index: tcl8.5-0.b3/unix/Makefile.in
+Index: tcl8.5-8.5.0/unix/Makefile.in
 ===================================================================
---- tcl8.5-0.b3.orig/unix/Makefile.in	2007-11-21 18:26:17.000000000 +0300
-+++ tcl8.5-0.b3/unix/Makefile.in	2007-11-21 18:26:23.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/Makefile.in	2007-12-19 10:33:43.000000000 +0300
++++ tcl8.5-8.5.0/unix/Makefile.in	2007-12-19 10:33:49.000000000 +0300
 @@ -169,6 +169,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
@@ -36,10 +36,10 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
-Index: tcl8.5-0.b3/unix/tcl.m4
+Index: tcl8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tcl8.5-0.b3.orig/unix/tcl.m4	2007-11-21 18:26:17.000000000 +0300
-+++ tcl8.5-0.b3/unix/tcl.m4	2007-11-21 18:26:23.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/tcl.m4	2007-12-19 10:33:43.000000000 +0300
++++ tcl8.5-8.5.0/unix/tcl.m4	2007-12-19 10:33:49.000000000 +0300
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/rpath.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,10 +1,10 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
-Index: tcl8.5-0.b3/unix/configure
+Index: tcl8.5-8.5.0/unix/configure
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure	2007-11-21 18:20:48.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure	2007-11-21 18:26:17.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure	2007-12-19 10:33:34.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure	2007-12-19 10:33:43.000000000 +0300
 @@ -7344,6 +7344,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,10 +15,10 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
-Index: tcl8.5-0.b3/unix/Makefile.in
+Index: tcl8.5-8.5.0/unix/Makefile.in
 ===================================================================
---- tcl8.5-0.b3.orig/unix/Makefile.in	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/Makefile.in	2007-11-21 18:26:17.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/Makefile.in	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/Makefile.in	2007-12-19 10:33:43.000000000 +0300
 @@ -725,7 +725,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -31,10 +31,10 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-Index: tcl8.5-0.b3/unix/tcl.m4
+Index: tcl8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tcl8.5-0.b3.orig/unix/tcl.m4	2007-11-21 18:21:28.000000000 +0300
-+++ tcl8.5-0.b3/unix/tcl.m4	2007-11-21 18:26:17.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/tcl.m4	2007-12-19 10:33:40.000000000 +0300
++++ tcl8.5-8.5.0/unix/tcl.m4	2007-12-19 10:33:43.000000000 +0300
 @@ -1429,6 +1429,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

Modified: tcl8.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/series	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,4 +1,3 @@
-stack.diff
 tcllibrary.diff
 tclpackagepath.diff
 tclprivate.diff

Deleted: tcl8.5/trunk/debian/patches/stack.diff
===================================================================
--- tcl8.5/trunk/debian/patches/stack.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/stack.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,150 +0,0 @@
-Patch by Miguel Sofer fixes determining stack size of initial thread.
-
-Index: tcl/generic/tclBasic.c
-===================================================================
-RCS file: /cvsroot/tcl/tcl/generic/tclBasic.c,v
-retrieving revision 1.284
-diff -u -r1.284 tclBasic.c
---- tcl/generic/tclBasic.c	23 Nov 2007 22:11:31 -0000	1.284
-+++ tcl/generic/tclBasic.c	26 Nov 2007 13:45:58 -0000
-@@ -831,6 +831,13 @@
- 	Tcl_Panic(Tcl_GetString(Tcl_GetObjResult(interp)));
-     }
- 
-+    /*
-+     * Insure that the stack checking mechanism for this interp is
-+     * initialized. 
-+     */
-+    
-+    TclInterpReady(interp);
-+    
-     return interp;
- }
- 
-Index: tcl/generic/tclInt.h
-===================================================================
-RCS file: /cvsroot/tcl/tcl/generic/tclInt.h,v
-retrieving revision 1.352
-diff -u -r1.352 tclInt.h
---- tcl/generic/tclInt.h	23 Nov 2007 15:00:24 -0000	1.352
-+++ tcl/generic/tclInt.h	26 Nov 2007 13:45:58 -0000
-@@ -2621,7 +2621,7 @@
- MODULE_SCOPE void	TclpThreadDataKeySet(Tcl_ThreadDataKey *keyPtr,
- 			    void *data);
- MODULE_SCOPE void	TclpThreadExit(int status);
--MODULE_SCOPE int	TclpThreadGetStackSize(void);
-+MODULE_SCOPE size_t	TclpThreadGetStackSize(void);
- MODULE_SCOPE void	TclRememberCondition(Tcl_Condition *mutex);
- MODULE_SCOPE void	TclRememberJoinableThread(Tcl_ThreadId id);
- MODULE_SCOPE void	TclRememberMutex(Tcl_Mutex *mutex);
-Index: tcl/unix/tclUnixInit.c
-===================================================================
-RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
-retrieving revision 1.80
-diff -u -r1.80 tclUnixInit.c
---- tcl/unix/tclUnixInit.c	13 Nov 2007 17:13:07 -0000	1.80
-+++ tcl/unix/tclUnixInit.c	26 Nov 2007 13:45:58 -0000
-@@ -1145,13 +1145,13 @@
-     struct rlimit rLimit;	/* The result from getrlimit(). */
- 
- #ifdef TCL_THREADS
--    rawStackSize = (size_t) TclpThreadGetStackSize();
-+    rawStackSize = TclpThreadGetStackSize();
-     if (rawStackSize == (size_t) -1) {
- 	/*
--	 * Some kind of confirmed error?!
-+	 * Some kind of confirmed error in TclpThreadGetStackSize?! Fall back
-+	 * to whatever getrlimit can determine.
- 	 */
--	STACK_DEBUG(("skipping stack checks with failure\n"));
--	return TCL_BREAK;
-+	STACK_DEBUG(("stack checks: TclpThreadGetStackSize failed in \n"));
-     }
-     if (rawStackSize > 0) {
- 	goto finalSanityCheck;
-Index: tcl/unix/tclUnixThrd.c
-===================================================================
-RCS file: /cvsroot/tcl/tcl/unix/tclUnixThrd.c,v
-retrieving revision 1.53
-diff -u -r1.53 tclUnixThrd.c
---- tcl/unix/tclUnixThrd.c	16 Nov 2007 11:17:28 -0000	1.53
-+++ tcl/unix/tclUnixThrd.c	26 Nov 2007 13:45:58 -0000
-@@ -216,24 +216,61 @@
-  *----------------------------------------------------------------------
-  */
- 
--int
-+size_t
- TclpThreadGetStackSize(void)
- {
-     size_t stackSize = 0;
- #if defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && defined(TclpPthreadGetAttrs)
-     pthread_attr_t threadAttr;	/* This will hold the thread attributes for
- 				 * the current thread. */
-+    static int initialized = 0;
- 
--    if (pthread_attr_init(&threadAttr) != 0) {
--	return -1;
--    }
--    if (TclpPthreadGetAttrs(pthread_self(), &threadAttr) != 0) {
--	pthread_attr_destroy(&threadAttr);
--	return -1;
-+    /*
-+     * Fix for [Bug 1815573]
-+     *
-+     * DESCRIPTION:
-+     * On linux TclpPthreadGetAttrs (which is pthread_attr_get_np) may return
-+     * bogus values on the initial thread. We have a choice: either use the
-+     * default thread stack (first branch in the #if below), or return 0 and
-+     * let getrlimit do its thing. 
-+     *
-+     * ASSUMPTIONS:
-+     * There seems to be no api to determine if we are on the initial
-+     * thread. The simple scheme implemented here assumes:
-+     *   1. The first Tcl interp to be created lives in the initial thread. If
-+     *      this assumption is not true, the fix is to call
-+     *      TclpThreadGetStackSize from the initial thread previous to
-+     *      creating any Tcl interpreter. In this case, especially if another
-+     *      Tcl interpreter may be created in the initial thread, it might be
-+     *      better to enable the second branch in the #if below
-+     *   2. There will be no races in creating the first Tcl interp - ie, the
-+     *      second Tcl interp will be created only after the first call to
-+     *      Tcl_CreateInterp returns.
-+     *
-+     * These assumptions are satisfied by tclsh. Embedders may want to check
-+     * their validity, and possibly adapt the code on failing to meet them.
-+     */
-+
-+    if (!initialized) {
-+	initialized = 1;
-+#if 0
-+	if (pthread_attr_init(&threadAttr) != 0) {
-+	    return 0;
-+	}
-+#else
-+	return 0;
-+#endif
-+    } else {
-+	if (TclpPthreadGetAttrs(pthread_self(), &threadAttr) != 0) {
-+	    pthread_attr_destroy(&threadAttr);
-+	    return (size_t)-1;
-+	}
-     }
-+
-+    
-     if (pthread_attr_getstacksize(&threadAttr, &stackSize) != 0) {
- 	pthread_attr_destroy(&threadAttr);
--	return -1;
-+	return (size_t)-1;
-     }
-     pthread_attr_destroy(&threadAttr);
- #elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP)
-@@ -251,7 +288,7 @@
-      * want to try looking at the process accounting limits instead.
-      */
- #endif
--    return (int) stackSize;
-+    return stackSize;
- }
- #endif /* TCL_THREADS */
- 

Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -1,7 +1,7 @@
-Index: tcl8.5-0.b3/unix/configure
+Index: tcl8.5-8.5.0/unix/configure
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure	2007-11-21 18:20:19.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure	2007-12-19 10:33:28.000000000 +0300
 @@ -18427,7 +18427,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -11,10 +11,10 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
-Index: tcl8.5-0.b3/unix/configure.in
+Index: tcl8.5-8.5.0/unix/configure.in
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure.in	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure.in	2007-11-21 18:20:19.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure.in	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure.in	2007-12-19 10:33:28.000000000 +0300
 @@ -696,7 +696,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -24,10 +24,10 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
-Index: tcl8.5-0.b3/library/init.tcl
+Index: tcl8.5-8.5.0/library/init.tcl
 ===================================================================
---- tcl8.5-0.b3.orig/library/init.tcl	2007-11-19 21:14:49.000000000 +0300
-+++ tcl8.5-0.b3/library/init.tcl	2007-11-21 18:20:19.000000000 +0300
+--- tcl8.5-8.5.0.orig/library/init.tcl	2007-12-13 18:26:03.000000000 +0300
++++ tcl8.5-8.5.0/library/init.tcl	2007-12-19 10:33:28.000000000 +0300
 @@ -48,7 +48,7 @@
  }
  namespace eval tcl {

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -2,10 +2,10 @@
 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.
 
-Index: tcl8.5-0.b3/unix/configure
+Index: tcl8.5-8.5.0/unix/configure
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure	2007-11-21 18:20:19.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure	2007-11-21 18:20:48.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure	2007-12-19 10:33:28.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure	2007-12-19 10:33:34.000000000 +0300
 @@ -18564,9 +18564,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
@@ -18,10 +18,10 @@
  fi
  
  #--------------------------------------------------------------------
-Index: tcl8.5-0.b3/unix/configure.in
+Index: tcl8.5-8.5.0/unix/configure.in
 ===================================================================
---- tcl8.5-0.b3.orig/unix/configure.in	2007-11-21 18:20:19.000000000 +0300
-+++ tcl8.5-0.b3/unix/configure.in	2007-11-21 18:20:48.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/configure.in	2007-12-19 10:33:28.000000000 +0300
++++ tcl8.5-8.5.0/unix/configure.in	2007-12-19 10:33:34.000000000 +0300
 @@ -795,9 +795,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"

Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff	2007-12-19 08:07:13 UTC (rev 418)
@@ -2,10 +2,10 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
-Index: tcl8.5-0.b3/unix/tclConfig.sh.in
+Index: tcl8.5-8.5.0/unix/tclConfig.sh.in
 ===================================================================
---- tcl8.5-0.b3.orig/unix/tclConfig.sh.in	2007-11-20 18:46:40.000000000 +0300
-+++ tcl8.5-0.b3/unix/tclConfig.sh.in	2007-11-21 18:21:03.000000000 +0300
+--- tcl8.5-8.5.0.orig/unix/tclConfig.sh.in	2007-12-18 19:08:39.000000000 +0300
++++ tcl8.5-8.5.0/unix/tclConfig.sh.in	2007-12-19 10:33:37.000000000 +0300
 @@ -111,7 +111,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2007-12-17 15:48:26 UTC (rev 417)
+++ tcl8.5/trunk/debian/rules	2007-12-19 08:07:13 UTC (rev 418)
@@ -16,13 +16,8 @@
 CFLAGS = "-g -O0"
 else
 # See bug #446335 for -fno-unit-at-a-time
-ifeq ($(DEB_HOST_ARCH), hppa)
-# Disable stack checking for hppa (it doesn't work yet)
-CFLAGS = "-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1"
-else
 CFLAGS = "-g -O2 -fno-unit-at-a-time"
 endif
-endif
 
 unpatch:
 	dh_testdir
@@ -39,9 +34,6 @@
 build-stamp: patch-stamp
 	dh_testdir
 
-# additional print of stack limit
-	/bin/sh -c "ulimit -Hs" || true
-
 # so so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
@@ -166,7 +158,7 @@
 	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a
-	dh_makeshlibs -a -V 'tcl$(v) (>= 0.b1)' -XTcltest
+	dh_makeshlibs -a -V 'tcl$(v) (>= 8.5.0)' -XTcltest
 	dh_installdeb -a
 	dh_shlibdeps -a -ldebian/tcl$(v)/usr/lib
 	dh_gencontrol -a
@@ -179,8 +171,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.5_0.b3.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5b3-src.tar.gz
+	wget -O tcl8.5_8.5.0.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.0-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Added: tcl8.5/trunk/debian/watch
===================================================================
--- tcl8.5/trunk/debian/watch	                        (rev 0)
+++ tcl8.5/trunk/debian/watch	2007-12-19 08:07:13 UTC (rev 418)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/tcl/tcl(8\.5\.\d+)-src\.tar\.gz




More information about the Pkg-tcltk-commits mailing list