[Pkg-tcltk-commits] r253 - in tk8.3/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Sat Oct 13 21:13:14 UTC 2007
Author: sgolovan-guest
Date: 2007-10-13 21:13:14 +0000 (Sat, 13 Oct 2007)
New Revision: 253
Modified:
tk8.3/trunk/debian/changelog
tk8.3/trunk/debian/control
tk8.3/trunk/debian/patches/tkinc.diff
tk8.3/trunk/debian/rules
tk8.3/trunk/debian/tk8.3-dev.dirs
tk8.3/trunk/debian/tk8.3.files
tk8.3/trunk/debian/tk8.3.postinst
tk8.3/trunk/debian/tk8.3.postrm
tk8.3/trunk/debian/tk8.3.preinst
tk8.3/trunk/debian/tk8.3.prerm
Log:
[tk8.3]
* Moved architecture independent files from /usr/lib/tk8.3 to
/usr/share/tcltk/tk8.3 breaking backward compatibility.
* Fixed bug with update-alternatives in prerm scripts.
* Removed conflicts with tk and providing tk-dev packages from
debian/control to prepare binary packages for default tk and tk-dev.
* Added Homepage field to debian/control.
* Added compat headers to tk-private directory.
Modified: tk8.3/trunk/debian/changelog
===================================================================
--- tk8.3/trunk/debian/changelog 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/changelog 2007-10-13 21:13:14 UTC (rev 253)
@@ -1,8 +1,15 @@
tk8.3 (8.3.5-11) unstable; urgency=low
* Removed TK_INC_DIR from tkConfig.sh and tcl.m4.
+ * Moved architecture independent files from /usr/lib/tk8.3 to
+ /usr/share/tcltk/tk8.3 breaking backward compatibility.
+ * Fixed bug with update-alternatives in prerm scripts.
+ * Removed conflicts with tk and providing tk-dev packages from
+ debian/control to prepare binary packages for default tk and tk-dev.
+ * Added Homepage field to debian/control.
+ * Added compat headers to tk-private directory.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 13 Oct 2007 17:01:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 14 Oct 2007 01:10:37 +0400
tk8.3 (8.3.5-10) unstable; urgency=high
Modified: tk8.3/trunk/debian/control
===================================================================
--- tk8.3/trunk/debian/control 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/control 2007-10-13 21:13:14 UTC (rev 253)
@@ -3,8 +3,9 @@
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.3-dev (>= 8.3.5), quilt
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.3-dev (>= 8.3.5-8), quilt
Standards-Version: 3.7.2
+Homepage: http://www.tcl.tk/
Package: tk8.3
Section: libs
@@ -12,42 +13,34 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: xterm | x-terminal-emulator
-Conflicts: tk, tk40 (<= 4.0p3-2)
+Conflicts: tk40 (<= 4.0p3-2)
Provides: wish
Description: Tk toolkit for Tcl and X11, v8.3 - run-time files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
This package contains everything you need to run Tk (wish) scripts
and Tk-enabled apps.
- .
- Homepage: http://www.tcl.tk/
Package: tk8.3-doc
Section: doc
Priority: optional
Architecture: all
Suggests: tk8.3
-Conflicts: tk, tk-doc
+Conflicts: tk-doc
Provides: tk-doc
Description: Tk toolkit for Tcl and X11, v8.3 - manual pages
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
This package contains the manual pages for the Tk commands.
- .
- Homepage: http://www.tcl.tk/
Package: tk8.3-dev
Section: devel
Priority: optional
Architecture: any
-Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.3-dev, tk8.3 (= ${binary:Version})
-Conflicts: tk
-Provides: tk-dev
+Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.3-dev (>= 8.3.5-8), tk8.3 (= ${binary:Version})
Suggests: tk8.3-doc
Description: Tk toolkit for Tcl and X11, v8.3 - development files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
This package contains the headers and libraries needed to extend
or embed Tk.
- .
- Homepage: http://www.tcl.tk/
Modified: tk8.3/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.3/trunk/debian/patches/tkinc.diff 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/patches/tkinc.diff 2007-10-13 21:13:14 UTC (rev 253)
@@ -4,8 +4,8 @@
with Tcl 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: tk8.3-8.3.5-8/unix/configure
===================================================================
@@ -15,7 +15,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/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)`
@@ -123,7 +123,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)`
Modified: tk8.3/trunk/debian/rules
===================================================================
--- tk8.3/trunk/debian/rules 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/rules 2007-10-13 21:13:14 UTC (rev 253)
@@ -7,6 +7,12 @@
v = 8.3
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS="-g -O0 -D_REENTRANT=1"
+else
+CFLAGS="-g -O2 -D_REENTRANT=1"
+endif
+
unpatch:
dh_testdir
-quilt pop -a
@@ -23,9 +29,13 @@
dh_testdir
cd unix && \
- ./configure --prefix=/usr --includedir=/usr/include/tcl$(v) \
- --with-tcl=/usr/lib/tcl$(v) --enable-shared && \
- $(MAKE) CFLAGS="-g -O2 -D_REENTRANT"
+ ./configure --prefix=/usr \
+ --includedir=/usr/include/tcl$(v) \
+ --with-tcl=/usr/share/tcltk/tcl$(v) \
+ --enable-shared && \
+ $(MAKE) CFLAGS=$(CFLAGS) \
+ TK_LIBRARY="/usr/share/tcltk/tk$(v)"
+
# Build the static library.
cd unix && \
ar cr libtk$(v).a *.o && \
@@ -40,7 +50,7 @@
dh_testroot
rm -f build-stamp install-stamp
- cd unix && [ ! -f Makefile ] || $(MAKE) distclean
+ cd unix && [ ! -f Makefile ] || $(MAKE) TK_LIBRARY="/usr/share/tcltk/tk$(v)" distclean
dh_clean
@@ -52,19 +62,24 @@
mkdir -p debian/tmp/usr
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 \
+ TK_LIBRARY="/usr/share/tcltk/tk$(v)" install
+# Fix up pkgInstall.tcl
+ cp unix/pkgIndex.tcl debian/tmp/usr/share/tcltk/tk8.3
# Fix up the libraries.
cp unix/libtk$(v).a debian/tmp/usr/lib
mv debian/tmp/usr/lib/libtk$(v).so debian/tmp/usr/lib/libtk$(v).so.1
ln -sf libtk$(v).so.1 debian/tmp/usr/lib/libtk$(v).so
- mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tk$(v)
+ mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tk$(v)
# Fix up the include files.
install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic
cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic
install -d debian/tmp/usr/include/tcl$(v)/tk-private/unix
cp unix/*.h debian/tmp/usr/include/tcl$(v)/tk-private/unix
+ install -d debian/tmp/usr/include/tcl$(v)/tk-private/compat
+ cp compat/*.h debian/tmp/usr/include/tcl$(v)/tk-private/compat
# Fix up the manpages.
cd debian/tmp/usr/share/man/man1 && \
mv wish.1 wish$(v).1
@@ -94,10 +109,8 @@
rm $$f ; \
fi ; \
done
- rm -rf `pwd`/debian/tmp/usr/lib/tk$(v)/demos
- ln -sf ../../share/doc/tk$(v)/examples `pwd`/debian/tmp/usr/lib/tk$(v)/demos
-# Install pkgIndex.tcl
- cp unix/pkgIndex.tcl `pwd`/debian/tmp/usr/lib/tk$(v)/
+ rm -rf `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos
+ ln -sf ../../../share/doc/tk$(v)/examples `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos
touch install-stamp
@@ -121,11 +134,8 @@
dh_testroot -a
dh_movefiles -a
# now, fix up file locations for .sh
- mv debian/tk$(v)/usr/lib/tk$(v)/*.sh \
- debian/tk$(v)-dev/usr/lib/tk$(v)
-# move the images over to share (for slightly better FHS compatibility)
- mv debian/tk$(v)/usr/lib/tk$(v)/images debian/tk$(v)/usr/share/tk$(v)
- ln -s ../../share/tk$(v)/images debian/tk$(v)/usr/lib/tk$(v)/images
+ mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \
+ debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
dh_installdocs -a
install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
Modified: tk8.3/trunk/debian/tk8.3-dev.dirs
===================================================================
--- tk8.3/trunk/debian/tk8.3-dev.dirs 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3-dev.dirs 2007-10-13 21:13:14 UTC (rev 253)
@@ -1 +1 @@
-usr/lib/tk8.3
+usr/share/tcltk/tk8.3
Modified: tk8.3/trunk/debian/tk8.3.files
===================================================================
--- tk8.3/trunk/debian/tk8.3.files 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3.files 2007-10-13 21:13:14 UTC (rev 253)
@@ -1,4 +1,4 @@
usr/bin
-usr/lib/tk8.3
+usr/share/tcltk/tk8.3
usr/lib/*.so.*
usr/share/man/man1
Modified: tk8.3/trunk/debian/tk8.3.postinst
===================================================================
--- tk8.3/trunk/debian/tk8.3.postinst 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3.postinst 2007-10-13 21:13:14 UTC (rev 253)
@@ -3,9 +3,9 @@
set -e
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.3 831 \
- --slave /usr/share/man/man1/wish.1.gz wish.1 \
- /usr/share/man/man1/wish8.3.1.gz
+ update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.3 831 \
+ --slave /usr/share/man/man1/wish.1.gz wish.1 \
+ /usr/share/man/man1/wish8.3.1.gz
fi
#DEBHELPER#
Modified: tk8.3/trunk/debian/tk8.3.postrm
===================================================================
--- tk8.3/trunk/debian/tk8.3.postrm 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3.postrm 2007-10-13 21:13:14 UTC (rev 253)
@@ -3,10 +3,10 @@
set -e
if [ "$1" = "remove" ]; then
- if [ -d /usr/share/doc/tk8.3/examples ]; then
- # brokenness
- rm -rf /usr/share/doc/tk8.3/examples
- fi
+ if [ -d /usr/share/doc/tk8.3/examples ]; then
+ # brokenness
+ rm -rf /usr/share/doc/tk8.3/examples
+ fi
fi
#DEBHELPER#
Modified: tk8.3/trunk/debian/tk8.3.preinst
===================================================================
--- tk8.3/trunk/debian/tk8.3.preinst 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3.preinst 2007-10-13 21:13:14 UTC (rev 253)
@@ -2,17 +2,12 @@
set -e
-# remove the images directory so we can replace it with a symlink
-if [ -d /usr/lib/tk8.3/images -a ! -L /usr/lib/tk8.3/images ]; then
- rm -rf /usr/lib/tk8.3/images
-fi
-
# clean up after old mistake
if [ "$1" = "upgrade" -o "$1" = "install" ]; then
- if [ -d /usr/lib/tk8.3/demos ]; then
- # brokenness
- rm -rf /usr/lib/tk8.3/demos
- fi
+ if [ -d /usr/lib/tk8.3/demos ]; then
+ # brokenness
+ rm -rf /usr/lib/tk8.3/demos
+ fi
fi
#DEBHELPER#
Modified: tk8.3/trunk/debian/tk8.3.prerm
===================================================================
--- tk8.3/trunk/debian/tk8.3.prerm 2007-10-13 20:37:59 UTC (rev 252)
+++ tk8.3/trunk/debian/tk8.3.prerm 2007-10-13 21:13:14 UTC (rev 253)
@@ -2,8 +2,6 @@
set -e
-if [ $1 != "upgrade" ] ; then
- update-alternatives --remove wish /usr/bin/wish8.3
-fi
+update-alternatives --remove wish /usr/bin/wish8.3
#DEBHELPER#
More information about the Pkg-tcltk-commits
mailing list