[Pkg-tcltk-commits] r1447 - in tcl8.6/branches/experimental/debian: . patches

Mon Aug 19 17:32:24 UTC 2013

Author: sgolovan
Date: 2013-08-19 17:32:24 +0000 (Mon, 19 Aug 2013)
New Revision: 1447

Added:
   tcl8.6/branches/experimental/debian/patches/tclprivate.diff
Removed:
   tcl8.6/branches/experimental/debian/filterconfig
   tcl8.6/branches/experimental/debian/patches/tclport.diff
Modified:
   tcl8.6/branches/experimental/debian/changelog
   tcl8.6/branches/experimental/debian/control
   tcl8.6/branches/experimental/debian/patches/series
   tcl8.6/branches/experimental/debian/patches/tcllibrary.diff
   tcl8.6/branches/experimental/debian/rules
Log:
[tcl8.6-experimental]
  * Removed unnecessary patches to init.tcl and tclPort.h.
  * Change build specs, libs and headers via a patch to tclConfig.sh.in
    instead of filtering the generated tclConfig.sh to make changes more
    visible.
  * Make libtcl8.6-dev depend on tcl8.6 for better backward compatibility.


Modified: tcl8.6/branches/experimental/debian/changelog
===================================================================

--- tcl8.6/branches/experimental/debian/changelog	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/changelog	2013-08-19 17:32:24 UTC (rev 1447)
@@ -1,8 +1,12 @@
-tcl8.6 (8.6.0-4) UNRELEASED; urgency=low
+tcl8.6 (8.6.0-4) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Removed unnecessary patches to init.tcl and tclPort.h.
+  * Change build specs, libs and headers via a patch to tclConfig.sh.in
+    instead of filtering the generated tclConfig.sh to make changes more
+    visible.
+  * Make libtcl8.6-dev depend on tcl8.6 for better backward compatibility.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 31 Jul 2013 11:31:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 19 Aug 2013 21:23:07 +0400
 
 tcl8.6 (8.6.0-3) experimental; urgency=low
 

Modified: tcl8.6/branches/experimental/debian/control
===================================================================
--- tcl8.6/branches/experimental/debian/control	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/control	2013-08-19 17:32:24 UTC (rev 1447)
@@ -41,8 +41,8 @@
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: dpkg-dev (>= 1.16.1~), libtcl8.6 (= ${binary:Version}), ${misc:Depends}
-Suggests: tcl8.6, tcl8.6-doc
+Depends: dpkg-dev (>= 1.16.1~), libtcl8.6 (= ${binary:Version}), tcl8.6, ${misc:Depends}
+Suggests: tcl8.6-doc
 Conflicts: tcl8.6-dev
 Replaces: tcl8.6-dev
 Provides: tcl8.6-dev

Deleted: tcl8.6/branches/experimental/debian/filterconfig
===================================================================
--- tcl8.6/branches/experimental/debian/filterconfig	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/filterconfig	2013-08-19 17:32:24 UTC (rev 1447)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. $1
-
-sed -i -e "s:^TCL_BUILD_LIB_SPEC=.*:TCL_BUILD_LIB_SPEC='$TCL_LIB_SPEC':" \
-       -e "s:^TCL_BUILD_STUB_LIB_SPEC=.*:TCL_BUILD_STUB_LIB_SPEC='$TCL_STUB_LIB_SPEC':" \
-       -e "s:^TCL_BUILD_STUB_LIB_PATH=.*:TCL_BUILD_STUB_LIB_PATH='$TCL_STUB_LIB_PATH':" \
-       -e "s:^TCL_SRC_DIR=.*:TCL_SRC_DIR='/usr/include/tcl$TCL_VERSION/tcl-private':" \
-       $1

