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

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Oct 13 20:37:59 UTC 2007 

Author: sgolovan-guest
Date: 2007-10-13 20:37:59 +0000 (Sat, 13 Oct 2007)
New Revision: 252

Added:
   tcl8.3/trunk/debian/patches/tcllibrary.diff
Modified:
   tcl8.3/trunk/debian/changelog
   tcl8.3/trunk/debian/control
   tcl8.3/trunk/debian/patches/series
   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.postinst
   tcl8.3/trunk/debian/tcl8.3-dev.preinst
   tcl8.3/trunk/debian/tcl8.3-dev.prerm
   tcl8.3/trunk/debian/tcl8.3.files
   tcl8.3/trunk/debian/tcl8.3.prerm
Log:
[tcl8.3]
  * Moved architecture independent files from /usr/lib/tcl8.4 to
    /usr/share/tcltk/tcl8.4 leaving /usr/lib/tcl8.4 as a symlink to maintain
    backward compatibility. Eventually, the symlink will be removed.
  * 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/changelog
===================================================================
--- tcl8.3/trunk/debian/changelog	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/changelog	2007-10-13 20:37:59 UTC (rev 252)
@@ -7,11 +7,17 @@
     (preliminary version see at
     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 leaving /usr/lib/tcl8.4 as a symlink to maintain
+    backward compatibility. Eventually, the symlink will be removed.
+  * 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.
 
   [ Francesco Paolo Lovergine ]
-  * Added Homepage field to debian/control 
+  * Added Homepage field to debian/control.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 13 Oct 2007 19:55:57 +0200
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 14 Oct 2007 00:29:33 +0400
 
 tcl8.3 (8.3.5-7) unstable; urgency=low
 

Modified: tcl8.3/trunk/debian/control
===================================================================
--- tcl8.3/trunk/debian/control	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/control	2007-10-13 20:37:59 UTC (rev 252)
@@ -12,7 +12,7 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: tcl, tcl74 (<= 7.4p3-2)
+Conflicts: tcl74 (<= 7.4p3-2)
 Provides: tclsh
 Suggests: tclreadline
 Description: Tcl (the Tool Command Language) v8.3 - run-time files
@@ -26,7 +26,7 @@
 Priority: optional
 Architecture: all
 Suggests: tcl8.3
-Conflicts: tcl, tcl-doc
+Conflicts: tcl-doc
 Provides: tcl-doc
 Description: Tcl (the Tool Command Language) v8.3 - manual pages
  Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
@@ -37,8 +37,6 @@
 Priority: optional
 Architecture: any
 Depends: tcl8.3 (= ${binary:Version})
-Conflicts: tcl
-Provides: tcl-dev
 Suggests: tcl8.3-doc
 Description: Tcl (the Tool Command Language) v8.3 - development files
  Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted

Modified: tcl8.3/trunk/debian/patches/series
===================================================================
--- tcl8.3/trunk/debian/patches/series	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/patches/series	2007-10-13 20:37:59 UTC (rev 252)
@@ -1,5 +1,6 @@
 ungets.diff
 64bit.diff
+tcllibrary.diff
 tclpackagepath.diff
 m4quote.diff
 m4typo.diff

Modified: tcl8.3/trunk/debian/patches/tclinc.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tclinc.diff	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/patches/tclinc.diff	2007-10-13 20:37:59 UTC (rev 252)
@@ -4,8 +4,8 @@
 sources to a subdirectory of /usr/include/tcl8.3 (debian/rules puts
 private Tcl headers there).
 
-Also, it allows to find tclConfig.sh in /usr/lib/tcl8.3 and tkConfig.sh
-in /usr/lib/tk8.3 where they are located in Debian installation.
+Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.3 and tkConfig.sh
+in /usr/share/tcltk/tk8.3 where they are located in Debian installation.
 
 Index: tcl8.3-8.3.5-7/unix/configure
 ===================================================================
@@ -107,7 +107,7 @@
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/lib/tcl8.3 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)`
@@ -115,7 +115,7 @@
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
-+			`ls -d /usr/lib/tk8.3 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)`

Added: tcl8.3/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.3/trunk/debian/patches/tcllibrary.diff	                        (rev 0)
+++ tcl8.3/trunk/debian/patches/tcllibrary.diff	2007-10-13 20:37:59 UTC (rev 252)
@@ -0,0 +1,13 @@
+Index: tcl8.4/library/init.tcl
+===================================================================
+--- tcl8.4.orig/library/init.tcl
++++ tcl8.4/library/init.tcl
+@@ -49,7 +49,7 @@
+ namespace eval tcl {
+     variable Dir
+     if {[string compare [info library] {}]} {
+-	foreach Dir [list [info library] [file dirname [info library]]] {
++	foreach Dir [list [info library]] {
+ 	    if {[lsearch -exact $::auto_path $Dir] < 0} {
+ 		lappend ::auto_path $Dir
+ 	    }

Modified: tcl8.3/trunk/debian/rules
===================================================================
--- tcl8.3/trunk/debian/rules	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/rules	2007-10-13 20:37:59 UTC (rev 252)
@@ -37,7 +37,8 @@
 	    	      --enable-shared \
 		      --mandir=/usr/share/man && \
 	  touch ../generic/tclStubInit.c && \
-	  $(MAKE) CFLAGS=$(CFLAGS)
+	  $(MAKE) CFLAGS=$(CFLAGS) \
+	  	  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)"
 
 # Build the static library.
 	cd unix && \
@@ -53,7 +54,7 @@
 	dh_testroot
 	rm -f build-stamp install-stamp
 
-	cd unix && [ ! -f Makefile ] || $(MAKE) distclean
+	cd unix && [ ! -f Makefile ] || $(MAKE) TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" distclean
 
 	dh_clean tests/pkg/pkga.so unix/config.log unix/Tcltest.so
 
@@ -65,23 +66,26 @@
 	dh_installdirs
 
 	cd unix && \
-	  make INSTALL_ROOT=`pwd`/../debian/tmp \
-	       MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
-	       MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 install
+	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
+		  MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
+		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
+		  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" install
 # 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.1
 	ln -sf libtcl$(v).so.1 debian/tmp/usr/lib/libtcl$(v).so
-	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tcl$(v)
-	cp unix/tcl.m4 debian/tmp/usr/lib/tcl$(v)/tcl.m4
-	chmod 755 debian/tmp/usr/lib/tcl$(v)/ldAix
+	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tcl$(v)
+	cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
+	rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
 # Fix up the encoding files
-	if [ ! -f debian/tmp/usr/lib/tcl$(v)/encoding/gb2312-raw.enc ]; then \
-	   mv debian/tmp/usr/lib/tcl$(v)/encoding/gb2312.enc \
-	      debian/tmp/usr/lib/tcl$(v)/encoding/gb2312-raw.enc; \
-	   ln -s euc-cn.enc debian/tmp/usr/lib/tcl$(v)/encoding/gb2312.enc; \
+	if [ ! -f debian/tmp/usr/share/tcltk/tcl$(v)/encoding/gb2312-raw.enc ]; then \
+	   mv debian/tmp/usr/share/tcltk/tcl$(v)/encoding/gb2312.enc \
+	      debian/tmp/usr/share/tcltk/tcl$(v)/encoding/gb2312-raw.enc; \
+	   ln -s euc-cn.enc debian/tmp/usr/share/tcltk/tcl$(v)/encoding/gb2312.enc; \
 	fi
 # Fix up the include files.
+	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/unix
@@ -131,9 +135,9 @@
 	dh_testroot -a
 	dh_movefiles -a
 # now, fix up file locations for .sh and .m4
-	mv debian/tcl$(v)/usr/lib/tcl$(v)/*.sh \
-	   debian/tcl$(v)/usr/lib/tcl$(v)/*.m4 \
-	   debian/tcl$(v)-dev/usr/lib/tcl$(v)
+	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/*.sh \
+	   debian/tcl$(v)/usr/share/tcltk/tcl$(v)/*.m4 \
+	   debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
 
 	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-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3-dev.dirs	2007-10-13 20:37:59 UTC (rev 252)
@@ -1,2 +1,2 @@
 usr/share/aclocal
-usr/lib/tcl8.3
+usr/share/tcltk/tcl8.3

Modified: tcl8.3/trunk/debian/tcl8.3-dev.postinst
===================================================================
--- tcl8.3/trunk/debian/tcl8.3-dev.postinst	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3-dev.postinst	2007-10-13 20:37:59 UTC (rev 252)
@@ -3,10 +3,9 @@
 set -e
 
 if [ "$1" = "configure" ]; then
+    update-alternatives --install /usr/share/aclocal/tcl.m4 tcl.m4 \
+				  /usr/share/tcltk/tcl8.3/tcl.m4 831
 
-	update-alternatives --install /usr/share/aclocal/tcl.m4 tcl.m4 \
-    	/usr/lib/tcl8.3/tcl.m4 831
-
 fi
 
 #DEBHELPER#

Modified: tcl8.3/trunk/debian/tcl8.3-dev.preinst
===================================================================
--- tcl8.3/trunk/debian/tcl8.3-dev.preinst	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3-dev.preinst	2007-10-13 20:37:59 UTC (rev 252)
@@ -7,4 +7,8 @@
     rm -f /usr/share/doc/tcl8.3-dev
 fi
 
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "8.3.5-11"; then
+    update-alternatives --remove tcl.m4 /usr/lib/tcl8.3/tcl.m4
+fi
+
 #DEBHELPER#

Modified: tcl8.3/trunk/debian/tcl8.3-dev.prerm
===================================================================
--- tcl8.3/trunk/debian/tcl8.3-dev.prerm	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3-dev.prerm	2007-10-13 20:37:59 UTC (rev 252)
@@ -2,8 +2,6 @@
 
 set -e
 
-if [ $1 != "upgrade" ] ; then
-	update-alternatives --remove tcl.m4 /usr/lib/tcl8.3/tcl.m4
-fi
+update-alternatives --remove tcl.m4 /usr/share/tcl8.3/tcl.m4
 
 #DEBHELPER#

Modified: tcl8.3/trunk/debian/tcl8.3.files
===================================================================
--- tcl8.3/trunk/debian/tcl8.3.files	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3.files	2007-10-13 20:37:59 UTC (rev 252)
@@ -1,4 +1,4 @@
 usr/bin
-usr/lib/tcl8.3
+usr/share/tcltk/tcl8.3
 usr/lib/*.so.*
 usr/share/man/man1

Modified: tcl8.3/trunk/debian/tcl8.3.prerm
===================================================================
--- tcl8.3/trunk/debian/tcl8.3.prerm	2007-10-13 19:16:46 UTC (rev 251)
+++ tcl8.3/trunk/debian/tcl8.3.prerm	2007-10-13 20:37:59 UTC (rev 252)
@@ -2,8 +2,6 @@
 
 set -e
 
-if [ $1 != "upgrade" ] ; then
-	update-alternatives --remove tclsh /usr/bin/tclsh8.3
-fi
+update-alternatives --remove tclsh /usr/bin/tclsh8.3
 
 #DEBHELPER#

More information about the Pkg-tcltk-commits mailing list