[Pkg-tcltk-commits] r261 - in tk8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Sun Oct 14 18:00:04 UTC 2007
Author: sgolovan-guest
Date: 2007-10-14 18:00:04 +0000 (Sun, 14 Oct 2007)
New Revision: 261
Added:
tk8.5/trunk/debian/patches/tklibrary.diff
Modified:
tk8.5/trunk/debian/changelog
tk8.5/trunk/debian/control
tk8.5/trunk/debian/patches/confsearch.diff
tk8.5/trunk/debian/patches/rpath.diff
tk8.5/trunk/debian/patches/series
tk8.5/trunk/debian/rules
tk8.5/trunk/debian/tk8.5-dev.dirs
tk8.5/trunk/debian/tk8.5.files
tk8.5/trunk/debian/tk8.5.postinst
tk8.5/trunk/debian/tk8.5.postrm
tk8.5/trunk/debian/tk8.5.preinst
tk8.5/trunk/debian/tk8.5.prerm
Log:
[tk8.5]
* 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.
* 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.
* Added Homepage field to debian/control.
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/changelog 2007-10-14 18:00:04 UTC (rev 261)
@@ -1,3 +1,15 @@
+tk8.5 (0.b1-2) unstable; urgency=low
+
+ * 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.
+ * 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.
+ * Added Homepage field to debian/control.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 14 Oct 2007 21:56:36 +0400
+
tk8.5 (0.b1-1) unstable; urgency=low
* New upstream beta release.
Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/control 2007-10-14 18:00:04 UTC (rev 261)
@@ -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>, 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), 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-2), quilt
Standards-Version: 3.7.2
+Homepage: http://www.tcl.tk/
Package: tk8.5
Section: libs
@@ -12,42 +13,34 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: xterm | x-terminal-emulator
-Conflicts: tk, tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
+Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
Provides: wish
Description: Tk toolkit for Tcl and X11, v8.5 - 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.5-doc
Section: doc
Priority: optional
Architecture: all
Suggests: tk8.5
-Conflicts: tk, tk-doc
+Conflicts: tk-doc
Provides: tk-doc
Description: Tk toolkit for Tcl and X11, v8.5 - 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.5-dev
Section: devel
Priority: optional
Architecture: any
-Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b1), tk8.5 (= ${binary:Version})
-Conflicts: tk
-Provides: tk-dev
+Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b1-2), 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
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.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/patches/confsearch.diff 2007-10-14 18:00:04 UTC (rev 261)
@@ -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: tk8.5-0.b1/unix/configure
@@ -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)`
@@ -22,7 +22,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)`
@@ -30,7 +30,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: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/patches/rpath.diff 2007-10-14 18:00:04 UTC (rev 261)
@@ -32,7 +32,7 @@
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+ [list load [file join \$$dir $${relative}$(TK_LIB_FILE).0] Tk]";\
++ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
) > $(PKG_INDEX); \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/patches/series 2007-10-14 18:00:04 UTC (rev 261)
@@ -1,3 +1,4 @@
+tklibrary.diff
tkprivate.diff
confsearch.diff
rpath.diff
Added: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff (rev 0)
+++ tk8.5/trunk/debian/patches/tklibrary.diff 2007-10-14 18:00:04 UTC (rev 261)
@@ -0,0 +1,26 @@
+Index: tk8.4/unix/configure
+===================================================================
+--- tk8.4.orig/unix/configure
++++ tk8.4/unix/configure
+@@ -5858,7 +5858,7 @@
+ TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
+Index: tk8.4/unix/configure.in
+===================================================================
+--- tk8.4.orig/unix/configure.in
++++ tk8.4/unix/configure.in
+@@ -402,7 +402,7 @@
+ TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/rules 2007-10-14 18:00:04 UTC (rev 261)
@@ -8,6 +8,13 @@
v = 8.5
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS="-g -O0"
+else
+# See bug #446335
+CFLAGS="-g -O2 -fno-unit-at-a-time"
+endif
+
unpatch:
dh_testdir
-quilt pop -a
@@ -24,15 +31,17 @@
dh_testdir
cd unix && \
- ./configure --prefix=/usr \
- --includedir=/usr/include/tcl$(v) \
- --with-tcl=/usr/lib/tcl$(v) \
- --enable-shared \
- --enable-threads \
- --enable-xft \
- --enable-man-symlinks \
- --enable-man-compression=gzip && \
- $(MAKE) CFLAGS="-g -O2 -D_REENTRANT"
+ TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
+ ./configure --prefix=/usr \
+ --includedir=/usr/include/tcl$(v) \
+ --with-tcl=/usr/share/tcltk/tcl$(v) \
+ --enable-shared \
+ --enable-threads \
+ --enable-xft \
+ --enable-man-symlinks \
+ --enable-man-compression=gzip && \
+ $(MAKE) CFLAGS=$(CFLAGS)
+
# Build the static library.
cd unix && \
ar cr libtk$(v).a *.o && \
@@ -47,8 +56,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
@@ -61,14 +69,16 @@
mkdir -p debian/tmp/usr
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 install
+# Fix up pkgInstall.tcl
+ cp debian/tmp/usr/lib/tk$(v)/* debian/tmp/usr/share/tcltk/tk$(v)
# 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.0
ln -sf libtk$(v).so.0 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
@@ -106,8 +116,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
+ 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
# Build architecture-independent files here.
@@ -130,11 +140,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.5/trunk/debian/tk8.5-dev.dirs
===================================================================
--- tk8.5/trunk/debian/tk8.5-dev.dirs 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5-dev.dirs 2007-10-14 18:00:04 UTC (rev 261)
@@ -1 +1 @@
-usr/lib/tk8.5
+usr/share/tcltk/tk8.5
Modified: tk8.5/trunk/debian/tk8.5.files
===================================================================
--- tk8.5/trunk/debian/tk8.5.files 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5.files 2007-10-14 18:00:04 UTC (rev 261)
@@ -1,4 +1,4 @@
usr/bin
-usr/lib/tk8.5
+usr/share/tcltk/tk8.5
usr/lib/*.so.*
usr/share/man/man1
Modified: tk8.5/trunk/debian/tk8.5.postinst
===================================================================
--- tk8.5/trunk/debian/tk8.5.postinst 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5.postinst 2007-10-14 18:00:04 UTC (rev 261)
@@ -3,9 +3,9 @@
set -e
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.5 840 \
- --slave /usr/share/man/man1/wish.1.gz wish.1 \
- /usr/share/man/man1/wish8.5.1.gz
+ update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.5 830 \
+ --slave /usr/share/man/man1/wish.1.gz wish.1 \
+ /usr/share/man/man1/wish8.5.1.gz
fi
#DEBHELPER#
Modified: tk8.5/trunk/debian/tk8.5.postrm
===================================================================
--- tk8.5/trunk/debian/tk8.5.postrm 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5.postrm 2007-10-14 18:00:04 UTC (rev 261)
@@ -3,10 +3,10 @@
set -e
if [ "$1" = "remove" ]; then
- if [ -d /usr/share/doc/tk8.5/examples ]; then
- # brokenness
- rm -rf /usr/share/doc/tk8.5/examples
- fi
+ if [ -d /usr/share/doc/tk8.5/examples ]; then
+ # brokenness
+ rm -rf /usr/share/doc/tk8.5/examples
+ fi
fi
#DEBHELPER#
Modified: tk8.5/trunk/debian/tk8.5.preinst
===================================================================
--- tk8.5/trunk/debian/tk8.5.preinst 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5.preinst 2007-10-14 18:00:04 UTC (rev 261)
@@ -2,16 +2,11 @@
set -e
-# remove the images directory so we can replace it with a symlink
-if [ -d /usr/lib/tk8.5/images ] && [ ! -L /usr/lib/tk8.5/images ]; then
- rm -rf /usr/lib/tk8.5/images
-fi
-
if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
- if [ -d /usr/lib/tk8.5/demos ]; then
- # brokenness
- rm -rf /usr/lib/tk8.5/demos
- fi
+ if [ -d /usr/lib/tk8.5/demos ]; then
+ # brokenness
+ rm -rf /usr/lib/tk8.5/demos
+ fi
fi
#DEBHELPER#
Modified: tk8.5/trunk/debian/tk8.5.prerm
===================================================================
--- tk8.5/trunk/debian/tk8.5.prerm 2007-10-14 17:56:09 UTC (rev 260)
+++ tk8.5/trunk/debian/tk8.5.prerm 2007-10-14 18:00:04 UTC (rev 261)
@@ -2,8 +2,6 @@
set -e
-if [ $1 != "upgrade" ] ; then
- update-alternatives --remove wish /usr/bin/wish8.5
-fi
+update-alternatives --remove wish /usr/bin/wish8.5
#DEBHELPER#
More information about the Pkg-tcltk-commits
mailing list