--- tk8.4-8.4.19.orig/debian/changelog +++ tk8.4-8.4.19/debian/changelog @@ -0,0 +1,275 @@ +tk8.4 (8.4.19-1) unstable; urgency=low + + * New upstream release. + + -- Sergei Golovan Sat, 19 Apr 2008 18:13:39 +0400 + +tk8.4 (8.4.18-2) unstable; urgency=low + + * Quoted CFLAGS in debian/rules when passing to the shell, not when + assigning to a make variable; otherwise the quotes end up as part of + the variable and many things go wrong, leading to a build failure + (closes: #476044). + * Explicitly specified configure options --host and --build to make build + results more predictable. + + -- Sergei Golovan Mon, 14 Apr 2008 23:09:29 +0400 + +tk8.4 (8.4.18-1) unstable; urgency=low + + * New upstream release. + * Overridden lintian warning package-name-doesnt-match-sonames since tk8.4 + package contains not only a library, and it's unreasonable to split it + into smaller parts + + -- Sergei Golovan Fri, 08 Feb 2008 22:09:13 +0300 + +tk8.4 (8.4.17-2) unstable; urgency=high + + * Applied patch by upstream to fix security vulnerability CVE-2006-4484 + overflow triggered by crafted GIF file. + + -- Sergei Golovan Mon, 04 Feb 2008 23:22:14 +0300 + +tk8.4 (8.4.17-1) unstable; urgency=low + + * New upstream release. + * Bumped standards version to 3.7.3. + + -- Sergei Golovan Thu, 03 Jan 2008 02:43:15 +0300 + +tk8.4 (8.4.16-2) unstable; urgency=low + + * 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. 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. + * Added Homepage field to debian/control. + * Fixed segfault in case if only scalable fonts are available and the best + scored font is infeasible (closes: #444546). + * Rearranged conflicts of tk8.4-doc package because of planned adoption of + real tk-doc package. + + -- Sergei Golovan Fri, 19 Oct 2007 16:08:07 +0400 + +tk8.4 (8.4.16-1) unstable; urgency=low + + * New upstream version. + * Cleaned up patches in debian/patches. + * Added patch by Massimo Dal Zotto with workaround for scalable fonts + treated as fixed. + * Added /usr/lib/tcl8.4 to a search path for tclConfig.sh and /usr/lib/tk8.4 + to a search path for tkConfig.sh in tcl.m4. + * Removed 10 years old patch which increases PIL (Python imaging library) + bitmaps loading performance. + * Added uscan control file debian/watch. + * Bumped debhelper compatibility to 5. + + -- Sergei Golovan Fri, 28 Sep 2007 21:00:56 +0400 + +tk8.4 (8.4.15-2) unstable; urgency=low + + * Added Sergei Golovan to uploaders list. + * Removed tk-dev from packages, conflicting with tk8.4-dev. It allows to + install tk8.4-dev aside with tk8.3-dev (they aren't conflicting by files). + * Removed --enable-64bit configure option from debian/rules. + * Replaced deprecated ${Source-Version} substitution variable by + ${binary:Version}. + * Moved menu item from obsolete Apps to Applications section. + + -- Sergei Golovan Sat, 15 Sep 2007 10:34:19 +0400 + +tk8.4 (8.4.15-1) unstable; urgency=low + + * New maintainer Tcl/Tk Debian Packagers + . + + [ Sergei Golovan ] + * New upstream release. + * Removed obsolete package xlibs-dev and replaced x-dev by x11proto-core-dev | + x-dev in build dependencies (closes: #390783). + * Use quilt for patch management. + * Fixed sections inside manual pages. + * Added get-orig-source target to debian/rules. + * Added headers from compat directory to tk8.4-dev package (closes: #426348). + * Added list of copyright holders to debian/copyright. + [ Chris Waters ] + * Added Anselm Lingnau to uploaders. + + -- Chris Waters Wed, 25 Jul 2007 05:31:14 -0700 + +tk8.4 (8.4.11-1.1) unstable; urgency=low + + * NMU. + * Fix syntax errors in unix/tcl.m4 and unix/configure. + See bug #343989. + + -- Daniel Schepler Sun, 8 Jan 2006 12:05:53 +0100 + +tk8.4 (8.4.11-1) unstable; urgency=low + + * New upstream release. + * Needed to fix mechanism for picking up SONAME. Now uses special + macro, TK_SHLIB_LD_EXTRAS, and only for Linux, Hurd and DebianBSD. + * Fixed some possible-bashisms in preinst. + + -- Chris Waters Tue, 6 Sep 2005 14:35:13 -0700 + +tk8.4 (8.4.9-1) unstable; urgency=low + + * New upstream release. + * The old mechanism for renaming the man pages no longer worked, so I + had to create a new one. + + -- Chris Waters Wed, 15 Dec 2004 20:35:31 -0800 + +tk8.4 (8.4.7-1) unstable; urgency=low + + * New upstream release. + * Removed patch files for tcl.m4, they were badly out-of-synch, and I + don't actually use them for anything. + * Adjusted build-depends and -dev package dependencies to reflect the + xlibs splitup (closes: #241776). + + -- Chris Waters Sat, 7 Aug 2004 23:11:21 -0700 + +tk8.4 (8.4.6-1) unstable; urgency=low + + * Got the version number wrong on that last one...sorry. + + -- Chris Waters Sun, 14 Mar 2004 19:47:38 -0800 + +tk8.4 (8.4.5-2) unstable; urgency=low + + * New upstream version. + + -- Chris Waters Sat, 13 Mar 2004 15:52:25 -0800 + +tk8.4 (8.4.5-1) unstable; urgency=low + + * New upstream version. + * Enable 64-bit support (follows same change in latest tcl package). + + -- Chris Waters Mon, 22 Dec 2003 18:06:23 -0800 + +tk8.4 (8.4.4-1) unstable; urgency=low + + * New upstream release. + * Re-enabled XIMPEEK which has been fixed to work with newer XFree86es. + + -- Chris Waters Thu, 31 Jul 2003 01:54:35 -0700 + +tk8.4 (8.4.3-3) unstable; urgency=low + + * Rebuilt to not use XIMPEEK code, which doesn't work with newer + versions of XFree86. Tightened up the build dependencies to make sure + that the corresponding patch in tcl8.4's tcl.m4 is also present + (closes: #170504). + + -- Chris Waters Wed, 25 Jun 2003 22:23:57 -0700 + +tk8.4 (8.4.3-2) unstable; urgency=low + + * Changed -dev dependency from "libc6-dev" to "libc6-dev|libc-dev", for + greater flexibility. + * Added tcl.m4 patch for debian-netbsd systems. + + -- Chris Waters Fri, 6 Jun 2003 00:49:05 -0700 + +tk8.4 (8.4.3-1) unstable; urgency=low + + * New upstream release. + + -- Chris Waters Wed, 21 May 2003 02:08:49 -0700 + +tk8.4 (8.4.2-2) unstable; urgency=low + + * Updated patch for setting up .so naming -- now also patches + Makefile.in to generate working pkgIndex.tcl file (closes: #183879). + * Actually added the recommendation of x-terminal-emulator mentioned in + previous changelog entry. + + -- Chris Waters Fri, 7 Mar 2003 18:59:11 -0800 + +tk8.4 (8.4.2-1) unstable; urgency=low + + * New upstream release. + * Removed the font-selection order patch from 8.4.1-2, as it has been + merged upstream. + * Added x-terminal-emulator to Debian menu entry, and recommended it + (closes: #177937). + + -- Chris Waters Thu, 6 Mar 2003 04:37:49 -0800 + +tk8.4 (8.4.1-2) unstable; urgency=low + + * The -dev package no longer uses a symlink in /usr/share/doc. Any + pre-existing link now cleared by preinst. + * Moved README.Debian to tk8.4 package instead of tk8.4-doc. + * Updated source location in copyright file (closes: #171353). + * debian/rules: simplified the logic used to get the .sh file into the + -dev package. No longer dependent on the order that dh_movefiles + processes thepackages, and no longer uses obscure globbing magic. + * Include the actual upstream changelog file, as well as the file named + "changes" (which is more of a user-oriented description). + * Move images to /usr/share, with symlink from /usr/lib so things don't + break. (Check that symlink in preinst too.) This may or may not make + us FHS-compliant, but at least it shuts lintian up. :) + * Changed the font selection algorithm to prefer the first best-match, + not the last. Patch from Massimo Dal Zotto. + * Applied new Hurd patch from Robert Millan (closes: #170448). + * Added conflicts for old libtk-img (closes: #169240). + + -- Chris Waters Mon, 16 Dec 2002 18:08:50 -0800 + +tk8.4 (8.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: -doc to docs section. + * Fixed bug in prerm, removed wrong alternative. + * Fleshed out the package descriptions a little. + * Enabled thread support (to match new tcl8.4). + * Added missing path separator in tkConfig.sh (closes: #169529). + + -- Chris Waters Sun, 17 Nov 2002 19:39:45 -0800 + +tk8.4 (8.4.0-5) unstable; urgency=low + + * Removed the man page patch introduced in 8.4.0-2, as it was large, and + didn't actually help. Re-added the "ln" hack to mkLinks (as seen in + earlier tk packages). + + -- Chris Waters Fri, 11 Oct 2002 19:26:35 -0700 + +tk8.4 (8.4.0-4) unstable; urgency=low + + * New maintainer. + * Fixed to install all man pages as .3tk (some were still .n). + * Updated to use debhelper v3. + + -- Chris Waters Thu, 10 Oct 2002 15:15:53 -0700 + +tk8.4 (8.4.0-3) unstable; urgency=low + + * Tightened build-deps for tcl8.4-dev to those with properly + functioning tclConfig.sh + + -- Mike Markley Sun, 22 Sep 2002 21:40:24 -0700 + +tk8.4 (8.4.0-2) unstable; urgency=low + + * Patch to tcl.m4/mkLinks/Makefile.in to support compile-time + specified manpage section (Closes: #161336) + + -- Mike Markley Fri, 20 Sep 2002 20:12:49 -0700 + +tk8.4 (8.4.0-1) unstable; urgency=low + + * New upstream version. + * Upstream Makefile ignores SHLIB_LD_FLAGS, fixed. + + -- Mike Markley Wed, 11 Sep 2002 22:51:20 -0700 --- tk8.4-8.4.19.orig/debian/rules +++ tk8.4-8.4.19/debian/rules @@ -0,0 +1,181 @@ +#!/usr/bin/make -f +# debian/rules that uses debhelper. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +export QUILT_PATCHES := debian/patches + +v = 8.4 + +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 + rm -rf patch-stamp .pc + +patch: patch-stamp +patch-stamp: + dh_testdir + quilt push -a + touch patch-stamp + +build: build-stamp +build-stamp: patch-stamp + dh_testdir + + cd unix && \ + TK_LIBRARY="/usr/share/tcltk/tk$(v)" \ + ./configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --includedir=/usr/include/tcl$(v) \ + --with-tcl=/usr/lib/tcl$(v) \ + --enable-shared \ + --enable-threads \ + --enable-man-symlinks \ + --enable-man-compression=gzip && \ + $(MAKE) CFLAGS="$(CFLAGS)" + +# Build the static library. + cd unix && \ + ar cr libtk$(v).a *.o && \ + ar d libtk$(v).a tkAppInit.o && \ + ranlib libtk$(v).a + + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + + cd unix && [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_installdirs + + 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 +# 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/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.gz wish$(v).1.gz + cd debian/tmp/usr/share/man/man3 && \ + for f in *.[3n].gz ; do \ + f2=$$(echo $$f | sed -e 's/\.[3n]/.3tk/') ; \ + if [ -L $$f ]; then \ + l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tk/') ; \ + rm $$f ; \ + ln -sf $$l $$f2 ; \ + else \ + zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \ + -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \ + -e 's/bgerror(n)/bgerror(3tcl)/g' \ + -e 's/fconfigure(n)/fconfigure(3tcl)/g' \ + -e 's/history(n)/history(3tcl)/g' \ + -e 's/interp(n)/interp(3tcl)/g' \ + -e 's/library(n)/library(3tcl)/g' \ + -e 's/load(n)/load(3tcl)/g' \ + -e 's/package(n)/package(3tcl)/g' \ + -e 's/puts(n)/puts(3tcl)/g' \ + -e 's/safe(n)/safe(3tcl)/g' \ + -e 's/source(n)/source(3tcl)/g' \ + -e 's/tclvars(n)/tclvars(3tcl)/g' \ + -e 's/unknown(n)/unknown(3tcl)/g' \ + -e 's/(n)/(3tk)/g' \ + | gzip -9 >$$f2 ; \ + rm $$f ; \ + fi ; \ + done + rm -rf `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos + ln -sf ../../doc/tk$(v)/examples `pwd`/debian/tmp/usr/share/tcltk/tk$(v)/demos + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_movefiles -i + dh_installdocs -i + dh_installchangelogs -i ChangeLog + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_movefiles -a +# 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/ +# move around the demos + cp -a library/demos/* `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/ + rm -f debian/tk$(v)/usr/share/doc/tk$(v)/examples/license.terms + dh_installmenu -a + dh_installchangelogs -a ChangeLog + install -m 644 debian/tk$(v).lintian-override \ + debian/tk$(v)/usr/share/lintian/overrides/tk$(v) + dh_fixperms -a + dh_strip -a + dh_compress -a -Xusr/share/doc/tk$(v)/examples/ + dh_makeshlibs -a -V 'tk$(v) (>= 8.4.16)' + dh_installdeb -a + dh_shlibdeps -a -ldebian/tk$(v)/usr/lib + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch + +get-orig-source: + wget -O tk8.4_8.4.19.orig.tar.gz \ + http://prdownloads.sourceforge.net/tcl/tk8.4.19-src.tar.gz + +.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source + --- tk8.4-8.4.19.orig/debian/README.Debian +++ tk8.4-8.4.19/debian/README.Debian @@ -0,0 +1,3 @@ +Please see the Documentation section in the upstream README for a list of +books on getting started with Tcl/Tk. Also see the main Tcl/Tk web site +at http://www.tcl.tk/ for other documentation. --- tk8.4-8.4.19.orig/debian/tk8.4.menu +++ tk8.4-8.4.19/debian/tk8.4.menu @@ -0,0 +1,4 @@ +?package(tk8.4):needs="x11"\ + section="Applications/Programming"\ + title="TkWish8.4"\ + command="x-terminal-emulator -e /usr/bin/wish8.4" --- tk8.4-8.4.19.orig/debian/shlibs.local +++ tk8.4-8.4.19/debian/shlibs.local @@ -0,0 +1 @@ +libtk8.4 1 --- tk8.4-8.4.19.orig/debian/watch +++ tk8.4-8.4.19/debian/watch @@ -0,0 +1,6 @@ +# Watch control file for uscan + +# Compulsory line, this is a version 3 file +version=3 + +http://heanet.dl.sourceforge.net/sourceforge/tcl/tk(8\.4\.[\d.]*)(?:-src)?.tar.gz --- tk8.4-8.4.19.orig/debian/copyright +++ tk8.4-8.4.19/debian/copyright @@ -0,0 +1,74 @@ +This package was debianized by David Engel +from sources obtained at http://prdownloads.sourceforge.net/tcl + +List of copyright holders of individual files: + +Copyright 1985-1987, 1989, 1991 Massachusetts Institute of Technology +Copyright 1987-1994 Adobe Systems Inc. +Copyright 1987 Digital Equipment Corporation +Copyright 1989-1994 The Regents of the University of California +Copyright 1990, David Koblas +Copyright 1992-1996 Free Software Foundation, Inc. +Copyright 1993-1994 Lockheed Missle & Space Company, AI Center +Copyright 1994-1998 Sun Microsystems, Inc. +Copyright 1994 Software Research Associates, Inc. +Copyright 1994 The Australian National University +Copyright 1997-2000 Ajuba Solutions +Copyright 1997-2000 Scriptics Corporation +Copyright 1997 Australian National University +Copyright 1998-2005 ActiveState Corporation +Copyright 1998 Hutchison Avenue Software Corporation +Copyright 1998 Paul Duffin +Copyright 1999-2000 Jeffrey Hobbs +Copyright 1999 Jan Nijtman. +Copyright 2001-2002, Apple Computer, Inc. +Copyright 2001-2002 Donal K. Fellows +Copyright 2001-2003 David Gravereaux +Copyright 2002-2007 Daniel A. Steffen +Copyright 2002 David Gravereaux +Copyright 2002 Ludwig Callewaert +Copyright 2003-2006 Patrick Thoyts +Copyright 2007 Tcl Core Team +Copyright Reed Wade + +Copyright: + +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., and other parties. The following +terms apply to all files associated with the software unless explicitly +disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. --- tk8.4-8.4.19.orig/debian/tk8.4-doc.files +++ tk8.4-8.4.19/debian/tk8.4-doc.files @@ -0,0 +1 @@ +usr/share/man/man3 --- tk8.4-8.4.19.orig/debian/compat +++ tk8.4-8.4.19/debian/compat @@ -0,0 +1 @@ +5 --- tk8.4-8.4.19.orig/debian/tk8.4-dev.dirs +++ tk8.4-8.4.19/debian/tk8.4-dev.dirs @@ -0,0 +1,2 @@ +usr/lib/tk8.4 +usr/share/tcltk/tk8.4 --- tk8.4-8.4.19.orig/debian/tk8.4-dev.preinst +++ tk8.4-8.4.19/debian/tk8.4-dev.preinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# remove old symlink if it's still hanging around. +if [ -L /usr/share/doc/tk8.4-dev ] ; then + rm -f /usr/share/doc/tk8.4-dev +fi + +#DEBHELPER# --- tk8.4-8.4.19.orig/debian/tk8.4.prerm +++ tk8.4-8.4.19/debian/tk8.4.prerm @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +update-alternatives --remove wish /usr/bin/wish8.4 + +#DEBHELPER# --- tk8.4-8.4.19.orig/debian/tk8.4.postrm +++ tk8.4-8.4.19/debian/tk8.4.postrm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + if [ -d /usr/share/doc/tk8.4/examples ]; then + # brokenness + rm -rf /usr/share/doc/tk8.4/examples + fi +fi + +#DEBHELPER# --- tk8.4-8.4.19.orig/debian/tk8.4.dirs +++ tk8.4-8.4.19/debian/tk8.4.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides --- tk8.4-8.4.19.orig/debian/tk8.4.files +++ tk8.4-8.4.19/debian/tk8.4.files @@ -0,0 +1,4 @@ +usr/bin +usr/share/tcltk/tk8.4 +usr/lib/*.so.* +usr/share/man/man1 --- tk8.4-8.4.19.orig/debian/control +++ tk8.4-8.4.19/debian/control @@ -0,0 +1,46 @@ +Source: tk8.4 +Section: libs +Priority: optional +Maintainer: Tcl/Tk Debian Packagers +Uploaders: Chris Waters , Anselm Lingnau , Sergei Golovan +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.3 +Homepage: http://www.tcl.tk/ + +Package: tk8.4 +Section: libs +Priority: optional +Architecture: any +Depends: ${shlibs:Depends} +Recommends: xterm | x-terminal-emulator +Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5) +Provides: wish +Description: Tk toolkit for Tcl and X11, v8.4 - 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. + +Package: tk8.4-doc +Section: doc +Priority: optional +Architecture: all +Suggests: tk8.4 +Conflicts: tkdoc, tk8.3-doc, tk8.5-doc +Provides: tkdoc +Description: Tk toolkit for Tcl and X11, v8.4 - 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. + +Package: tk8.4-dev +Section: devel +Priority: optional +Architecture: any +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 + look-and-feel and is implemented using the Tcl scripting language. + This package contains the headers and libraries needed to extend + or embed Tk. --- tk8.4-8.4.19.orig/debian/tk8.4-dev.files +++ tk8.4-8.4.19/debian/tk8.4-dev.files @@ -0,0 +1,3 @@ +usr/include +usr/lib/*.a +usr/lib/*.so --- tk8.4-8.4.19.orig/debian/tk8.4.postinst +++ tk8.4-8.4.19/debian/tk8.4.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.4 841 \ + --slave /usr/share/man/man1/wish.1.gz wish.1 \ + /usr/share/man/man1/wish8.4.1.gz +fi + +#DEBHELPER# --- tk8.4-8.4.19.orig/debian/tk8.4.docs +++ tk8.4-8.4.19/debian/tk8.4.docs @@ -0,0 +1,2 @@ +README +changes --- tk8.4-8.4.19.orig/debian/tk8.4.lintian-override +++ tk8.4-8.4.19/debian/tk8.4.lintian-override @@ -0,0 +1 @@ +tk8.4: package-name-doesnt-match-sonames --- tk8.4-8.4.19.orig/debian/patches/tklibrary.diff +++ tk8.4-8.4.19/debian/patches/tklibrary.diff @@ -0,0 +1,22 @@ +--- tk8.4-8.4.19.orig/unix/configure ++++ tk8.4-8.4.19/unix/configure +@@ -5901,7 +5901,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)' +--- tk8.4-8.4.19.orig/unix/configure.in ++++ tk8.4-8.4.19/unix/configure.in +@@ -421,7 +421,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)' --- tk8.4-8.4.19.orig/debian/patches/tkinc.diff +++ tk8.4-8.4.19/debian/patches/tkinc.diff @@ -0,0 +1,74 @@ +Patch by Chris Waters and Sergei Golovan. + +It sets path which are normally point to a directory with +Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules +puts private Tk headers there). + +Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.4 and tkConfig.sh +in /usr/share/tcltk/tk8.4 where they are located in Debian installation. + +--- tk8.4-8.4.19.orig/unix/configure ++++ tk8.4-8.4.19/unix/configure +@@ -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` \ + ; do + if test -f "$i/tclConfig.sh" ; then +--- tk8.4-8.4.19.orig/unix/tkConfig.sh.in ++++ tk8.4-8.4.19/unix/tkConfig.sh.in +@@ -53,7 +53,7 @@ + + # String to pass to linker to pick up the Tk library from its + # build directory. +-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' ++TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@' + + # String to pass to linker to pick up the Tk library from its + # installed directory. +@@ -69,7 +69,7 @@ + # different place than the directory containing the source files, this + # points to the location of the sources, not the location where Tk was + # compiled. +-TK_SRC_DIR='@TK_SRC_DIR@' ++TK_SRC_DIR='@includedir@/tk-private' + + # Needed if you want to make a 'fat' shared library library + # containing tk objects or link a different wish. +@@ -84,14 +84,14 @@ + + # String to pass to linker to pick up the Tk stub library from its + # build directory. +-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' ++TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' + + # String to pass to linker to pick up the Tk stub library from its + # installed directory. + TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' + + # Path to the Tk stub library in the build directory. +-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' ++TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' + + # Path to the Tk stub library in the install directory. + TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' +--- tk8.4-8.4.19.orig/unix/tcl.m4 ++++ tk8.4-8.4.19/unix/tcl.m4 +@@ -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` \ + ; do + if test -f "$i/tclConfig.sh" ; then +@@ -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` \ + ; do + if test -f "$i/tkConfig.sh" ; then --- tk8.4-8.4.19.orig/debian/patches/manpages.diff +++ tk8.4-8.4.19/debian/patches/manpages.diff @@ -0,0 +1,23 @@ +Patch by Chris Waters fixes installing of several manual pages which +aren't installed by upstream script but are referenced inside other +manual pages. + +--- tk8.4-8.4.19.orig/unix/installManPage ++++ tk8.4-8.4.19/unix/installManPage +@@ -49,7 +49,16 @@ + }' $MANPAGE` + + SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'` ++NAME=`basename $MANPAGE .$SECTION` + SRCDIR=`dirname $MANPAGE` ++ ++SPECIALS="FindPhoto" ++for n in $SPECIALS; do ++ if [ "$NAME" = "$n" ] ; then ++ NAMES="$n $NAMES" ++ fi ++done ++ + FIRST="" + for f in $NAMES; do + f=$f.$SECTION$SUFFIX --- tk8.4-8.4.19.orig/debian/patches/non-linux.diff +++ tk8.4-8.4.19/debian/patches/non-linux.diff @@ -0,0 +1,45 @@ +Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes +building on non-linux Debian architectures. + +--- tk8.4-8.4.19.orig/unix/configure ++++ tk8.4-8.4.19/unix/configure +@@ -2002,6 +2002,9 @@ + if test "`uname -s`" = "AIX" ; then + tcl_cv_sys_version=AIX-`uname -v`.`uname -r` + fi ++ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then ++ tcl_cv_sys_version=NetBSD-Debian ++ fi + fi + fi + +@@ -2557,7 +2560,7 @@ + fi + fi + ;; +- Linux*) ++ Linux*|GNU*|NetBSD-Debian) + SHLIB_CFLAGS="-fPIC" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" +--- tk8.4-8.4.19.orig/unix/tcl.m4 ++++ tk8.4-8.4.19/unix/tcl.m4 +@@ -898,6 +898,9 @@ + if test "`uname -s`" = "AIX" ; then + tcl_cv_sys_version=AIX-`uname -v`.`uname -r` + fi ++ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then ++ tcl_cv_sys_version=NetBSD-Debian ++ fi + fi + fi + ]) +@@ -1335,7 +1338,7 @@ + fi + fi + ;; +- Linux*) ++ Linux*|GNU*|NetBSD-Debian) + SHLIB_CFLAGS="-fPIC" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" --- tk8.4-8.4.19.orig/debian/patches/rpath.diff +++ tk8.4-8.4.19/debian/patches/rpath.diff @@ -0,0 +1,64 @@ +Patch by Chris Waters removes -rpath from search flags and adds -soname +to library build options. + +Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl + +--- tk8.4-8.4.19.orig/unix/configure ++++ tk8.4-8.4.19/unix/configure +@@ -2568,12 +2568,15 @@ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + ++ # following line added by CW for Debian GNU/Linux ++ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0" ++ + if test "$have_dl" = yes; then + SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + else + ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` +--- tk8.4-8.4.19.orig/unix/Makefile.in ++++ tk8.4-8.4.19/unix/Makefile.in +@@ -635,7 +635,7 @@ + relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ + echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\ +- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ++ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\ + ) > $(PKG_INDEX); \ + fi + @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" +--- tk8.4-8.4.19.orig/unix/tcl.m4 ++++ tk8.4-8.4.19/unix/tcl.m4 +@@ -1346,20 +1346,23 @@ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + ++ # following line added by CW for Debian GNU/Linux ++ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0" ++ + if test "$have_dl" = yes; then + SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} ++ CC_SEARCH_FLAGS="" ++ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}" + else + AC_CHECK_HEADER(dld.h, [ + SHLIB_LD="ld -shared" + DL_OBJS="tclLoadDld.o" + DL_LIBS="-ldld" + CC_SEARCH_FLAGS="" +- LD_SEARCH_FLAGS=""]) ++ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"]) + fi + if test "`uname -m`" = "alpha" ; then + CFLAGS="$CFLAGS -mieee" --- tk8.4-8.4.19.orig/debian/patches/scalable-fonts.diff +++ tk8.4-8.4.19/debian/patches/scalable-fonts.diff @@ -0,0 +1,43 @@ +Patch by Massimo Dal Zotto provides workaround for long lasting bug +in Xorg (and XFree86). X-server generates extra font name for every +scalable font and pretends these fonts fixed. + +See details in bugs #156119, #156115 and at +http://sourceforge.net/tracker/index.php?func=detail&aid=1544491&group_id=12997&atid=112997 + +Also, added a fix by Sergei Golovan, which provides workaround for the case +when no non-scalable fonts are returned and chosen fixed font is infeasible +(this case was never triggered without tkFont.c patch). + +--- tk8.4-8.4.19.orig/generic/tkFont.c ++++ tk8.4-8.4.19/generic/tkFont.c +@@ -3454,8 +3454,15 @@ + + /* XLFD_SPACING ignored. */ + +- /* XLFD_AVERAGE_WIDTH ignored. */ +- ++ /* ++ * XLFD_AVERAGE_WIDTH == 0 means the font is scalable even if ++ * the X server returned a fixed size. ++ */ ++ if (FieldSpecified(field[XLFD_AVERAGE_WIDTH])) { ++ if (faPtr->size != 0 && atoi(field[XLFD_AVERAGE_WIDTH]) == 0) { ++ faPtr->size = 0; ++ } ++ } + if (FieldSpecified(field[XLFD_CHARSET])) { + xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]); + } else { +--- tk8.4-8.4.19.orig/unix/tkUnixFont.c ++++ tk8.4-8.4.19/unix/tkUnixFont.c +@@ -2660,6 +2660,9 @@ + bestScore[1] = INT_MAX; + } + if (fontStructPtr == NULL) { ++ if (bestIdx[0] < 0) { ++ return GetSystemFont(display); ++ } + fontStructPtr = XLoadQueryFont(display, nameList[bestIdx[0]]); + if (fontStructPtr == NULL) { + /* --- tk8.4-8.4.19.orig/debian/patches/series +++ tk8.4-8.4.19/debian/patches/series @@ -0,0 +1,6 @@ +scalable-fonts.diff +tklibrary.diff +tkinc.diff +rpath.diff +non-linux.diff +manpages.diff