[Pkg-tcltk-commits] r654 - tcl8.5/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-06-26 15:57:50 +0000 (Thu, 26 Jun 2008)
New Revision: 654

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * Moved Tcl modules to /usr/share/tcl8.5/tcl8 directory to prevent clashes
    with future tcl8.6 package.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2008-06-26 07:11:09 UTC (rev 653)
+++ tcl8.5/trunk/debian/changelog	2008-06-26 15:57:50 UTC (rev 654)
@@ -1,9 +1,11 @@
-tcl8.5 (8.5.2-2) UNRELEASED; urgency=low
+tcl8.5 (8.5.2-2) unstable; urgency=low
 
   * Fixed clean target to work with debhelper 7.0 (made dh_clean the last
     command, so debhelper logs are removed now).
+  * Moved Tcl modules to /usr/share/tcl8.5/tcl8 directory to prevent clashes
+    with future tcl8.6 package.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:27:35 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 26 Jun 2008 19:55:56 +0400
 
 tcl8.5 (8.5.2-1) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2008-06-26 07:11:09 UTC (rev 653)
+++ tcl8.5/trunk/debian/rules	2008-06-26 15:57:50 UTC (rev 654)
@@ -88,6 +88,11 @@
 		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
 		  TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
 		  install
+# Fix up the modules.
+	sed -i -e's:variable paths {}:variable paths {/usr/share/tcltk/tcl$(v)/tcl8}:' \
+	    debian/tmp/usr/share/tcltk/tcl$(v)/tm.tcl
+	install -d -m 755 `pwd`/debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
+	mv debian/tmp/usr/share/tcltk/tcl8/*/* debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
 # Fix up the libraries.
 	cp unix/libtcl$(v).a debian/tmp/usr/lib
 	#mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0