[Pkg-tcltk-commits] r309 - in tk8.4/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Fri Oct 19 12:06:43 UTC 2007 

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

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


Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog	2007-10-19 12:06:30 UTC (rev 308)
+++ tk8.4/trunk/debian/changelog	2007-10-19 12:06:43 UTC (rev 309)
@@ -3,7 +3,8 @@
   * Removed TK_INC_DIR from tkConfig.sh and tcl.m4.
   * Added -fno-unit-at-a-time option to match tcl8.4 build options.
   * Moved architecture independent files from /usr/lib/tk8.4 to
-    /usr/share/tcltk/tk8.4 breaking backward compatibility.
+    /usr/share/tcltk/tk8.4. To keep backward compatibility tkConfig.sh is
+    linked into /usr/lib/tk8.4 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.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control	2007-10-19 12:06:30 UTC (rev 308)
+++ tk8.4/trunk/debian/control	2007-10-19 12:06:43 UTC (rev 309)
@@ -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>, Anselm Lingnau <lingnau at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.16-2), quilt
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), 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, libxt-dev, tcl8.4-dev (>= 8.4.16-2), tk8.4 (= ${binary:Version})
+Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), tk8.4 (= ${binary:Version})
 Suggests: tk8.4-doc
 Description: Tk toolkit for Tcl and X11, v8.4 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif

Modified: tk8.4/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.4/trunk/debian/patches/tkinc.diff	2007-10-19 12:06:30 UTC (rev 308)
+++ tk8.4/trunk/debian/patches/tkinc.diff	2007-10-19 12:06:43 UTC (rev 309)
@@ -9,20 +9,20 @@
 
 Index: tk8.4-8.4.16/unix/configure
 ===================================================================
---- tk8.4-8.4.16.orig/unix/configure	2007-10-18 20:34:25.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure	2007-10-18 20:34:27.000000000 +0400
-@@ -641,6 +641,7 @@
+--- tk8.4-8.4.16.orig/unix/configure	2007-10-19 15:47:01.000000000 +0400
++++ tk8.4-8.4.16/unix/configure	2007-10-19 15:47:02.000000000 +0400
+@@ -640,6 +640,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)`
 Index: tk8.4-8.4.16/unix/tkConfig.sh.in
 ===================================================================
 --- tk8.4-8.4.16.orig/unix/tkConfig.sh.in	2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tkConfig.sh.in	2007-10-18 20:34:27.000000000 +0400
++++ tk8.4-8.4.16/unix/tkConfig.sh.in	2007-10-19 15:47:02.000000000 +0400
 @@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its
@@ -61,20 +61,20 @@
 Index: tk8.4-8.4.16/unix/tcl.m4
 ===================================================================
 --- tk8.4-8.4.16.orig/unix/tcl.m4	2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4	2007-10-18 20:34:27.000000000 +0400
-@@ -84,6 +84,7 @@
++++ tk8.4-8.4.16/unix/tcl.m4	2007-10-19 15:47:02.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)`

Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules	2007-10-19 12:06:30 UTC (rev 308)
+++ tk8.4/trunk/debian/rules	2007-10-19 12:06:43 UTC (rev 309)
@@ -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-man-symlinks \
@@ -141,6 +141,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.4/trunk/debian/tk8.4-dev.dirs
===================================================================
--- tk8.4/trunk/debian/tk8.4-dev.dirs	2007-10-19 12:06:30 UTC (rev 308)
+++ tk8.4/trunk/debian/tk8.4-dev.dirs	2007-10-19 12:06:43 UTC (rev 309)
@@ -1 +1,2 @@
+usr/lib/tk8.4
 usr/share/tcltk/tk8.4

More information about the Pkg-tcltk-commits mailing list