[Pkg-tcltk-commits] r446 - in tcl8.4/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-01-16 19:02:06 +0000 (Wed, 16 Jan 2008)
New Revision: 446

Modified:
   tcl8.4/trunk/debian/changelog
   tcl8.4/trunk/debian/patches/tcllibrary.diff
   tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
  * Preliminarily removed /usr/lib from auto_path to test compliance of
    Tcl-related packages to Debian Tcl/Tk policy.


Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog	2008-01-15 13:42:07 UTC (rev 445)
+++ tcl8.4/trunk/debian/changelog	2008-01-16 19:02:06 UTC (rev 446)
@@ -1,8 +1,9 @@
-tcl8.4 (8.4.17-2) UNRELEASED; urgency=low
+tcl8.4 (8.4.17-2exp1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Preliminarily removed /usr/lib from auto_path to test compliance of
+    Tcl-related packages to Debian Tcl/Tk policy.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu,  3 Jan 2008 03:28:37 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 16 Jan 2008 21:51:01 +0300
 
 tcl8.4 (8.4.17-1) unstable; urgency=low
 

Modified: tcl8.4/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tcllibrary.diff	2008-01-15 13:42:07 UTC (rev 445)
+++ tcl8.4/trunk/debian/patches/tcllibrary.diff	2008-01-16 19:02:06 UTC (rev 446)
@@ -28,7 +28,7 @@
 ===================================================================
 --- tcl8.4-8.4.16.orig/library/init.tcl	2007-07-05 22:03:45.000000000 +0400
 +++ tcl8.4-8.4.16/library/init.tcl	2007-10-18 20:28:54.000000000 +0400
-@@ -49,7 +49,7 @@
+@@ -49,17 +49,12 @@
  namespace eval tcl {
      variable Dir
      if {[info library] ne ""} {
@@ -37,3 +37,13 @@
  	    if {[lsearch -exact $::auto_path $Dir] < 0} {
  		lappend ::auto_path $Dir
  	    }
+ 	}
+     }
+-    set Dir [file join [file dirname [file dirname \
+-	    [info nameofexecutable]]] lib]
+-    if {[lsearch -exact $::auto_path $Dir] < 0} {
+-	lappend ::auto_path $Dir
+-    }
+     if {[info exists ::tcl_pkgPath]} {
+ 	foreach Dir $::tcl_pkgPath {
+ 	    if {[lsearch -exact $::auto_path $Dir] < 0} {

Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules	2008-01-15 13:42:07 UTC (rev 445)
+++ tcl8.4/trunk/debian/rules	2008-01-16 19:02:06 UTC (rev 446)
@@ -34,7 +34,7 @@
 	touch generic/tclStubInit.c
 	cd unix && \
 	  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
-	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
+	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk" \
 	  ./configure --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
 	    	      --enable-shared \