Modified: tcl8.6/branches/experimental/debian/patches/series
===================================================================
--- tcl8.6/branches/experimental/debian/patches/series	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/patches/series	2013-08-19 17:32:24 UTC (rev 1447)
@@ -1,6 +1,6 @@
-tclport.diff
 tcllibrary.diff
 tclpackagepath.diff
+tclprivate.diff
 confsearch.diff
 non-linux.diff
 manpages.diff

Modified: tcl8.6/branches/experimental/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/branches/experimental/debian/patches/tcllibrary.diff	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/patches/tcllibrary.diff	2013-08-19 17:32:24 UTC (rev 1447)
@@ -20,14 +20,3 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.6-8.6.0.orig/library/init.tcl
-+++ tcl8.6-8.6.0/library/init.tcl
-@@ -46,7 +46,7 @@
- }
- namespace eval tcl {
-     variable Dir
--    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
-+    foreach Dir [list $::tcl_library] {
- 	if {$Dir ni $::auto_path} {
- 	    lappend ::auto_path $Dir
- 	}

Deleted: tcl8.6/branches/experimental/debian/patches/tclport.diff
===================================================================
--- tcl8.6/branches/experimental/debian/patches/tclport.diff	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/patches/tclport.diff	2013-08-19 17:32:24 UTC (rev 1447)
@@ -1,14 +0,0 @@
-Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
-See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
-
---- tcl8.6-8.6.0.orig/generic/tclPort.h
-+++ tcl8.6-8.6.0/generic/tclPort.h
-@@ -22,7 +22,7 @@
- #endif
- #include "tcl.h"
- #if !defined(_WIN32)
--#   include "tclUnixPort.h"
-+#   include "../unix/tclUnixPort.h"
- #endif
- 
- #if !defined(LLONG_MIN)

Added: tcl8.6/branches/experimental/debian/patches/tclprivate.diff
===================================================================
--- tcl8.6/branches/experimental/debian/patches/tclprivate.diff	                        (rev 0)
+++ tcl8.6/branches/experimental/debian/patches/tclprivate.diff	2013-08-19 17:32:24 UTC (rev 1447)
@@ -0,0 +1,41 @@
+Patch by Chris Waters sets paths which are normally point to a directory
+with Tcl sources to a subdirectory of /usr/include/tcl8.6 (debian/rules
+puts private Tcl headers there).
+
+--- tcl8.6-8.6.0.orig/unix/tclConfig.sh.in
++++ tcl8.6-8.6.0/unix/tclConfig.sh.in
+@@ -100,7 +100,7 @@
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
+-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
++TCL_BUILD_LIB_SPEC='@TCL_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # installed directory.
+@@ -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.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR='@includedir@/tcl-private'
+ 
+ # List of standard directories in which to look for packages during
+ # "package require" commands.  Contains the "prefix" directory plus also
+@@ -153,14 +153,14 @@
+ 
+ # String to pass to linker to pick up the Tcl stub library from its
+ # build directory.
+-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
++TCL_BUILD_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tcl stub library from its
+ # installed directory.
+ TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+ 
+ # Path to the Tcl stub library in the build directory.
+-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
++TCL_BUILD_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+ 
+ # Path to the Tcl stub library in the install directory.
+ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'

Modified: tcl8.6/branches/experimental/debian/rules
===================================================================
--- tcl8.6/branches/experimental/debian/rules	2013-08-19 17:29:56 UTC (rev 1446)
+++ tcl8.6/branches/experimental/debian/rules	2013-08-19 17:32:24 UTC (rev 1447)
@@ -69,7 +69,6 @@
 	cp unix/libtcl$(v).a $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)
 	install -d -m 755 $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v)
 	mv $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.sh $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v)
-	sh debian/filterconfig $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v)/tclConfig.sh
 	install -d -m 755 $(DIR)/usr/share/aclocal
 	cp unix/tcl.m4 $(DIR)/usr/share/aclocal/tcl$(v).m4
 	rm -f $(DIR)/usr/share/tcltk/tcl$(v)/ldAix


