[Pkg-tcltk-commits] r310 - in tk8.5/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-19 12:06:59 +0000 (Fri, 19 Oct 2007)
New Revision: 310

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/control
   tk8.5/trunk/debian/patches/confsearch.diff
   tk8.5/trunk/debian/rules
   tk8.5/trunk/debian/tk8.5-dev.dirs
Log:
[tk8.5]
Added backward compatibility (for transition purposes).


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2007-10-19 12:06:43 UTC (rev 309)
+++ tk8.5/trunk/debian/changelog	2007-10-19 12:06:59 UTC (rev 310)
@@ -2,7 +2,8 @@
 
   * Added -fno-unit-at-a-time option to match tcl8.5 build options.
   * Moved architecture independent files from /usr/lib/tk8.5 to
-    /usr/share/tcltk/tk8.5 breaking backward compatibility.
+    /usr/share/tcltk/tk8.5. To keep backward compatibility tkConfig.sh is
+    linked into /usr/lib/tk8.5 directory.
   * Fixed bug with update-alternatives in prerm script.
   * Removed conflicts with tcl and providing tcl-dev packages from
     debian/control to prepare binary packages for default tcl and tcl-dev.

Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control	2007-10-19 12:06:43 UTC (rev 309)
+++ tk8.5/trunk/debian/control	2007-10-19 12:06:59 UTC (rev 310)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, libxss-dev | libxext-dev, libxft-dev, tcl8.5-dev (>= 0.b1-2), quilt
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, libxss-dev | libxext-dev, libxft-dev, tcl8.5-dev (>= 0.b1), quilt
 Standards-Version: 3.7.2
 Homepage: http://www.tcl.tk/
 
@@ -37,7 +37,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b1-2), tk8.5 (= ${binary:Version})
+Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b1), tk8.5 (= ${binary:Version})
 Suggests: tk8.5-doc
 Description: Tk toolkit for Tcl and X11, v8.5 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2007-10-19 12:06:43 UTC (rev 309)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2007-10-19 12:06:59 UTC (rev 310)
@@ -4,33 +4,33 @@
 
 Index: tk8.5-0.b1/unix/configure
 ===================================================================
---- tk8.5-0.b1.orig/unix/configure	2007-10-18 20:45:34.000000000 +0400
-+++ tk8.5-0.b1/unix/configure	2007-10-18 20:45:40.000000000 +0400
-@@ -1430,6 +1430,7 @@
+--- tk8.5-0.b1.orig/unix/configure	2007-10-19 15:47:25.000000000 +0400
++++ tk8.5-0.b1/unix/configure	2007-10-19 15:47:27.000000000 +0400
+@@ -1429,6 +1429,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.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
- 			ac_cv_c_tclconfig=`(cd $i; pwd)`
 Index: tk8.5-0.b1/unix/tcl.m4
 ===================================================================
 --- tk8.5-0.b1.orig/unix/tcl.m4	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/tcl.m4	2007-10-18 20:45:40.000000000 +0400
-@@ -94,6 +94,7 @@
++++ tk8.5-0.b1/unix/tcl.m4	2007-10-19 15:47:27.000000000 +0400
+@@ -93,6 +93,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.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
- 			ac_cv_c_tclconfig=`(cd $i; pwd)`
-@@ -224,6 +225,7 @@
+@@ -223,6 +224,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.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
  			; do
  		    if test -f "$i/tkConfig.sh" ; then
- 			ac_cv_c_tkconfig=`(cd $i; pwd)`

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2007-10-19 12:06:43 UTC (rev 309)
+++ tk8.5/trunk/debian/rules	2007-10-19 12:06:59 UTC (rev 310)
@@ -34,7 +34,7 @@
 	  TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
 	  ./configure --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
-		      --with-tcl=/usr/share/tcltk/tcl$(v) \
+		      --with-tcl=/usr/lib/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
 		      --enable-xft \
@@ -142,6 +142,8 @@
 # now, fix up file locations for .sh
 	mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \
 	   debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
+	ln -s ../../share/tcltk/tk$(v)/tkConfig.sh \
+	      debian/tk$(v)-dev/usr/lib/tk$(v)/tkConfig.sh
 
 	dh_installdocs -a
 	install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/

Modified: tk8.5/trunk/debian/tk8.5-dev.dirs
===================================================================
--- tk8.5/trunk/debian/tk8.5-dev.dirs	2007-10-19 12:06:43 UTC (rev 309)
+++ tk8.5/trunk/debian/tk8.5-dev.dirs	2007-10-19 12:06:59 UTC (rev 310)
@@ -1 +1,2 @@
+usr/lib/tk8.5
 usr/share/tcltk/tk8.5