[Pkg-tcltk-commits] r305 - in tcl8.3/trunk/debian: . patches

Fri Oct 19 12:05:36 UTC 2007

Author: sgolovan-guest
Date: 2007-10-19 12:05:36 +0000 (Fri, 19 Oct 2007)
New Revision: 305

Modified:
   tcl8.3/trunk/debian/changelog
   tcl8.3/trunk/debian/patches/tclinc.diff
   tcl8.3/trunk/debian/rules
   tcl8.3/trunk/debian/tcl8.3-dev.dirs
   tcl8.3/trunk/debian/tcl8.3-dev.preinst
Log:
[tcl8.3]
Added backward compatibility (for transition purposes).


Modified: tcl8.3/trunk/debian/changelog
===================================================================

--- tcl8.3/trunk/debian/changelog	2007-10-19 11:41:03 UTC (rev 304)
+++ tcl8.3/trunk/debian/changelog	2007-10-19 12:05:36 UTC (rev 305)
@@ -8,7 +8,8 @@
     http://pkg-tcltk.alioth.debian.org/tcltk-policy.html/)
   * Removed TCL_INC_DIR from tclConfig.sh and tcl.m4.
   * Moved architecture independent files from /usr/lib/tcl8.3 to
-    /usr/share/tcltk/tcl8.3 breaking backward compatibility.
+    /usr/share/tcltk/tcl8.3. To keep backward compatibility tclConfig.sh is
+    linked to /usr/lib/tcl8.3 directory.
   * Fixed bug with update-alternatives in prerm scripts.
   * Removed conflicts with tcl and providing tcl-dev packages from
     debian/control to prepare binary packages for default tcl and tcl-dev.

Modified: tcl8.3/trunk/debian/patches/tclinc.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tclinc.diff	2007-10-19 11:41:03 UTC (rev 304)
+++ tcl8.3/trunk/debian/patches/tclinc.diff	2007-10-19 12:05:36 UTC (rev 305)
@@ -9,8 +9,8 @@
 
 Index: tcl8.3-8.3.5/unix/configure
 ===================================================================
---- tcl8.3-8.3.5.orig/unix/configure	2007-10-18 20:19:24.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure	2007-10-18 20:19:26.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure	2007-10-19 15:44:28.000000000 +0400
++++ tcl8.3-8.3.5/unix/configure	2007-10-19 15:44:29.000000000 +0400
 @@ -6372,6 +6372,9 @@
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
  TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}"
@@ -31,8 +31,8 @@
  s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
 Index: tcl8.3-8.3.5/unix/configure.in
 ===================================================================
---- tcl8.3-8.3.5.orig/unix/configure.in	2007-10-18 20:19:20.000000000 +0400
-+++ tcl8.3-8.3.5/unix/configure.in	2007-10-18 20:19:26.000000000 +0400
+--- tcl8.3-8.3.5.orig/unix/configure.in	2007-10-19 15:44:26.000000000 +0400
++++ tcl8.3-8.3.5/unix/configure.in	2007-10-19 15:44:29.000000000 +0400
 @@ -481,6 +481,9 @@
  TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
  TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}"
@@ -54,7 +54,7 @@
 Index: tcl8.3-8.3.5/unix/tclConfig.sh.in
 ===================================================================
 --- tcl8.3-8.3.5.orig/unix/tclConfig.sh.in	2002-10-19 00:44:46.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tclConfig.sh.in	2007-10-18 20:19:26.000000000 +0400
++++ tcl8.3-8.3.5/unix/tclConfig.sh.in	2007-10-19 15:44:29.000000000 +0400
 @@ -110,12 +110,16 @@
  
  # String to pass to linker to pick up the Tcl library from its
@@ -101,21 +101,21 @@
  TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
 Index: tcl8.3-8.3.5/unix/tcl.m4
 ===================================================================
---- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-18 20:19:24.000000000 +0400
-+++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-18 20:19:26.000000000 +0400
-@@ -62,6 +62,7 @@
+--- tcl8.3-8.3.5.orig/unix/tcl.m4	2007-10-19 15:44:28.000000000 +0400
++++ tcl8.3-8.3.5/unix/tcl.m4	2007-10-19 15:44:29.000000000 +0400
+@@ -61,6 +61,7 @@
+ 		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tcl8.3 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tcl8.3 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
- 			ac_cv_c_tclconfig=`(cd $i; pwd)`
-@@ -157,6 +158,7 @@
+@@ -156,6 +157,7 @@
+ 		for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
++			`ls -d /usr/share/tcltk/tk8.3 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tk8.3 2>/dev/null` \
  			; do
  		    if test -f "$i/tkConfig.sh" ; then
- 			ac_cv_c_tkconfig=`(cd $i; pwd)`

Modified: tcl8.3/trunk/debian/rules
===================================================================
--- tcl8.3/trunk/debian/rules	2007-10-19 11:41:03 UTC (rev 304)
+++ tcl8.3/trunk/debian/rules	2007-10-19 12:05:36 UTC (rev 305)
@@ -139,6 +139,8 @@
 	   debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
 	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tclConfig.sh \
 	   debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
+	ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
+	      debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
 
 	dh_installdocs -a
 	dh_installmenu -a

Modified: tcl8.3/trunk/debian/tcl8.3-dev.dirs
===================================================================
--- tcl8.3/trunk/debian/tcl8.3-dev.dirs	2007-10-19 11:41:03 UTC (rev 304)
+++ tcl8.3/trunk/debian/tcl8.3-dev.dirs	2007-10-19 12:05:36 UTC (rev 305)
@@ -1,2 +1,3 @@
+usr/lib/tcl8.3
 usr/share/aclocal
 usr/share/tcltk/tcl8.3

Modified: tcl8.3/trunk/debian/tcl8.3-dev.preinst
===================================================================
--- tcl8.3/trunk/debian/tcl8.3-dev.preinst	2007-10-19 11:41:03 UTC (rev 304)
+++ tcl8.3/trunk/debian/tcl8.3-dev.preinst	2007-10-19 12:05:36 UTC (rev 305)
@@ -9,6 +9,8 @@
 
 if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "8.3.5-8"; then
     update-alternatives --remove tcl.m4 /usr/lib/tcl8.3/tcl.m4
+    # We really want to remove this alternative
+    update-alternatives --auto tcl.m4
 fi
 
 #DEBHELPER#


