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

[sgolovan-guest at alioth.debian.org]

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

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


Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog	2007-10-19 12:05:36 UTC (rev 305)
+++ tcl8.4/trunk/debian/changelog	2007-10-19 12:05:51 UTC (rev 306)
@@ -10,7 +10,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.4 to
-    /usr/share/tcltk/tcl8.4 breaking backward compatibility.
+    /usr/share/tcltk/tcl8.4. To keep backward compatibility tclConfig.sh is
+    linked to /usr/lib/tcl8.4 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.4/trunk/debian/patches/tclinc.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tclinc.diff	2007-10-19 12:05:36 UTC (rev 305)
+++ tcl8.4/trunk/debian/patches/tclinc.diff	2007-10-19 12:05:51 UTC (rev 306)
@@ -10,27 +10,27 @@
 Index: tcl8.4-8.4.16/unix/tcl.m4
 ===================================================================
 --- tcl8.4-8.4.16.orig/unix/tcl.m4	2007-09-21 21:07:02.000000000 +0400
-+++ tcl8.4-8.4.16/unix/tcl.m4	2007-10-18 20:29:01.000000000 +0400
-@@ -84,6 +84,7 @@
++++ tcl8.4-8.4.16/unix/tcl.m4	2007-10-19 15:45:07.000000000 +0400
+@@ -83,6 +83,7 @@
+ 			`ls -d ${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.4 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tcl8.4 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
- 			ac_cv_c_tclconfig=`(cd $i; pwd)`
-@@ -204,6 +205,7 @@
+@@ -203,6 +204,7 @@
+ 			`ls -d ${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.4 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tk8.4 2>/dev/null` \
  			; do
  		    if test -f "$i/tkConfig.sh" ; then
- 			ac_cv_c_tkconfig=`(cd $i; pwd)`
 Index: tcl8.4-8.4.16/unix/tclConfig.sh.in
 ===================================================================
 --- tcl8.4-8.4.16.orig/unix/tclConfig.sh.in	2007-09-21 21:07:02.000000000 +0400
-+++ tcl8.4-8.4.16/unix/tclConfig.sh.in	2007-10-18 20:29:01.000000000 +0400
++++ tcl8.4-8.4.16/unix/tclConfig.sh.in	2007-10-19 15:45:07.000000000 +0400
 @@ -111,7 +111,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules	2007-10-19 12:05:36 UTC (rev 305)
+++ tcl8.4/trunk/debian/rules	2007-10-19 12:05:51 UTC (rev 306)
@@ -140,6 +140,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.4/trunk/debian/tcl8.4-dev.dirs
===================================================================
--- tcl8.4/trunk/debian/tcl8.4-dev.dirs	2007-10-19 12:05:36 UTC (rev 305)
+++ tcl8.4/trunk/debian/tcl8.4-dev.dirs	2007-10-19 12:05:51 UTC (rev 306)
@@ -1,2 +1,3 @@
+usr/lib/tcl8.4
 usr/share/aclocal
 usr/share/tcltk/tcl8.4

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