[Pkg-tcltk-commits] r260 - in tcl8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Sun Oct 14 17:56:09 UTC 2007
Author: sgolovan-guest
Date: 2007-10-14 17:56:09 +0000 (Sun, 14 Oct 2007)
New Revision: 260
Added:
tcl8.5/trunk/debian/patches/tcllibrary.diff
tcl8.5/trunk/debian/tcl8.5-dev.preinst
Modified:
tcl8.5/trunk/debian/changelog
tcl8.5/trunk/debian/control
tcl8.5/trunk/debian/patches/confsearch.diff
tcl8.5/trunk/debian/patches/series
tcl8.5/trunk/debian/rules
tcl8.5/trunk/debian/tcl8.5-dev.dirs
tcl8.5/trunk/debian/tcl8.5-dev.postinst
tcl8.5/trunk/debian/tcl8.5-dev.prerm
tcl8.5/trunk/debian/tcl8.5.files
tcl8.5/trunk/debian/tcl8.5.postinst
tcl8.5/trunk/debian/tcl8.5.prerm
Log:
[tcl8.5]
* Moved architecture independent files from /usr/lib/tcl8.5 to
/usr/share/tcltk/tcl8.5 breaking backward compatibility.
* 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.
* Replaced /usr/lib by /usr/lib/tcltk in Tcl modules roots
(TCL_MODULE_PATH).
Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/changelog 2007-10-14 17:56:09 UTC (rev 260)
@@ -1,4 +1,4 @@
-tcl8.5 (0.b1-2) UNRELEASED; urgency=low
+tcl8.5 (0.b1-2) unstable; urgency=low
[ Sergei Golovan ]
* Added -fno-unit-at-a-time option to prevent stack corruption in a
@@ -7,12 +7,19 @@
/usr/share/tcltk to auto_path variable. These directories are to be
contain Tcl/Tk packages according to upcoming Debian Tcl/Tk Policy
(preliminary version see at
- http://pkg-tcltk.alioth.debian.org/tcltk-policy.html/)
+ http://pkg-tcltk.alioth.debian.org/tcltk-policy.html/).
+ * Moved architecture independent files from /usr/lib/tcl8.5 to
+ /usr/share/tcltk/tcl8.5 breaking backward compatibility.
+ * 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.
+ * Replaced /usr/lib by /usr/lib/tcltk in Tcl modules roots
+ (TCL_MODULE_PATH).
[ Francesco Paolo Lovergine ]
- * Introduced Homepage field in debian/control
+ * Introduced Homepage field in debian/control.
- -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 13 Oct 2007 19:58:31 +0200
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 14 Oct 2007 21:53:11 +0400
tcl8.5 (0.b1-1) unstable; urgency=low
Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/control 2007-10-14 17:56:09 UTC (rev 260)
@@ -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.5 - run-time files
@@ -25,7 +25,7 @@
Priority: optional
Architecture: all
Suggests: tcl8.5
-Conflicts: tcl, tcl-doc
+Conflicts: tcl-doc
Provides: tcl-doc
Description: Tcl (the Tool Command Language) v8.5 - manual pages
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
@@ -36,8 +36,6 @@
Priority: optional
Architecture: any
Depends: libc6-dev|libc-dev, tcl8.5 (= ${binary:Version})
-Conflicts: tcl
-Provides: tcl-dev
Suggests: tcl8.5-doc
Description: Tcl (the Tool Command Language) v8.5 - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/patches/confsearch.diff 2007-10-14 17:56:09 UTC (rev 260)
@@ -1,5 +1,5 @@
-Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.5
-and tkConfig.sh in /usr/lib/tk8.5 where they are located in Debian
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
+and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
Index: tcl8.5-0.b1/unix/tcl.m4
@@ -10,7 +10,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.5 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)`
@@ -18,7 +18,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.5 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: tcl8.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/patches/series 2007-10-14 17:56:09 UTC (rev 260)
@@ -1,3 +1,4 @@
+tcllibrary.diff
tclpackagepath.diff
tclprivate.diff
confsearch.diff
Added: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff (rev 0)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff 2007-10-14 17:56:09 UTC (rev 260)
@@ -0,0 +1,39 @@
+Index: tcl8.5/unix/configure
+===================================================================
+--- tcl8.5.orig/unix/configure
++++ tcl8.5/unix/configure
+@@ -17914,7 +17914,7 @@
+
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+
+Index: tcl8.5/unix/configure.in
+===================================================================
+--- tcl8.5.orig/unix/configure.in
++++ tcl8.5/unix/configure.in
+@@ -672,7 +672,7 @@
+
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+
+Index: tcl8.5/library/init.tcl
+===================================================================
+--- tcl8.5.orig/library/init.tcl
++++ tcl8.5/library/init.tcl
+@@ -49,7 +49,7 @@
+ }
+ namespace eval tcl {
+ variable Dir
+- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
++ foreach Dir [list $::tcl_library] {
+ if {$Dir ni $::auto_path} {
+ lappend ::auto_path $Dir
+ }
Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/rules 2007-10-14 17:56:09 UTC (rev 260)
@@ -33,6 +33,7 @@
# so so ugly but it works...
touch generic/tclStubInit.c
cd unix && \
+ TCL_LIBRARY="/usr/share/tcltk/tcl8.5" \
TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk" \
./configure --prefix=/usr \
--includedir=/usr/include/tcl$(v) \
@@ -57,8 +58,7 @@
dh_testroot
rm -f build-stamp install-stamp
- -cd unix && $(MAKE) clean
- -cd unix && $(MAKE) distclean
+ cd unix && [ ! -f Makefile ] || $(MAKE) distclean
dh_clean tests/pkg/pkga.so unix/config.log unix/Tcltest.so
@@ -71,16 +71,17 @@
cd unix && \
GZIP=-9 \
- 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_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" 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.0
#ln -sf libtcl$(v).so.0 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 include files.
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
@@ -135,9 +136,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.5/trunk/debian/tcl8.5-dev.dirs
===================================================================
--- tcl8.5/trunk/debian/tcl8.5-dev.dirs 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5-dev.dirs 2007-10-14 17:56:09 UTC (rev 260)
@@ -1,2 +1,2 @@
usr/share/aclocal
-usr/lib/tcl8.5
+usr/share/tcltk/tcl8.5
Modified: tcl8.5/trunk/debian/tcl8.5-dev.postinst
===================================================================
--- tcl8.5/trunk/debian/tcl8.5-dev.postinst 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5-dev.postinst 2007-10-14 17:56:09 UTC (rev 260)
@@ -3,10 +3,9 @@
set -e
if [ "$1" = "configure" ]; then
+ update-alternatives --install /usr/share/aclocal/tcl.m4 tcl.m4 \
+ /usr/share/tcltk/tcl8.5/tcl.m4 830
- update-alternatives --install /usr/share/aclocal/tcl.m4 tcl.m4 \
- /usr/lib/tcl8.5/tcl.m4 830
-
fi
#DEBHELPER#
Added: tcl8.5/trunk/debian/tcl8.5-dev.preinst
===================================================================
--- tcl8.5/trunk/debian/tcl8.5-dev.preinst (rev 0)
+++ tcl8.5/trunk/debian/tcl8.5-dev.preinst 2007-10-14 17:56:09 UTC (rev 260)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt-nl "0.b1-2"; then
+ update-alternatives --remove tcl.m4 /usr/lib/tcl8.5/tcl.m4
+fi
+
+#DEBHELPER#
Modified: tcl8.5/trunk/debian/tcl8.5-dev.prerm
===================================================================
--- tcl8.5/trunk/debian/tcl8.5-dev.prerm 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5-dev.prerm 2007-10-14 17:56:09 UTC (rev 260)
@@ -2,8 +2,6 @@
set -e
-if [ $1 != "upgrade" ] ; then
- update-alternatives --remove tcl.m4 /usr/lib/tcl8.5/tcl.m4
-fi
+update-alternatives --remove tcl.m4 /usr/share/tcltk/tcl8.5/tcl.m4
#DEBHELPER#
Modified: tcl8.5/trunk/debian/tcl8.5.files
===================================================================
--- tcl8.5/trunk/debian/tcl8.5.files 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5.files 2007-10-14 17:56:09 UTC (rev 260)
@@ -1,5 +1,5 @@
usr/bin
-usr/lib/tcl8
-usr/lib/tcl8.5
+usr/share/tcltk/tcl8
+usr/share/tcltk/tcl8.5
usr/lib/*.so.*
usr/share/man/man1
Modified: tcl8.5/trunk/debian/tcl8.5.postinst
===================================================================
--- tcl8.5/trunk/debian/tcl8.5.postinst 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5.postinst 2007-10-14 17:56:09 UTC (rev 260)
@@ -3,9 +3,9 @@
set -e
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh8.5 830 \
- --slave /usr/share/man/man1/tclsh.1.gz tclsh.1 \
- /usr/share/man/man1/tclsh8.5.1.gz
+ update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh8.5 830 \
+ --slave /usr/share/man/man1/tclsh.1.gz tclsh.1 \
+ /usr/share/man/man1/tclsh8.5.1.gz
fi
#DEBHELPER#
Modified: tcl8.5/trunk/debian/tcl8.5.prerm
===================================================================
--- tcl8.5/trunk/debian/tcl8.5.prerm 2007-10-14 16:34:26 UTC (rev 259)
+++ tcl8.5/trunk/debian/tcl8.5.prerm 2007-10-14 17:56:09 UTC (rev 260)
@@ -2,8 +2,6 @@
set -e
-if [ $1 != "upgrade" ] ; then
- update-alternatives --remove tclsh /usr/bin/tclsh8.5
-fi
+update-alternatives --remove tclsh /usr/bin/tclsh8.5
#DEBHELPER#
More information about the Pkg-tcltk-commits
mailing list