tk8.5 (8.5.8-1) debian-dir only changes

Summary

 debian/README.Debian           |    3 
 debian/README.source           |    8 +
 debian/changelog               |  226 +++++++++++++++++++++++++++++++++++++++++
 debian/compat                  |    1 
 debian/control                 |   46 ++++++++
 debian/copyright               |   74 +++++++++++++
 debian/patches/canvasps.diff   |   23 ++++
 debian/patches/confsearch.diff |   32 +++++
 debian/patches/fontsize.diff   |   21 +++
 debian/patches/manpages.diff   |   23 ++++
 debian/patches/non-linux.diff  |   45 ++++++++
 debian/patches/rpath.diff      |   40 +++++++
 debian/patches/series          |    7 +
 debian/patches/tklibrary.diff  |   22 +++
 debian/patches/tkport.diff     |   14 ++
 debian/patches/tkprivate.diff  |   41 +++++++
 debian/rules                   |  182 +++++++++++++++++++++++++++++++++
 debian/shlibs.local            |    1 
 debian/tk8.5-dev.dirs          |    2 
 debian/tk8.5-dev.files         |    3 
 debian/tk8.5-doc.files         |    1 
 debian/tk8.5.dirs              |    1 
 debian/tk8.5.docs              |    2 
 debian/tk8.5.files             |    4 
 debian/tk8.5.lintian-override  |    1 
 debian/tk8.5.menu              |    4 
 debian/tk8.5.postinst          |   11 +
 debian/tk8.5.postrm            |   12 ++
 debian/tk8.5.preinst           |   12 ++
 debian/tk8.5.prerm             |    9 +
 debian/watch                   |    2 
 31 files changed, 873 insertions(+)

    
download this patch

Patch contents

--- tk8.5-8.5.8.orig/debian/changelog
+++ tk8.5-8.5.8/debian/changelog
@@ -0,0 +1,226 @@
+tk8.5 (8.5.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 17 Nov 2009 22:52:55 +0300
+
+tk8.5 (8.5.7-2) unstable; urgency=low
+
+  * Added libxft-dev to tk8.5-dev dependencies because -lXft is stored in
+    tkConfig.sh configuration script.
+  * Added README.source file wich explains how to get patched source tree from
+    the original tarball and set of patches in debian/patches.
+  * Bumped standards version to 3.8.3.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 30 Oct 2009 11:10:23 +0300
+
+tk8.5 (8.5.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards version to 3.8.1.
+  * Removed patch which copied newly created image format name because the
+    bug is fixed upstream.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 17 Apr 2009 19:09:21 +0400
+
+tk8.5 (8.5.6-3) unstable; urgency=low
+
+  * Don't remove wish alternative in case of package upgrade because the
+    manually installed alternative is also removed which isn't desirable
+    (closes: #517182).
+  * Added a patch which copies image format name internally and doesn't
+    require it to live till the end of thread life (closes: #517159).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sun, 01 Mar 2009 10:38:14 +0300
+
+tk8.5 (8.5.6-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Fixed showing widget options in manual pages (closes: #516311).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 25 Feb 2009 16:34:01 +0300
+
+tk8.5 (8.5.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * Removed patch which fixed mirrored text in canvas postscript because
+    the bug is fixed upstream.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 24 Dec 2008 14:24:03 +0300
+
+tk8.5 (8.5.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * Fixed bug with mirrored text in canvas postscript output
+    (closes: #498408).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 17 Oct 2008 12:41:07 +0400
+
+tk8.5 (8.5.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sat, 23 Aug 2008 16:40:42 +0400
+
+tk8.5 (8.5.3-4) unstable; urgency=low
+
+  * Fixed bug with mirrored text in canvas postscript output
+    (closes: #498408).
+  * Install ttk private headers which are necessary to develop ttk extensions
+    or themes (closes: #500934, #504981).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sat, 08 Nov 2008 19:31:30 +0300
+
+tk8.5 (8.5.3-3) unstable; urgency=low
+
+  * Added missing libxss-dev and libxext-dev dependencies to tk8.5-dev
+    package (closes: #491629).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Mon, 21 Jul 2008 11:24:51 +0400
+
+tk8.5 (8.5.3-2) unstable; urgency=low
+
+  * Added a patch by upstream to mitigate a design bug in Tk event system
+    (Tk events break if built with x11proto-core 7.0.13).
+  * Decreased priority of tclsh (and corresponding manpage) alternative
+    because tcl8.4 is still a default Tcl package.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 15 Jul 2008 20:47:11 +0400
+
+tk8.5 (8.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 02 Jul 2008 21:10:05 +0400
+
+tk8.5 (8.5.2-2) unstable; urgency=low
+
+  * Fixed clean target to work with debhelper 7.0 (made dh_clean the last
+    command, so debhelper logs are removed now).
+  * Protected quilt calls in debian/rules to make the source package
+    convertible to 3.0 (quilt) format (closes: #484927).
+  * Added a patch by Stanislav Maslovski which restores relative inlude path
+    for tkUnixPort.h in tkPort.h. This is harmless if unix directory is
+    included into a serach path but allows to maintain backward compatibility
+    (closes: #488501).
+  * Removed obsolete package x-dev from build dependencies. This means tk8.5
+    will not built on sarge anymore.
+  * Bumped standards version to 3.8.0.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Mon, 30 Jun 2008 14:08:57 +0400
+
+tk8.5 (8.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed a font patch because its lighter version was included into
+    upstream distribution.
+  * 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.
+  * Explicitly specified configure options --host and --build to make build
+    results more predictable.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 01 Apr 2008 15:51:47 +0400
+
+tk8.5 (8.5.1-2) unstable; urgency=low
+
+  * Added an experimental patch which makes choosing a font for a given
+    character more reliable even in case of incorrect fontconfig setup
+    (closes: #465462).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 20 Feb 2008 21:56:37 +0300
+
+tk8.5 (8.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Increased priority of /usr/bin/wish8.5 as an alternative to
+    /usr/bin/wish.
+  * Overridden lintian warning package-name-doesnt-match-sonames since tk8.5
+    package contains not only a library, and it's unreasonable to split it
+    into smaller parts.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 05 Feb 2008 20:38:38 +0300
+
+tk8.5 (8.5.0-3) unstable; urgency=high
+
+  * Applied patch by upstream to fix security vulnerability CVE-2006-4484
+    overflow triggered by crafted GIF file.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Mon, 04 Feb 2008 23:28:55 +0300
+
+tk8.5 (8.5.0-2) unstable; urgency=low
+
+  * Fixed tcl8.5 version in build-dependencies (closes: #458935).
+
+ -- Sergei Golovan <sgolovan@debian.org>  Thu, 03 Jan 2008 23:01:49 +0300
+
+tk8.5 (8.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed empty directory /usr/share/tk8.5 from the binary package.
+  * Added uscan control file debian/watch.
+  * Changed tk8.5 version in shlibs to 8.5.0.
+  * Bumped standards version to 3.7.3.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 19 Dec 2007 11:19:51 +0300
+
+tk8.5 (0.b3-1) unstable; urgency=low
+
+  * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 21 Nov 2007 19:03:48 +0300
+
+tk8.5 (0.b2-1) unstable; urgency=low
+
+  * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 26 Oct 2007 22:08:59 +0400
+
+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. To keep backward compatibility tkConfig.sh is
+    linked into /usr/lib/tk8.5 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.
+  * Rearranged conflicts of tk8.5-doc package because of planned adoption of
+    real tk-doc package.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 19 Oct 2007 16:08:15 +0400
+
+tk8.5 (0.b1-1) unstable; urgency=low
+
+  * New upstream beta release.
+  * Upload to debian archive (closes: #443969).
+  * Cleaned up patches in debian/patches directory.
+  * Added /usr/lib/tcl8.5 to a search path for tclConfig.sh and /usr/lib/tk8.5
+    to a search path for tkConfig.sh in tcl.m4.
+  * Removed TK_INC_DIR from tkConfig.sh and tcl.m4.
+  * Bumped debhelper compatibility to 5.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 28 Sep 2007 19:08:11 +0400
+
+tk8.5 (0.a6-1) unstable; urgency=low
+
+  * New upstream alpha release.
+  * Added Sergei Golovan to uploaders list.
+  * Added missed build dependency on quilt.
+  * Added headers from compat directory to tk8.5-dev package.
+  * Added list of copyright holders to debian/copyright.
+  * Removed --enable-64bit configure option from debian/rules.
+  * Removed tk-dev from packages which conflict with tk8.5-dev.
+  * Replaced deprecated ${Source-Version} substitution variable by
+    ${binary:Version}.
+  * Moved menu item from obsolete Apps to Applications section.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sat, 15 Sep 2007 12:20:00 +0400
+
+tk8.5 (0.a5-1) unstable; urgency=low
+
+  * Initial alpha release.
+
+ -- Chris Waters <xtifr@debian.org>  Fri, 26 Jan 2007 23:01:39 +0300
+
--- tk8.5-8.5.8.orig/debian/rules
+++ tk8.5-8.5.8/debian/rules
@@ -0,0 +1,182 @@
+#!/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.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 || test $$? = 2
+	rm -rf patch-stamp .pc
+
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	quilt push -a || test $$? = 2
+	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 \
+		      --disable-rpath \
+		      --enable-xft \
+		      --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
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+clean-patched: patch-stamp
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+	cd unix && [ ! -f Makefile ] || $(MAKE) distclean
+
+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/ttk
+	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic
+	cp generic/ttk/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic/ttk
+	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' \
+			       -e 's/^\.de OP$$/.de OOP/' \
+			       -e 's/^.OP /.OOP /' \
+			 | 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.5.0)'
+	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.5_8.5.8.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.8-src.tar.gz
+
+.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
+
--- tk8.5-8.5.8.orig/debian/tk8.5-doc.files
+++ tk8.5-8.5.8/debian/tk8.5-doc.files
@@ -0,0 +1 @@
+usr/share/man/man3
--- tk8.5-8.5.8.orig/debian/tk8.5.files
+++ tk8.5-8.5.8/debian/tk8.5.files
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/tcltk/tk8.5
+usr/lib/*.so.*
+usr/share/man/man1
--- tk8.5-8.5.8.orig/debian/README.Debian
+++ tk8.5-8.5.8/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.5-8.5.8.orig/debian/shlibs.local
+++ tk8.5-8.5.8/debian/shlibs.local
@@ -0,0 +1 @@
+libtk8.5	1	
--- tk8.5-8.5.8.orig/debian/watch
+++ tk8.5-8.5.8/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/tcl/tk(8\.5\.\d+)-src\.tar\.gz
--- tk8.5-8.5.8.orig/debian/tk8.5.dirs
+++ tk8.5-8.5.8/debian/tk8.5.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
--- tk8.5-8.5.8.orig/debian/copyright
+++ tk8.5-8.5.8/debian/copyright
@@ -0,0 +1,74 @@
+This package was debianized by David Engel <david@debiang.org>
+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.5-8.5.8.orig/debian/tk8.5.postrm
+++ tk8.5-8.5.8/debian/tk8.5.postrm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+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
+fi
+
+#DEBHELPER#
--- tk8.5-8.5.8.orig/debian/tk8.5.lintian-override
+++ tk8.5-8.5.8/debian/tk8.5.lintian-override
@@ -0,0 +1 @@
+tk8.5: package-name-doesnt-match-sonames
--- tk8.5-8.5.8.orig/debian/compat
+++ tk8.5-8.5.8/debian/compat
@@ -0,0 +1 @@
+5
--- tk8.5-8.5.8.orig/debian/tk8.5-dev.files
+++ tk8.5-8.5.8/debian/tk8.5-dev.files
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.so
--- tk8.5-8.5.8.orig/debian/tk8.5-dev.dirs
+++ tk8.5-8.5.8/debian/tk8.5-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib/tk8.5
+usr/share/tcltk/tk8.5
--- tk8.5-8.5.8.orig/debian/tk8.5.preinst
+++ tk8.5-8.5.8/debian/tk8.5.preinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+    if [ -d /usr/lib/tk8.5/demos ]; then
+	# brokenness
+	rm -rf /usr/lib/tk8.5/demos
+    fi
+fi
+
+#DEBHELPER#
--- tk8.5-8.5.8.orig/debian/tk8.5.prerm
+++ tk8.5-8.5.8/debian/tk8.5.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ $1 != "upgrade" ] ; then
+    update-alternatives --remove wish /usr/bin/wish8.5
+fi
+
+#DEBHELPER#
--- tk8.5-8.5.8.orig/debian/control
+++ tk8.5-8.5.8/debian/control
@@ -0,0 +1,46 @@
+Source: tk8.5
+Section: libs
+Priority: optional
+Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel@lists.alioth.debian.org>
+Uploaders: Chris Waters <xtifr@debian.org>, Sergei Golovan <sgolovan@debian.org>
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0), quilt
+Standards-Version: 3.8.3
+Homepage: http://www.tcl.tk/
+
+Package: tk8.5
+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.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.
+
+Package: tk8.5-doc
+Section: doc
+Priority: optional
+Architecture: all
+Suggests: tk8.5
+Conflicts: tkdoc, tk8.3-doc, tk8.4-doc
+Provides: tkdoc
+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.
+
+Package: tk8.5-dev
+Section: devel
+Priority: optional
+Architecture: any
+Depends: x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0), 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.
--- tk8.5-8.5.8.orig/debian/tk8.5.postinst
+++ tk8.5-8.5.8/debian/tk8.5.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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
+fi
+
+#DEBHELPER#
--- tk8.5-8.5.8.orig/debian/README.source
+++ tk8.5-8.5.8/debian/README.source
@@ -0,0 +1,8 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get detailed instructions on how to apply the series of patches
+and modify them, please read /usr/share/doc/quilt/README.source
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sat, 05 Sep 2009 11:33:56 +0400
--- tk8.5-8.5.8.orig/debian/tk8.5.menu
+++ tk8.5-8.5.8/debian/tk8.5.menu
@@ -0,0 +1,4 @@
+?package(tk8.5):needs="x11"\
+	section="Applications/Programming"\
+	title="TkWish8.5"\
+	command="x-terminal-emulator -e /usr/bin/wish8.5"
--- tk8.5-8.5.8.orig/debian/tk8.5.docs
+++ tk8.5-8.5.8/debian/tk8.5.docs
@@ -0,0 +1,2 @@
+README
+changes
--- tk8.5-8.5.8.orig/debian/patches/confsearch.diff
+++ tk8.5-8.5.8/debian/patches/confsearch.diff
@@ -0,0 +1,32 @@
+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.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,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.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tclConfig.sh" ; then
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,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.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,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.5 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			; do
+ 		    if test -f "$i/tkConfig.sh" ; then
--- tk8.5-8.5.8.orig/debian/patches/tkprivate.diff
+++ tk8.5-8.5.8/debian/patches/tkprivate.diff
@@ -0,0 +1,41 @@
+Patch by Chris Waters 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).
+
+--- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.8/unix/tkConfig.sh.in
+@@ -55,7 +55,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.
+@@ -71,7 +71,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.
+@@ -86,14 +86,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.5-8.5.8.orig/debian/patches/tklibrary.diff
+++ tk8.5-8.5.8/debian/patches/tklibrary.diff
@@ -0,0 +1,22 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -11070,7 +11070,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)'
+--- tk8.5-8.5.8.orig/unix/configure.in
++++ tk8.5-8.5.8/unix/configure.in
+@@ -607,7 +607,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)'
--- tk8.5-8.5.8.orig/debian/patches/tkport.diff
+++ tk8.5-8.5.8/debian/patches/tkport.diff
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski@gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
+
+--- tk8.5-8.5.8.orig/generic/tkPort.h
++++ tk8.5-8.5.8/generic/tkPort.h
+@@ -29,7 +29,7 @@
+ #   if defined(MAC_OSX_TK)
+ #	include "tkMacOSXPort.h"
+ #   else
+-#	include "tkUnixPort.h"
++#	include "../unix/tkUnixPort.h"
+ #   endif
+ #endif
+ 
--- tk8.5-8.5.8.orig/debian/patches/fontsize.diff
+++ tk8.5-8.5.8/debian/patches/fontsize.diff
@@ -0,0 +1,21 @@
+Patch by Sergei Golovan fixes mirroring font in canvas postscript when its
+size is specified in pixels (negative).
+
+--- tk8.5-8.5.4.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.4/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+     ftFont = GetFont(fontPtr, 0);
+     fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+     GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++    fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+     GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+ 
+     return fontPtr;
+@@ -517,6 +518,7 @@
+ 				/* Actual font used to render the character */
+ 
+     GetTkFontAttributes(ftFont, faPtr);
++    faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+     faPtr->underline = fontPtr->font.fa.underline;
+     faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
--- tk8.5-8.5.8.orig/debian/patches/canvasps.diff
+++ tk8.5-8.5.8/debian/patches/canvasps.diff
@@ -0,0 +1,23 @@
+Patch by Sergei Golovan.
+
+It ensures that font size is positive (measured in pixels). This fixes
+mirrored text problem in canvas postscript output.
+
+--- tk8.5-8.5.5.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.5/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+     ftFont = GetFont(fontPtr, 0);
+     fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+     GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++    fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+     GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+ 
+     return fontPtr;
+@@ -518,6 +519,7 @@
+ 
+     GetTkFontAttributes(ftFont, faPtr);
+     faPtr->underline = fontPtr->font.fa.underline;
++    faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+     faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
+ 
--- tk8.5-8.5.8.orig/debian/patches/manpages.diff
+++ tk8.5-8.5.8/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.5-8.5.8.orig/unix/installManPage
++++ tk8.5-8.5.8/unix/installManPage
+@@ -51,7 +51,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.5-8.5.8.orig/debian/patches/non-linux.diff
+++ tk8.5-8.5.8/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.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -4742,6 +4742,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
+ 
+@@ -5546,7 +5549,7 @@
+ fi
+ 
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -962,6 +962,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
+     ])
+@@ -1422,7 +1425,7 @@
+ 	        ])
+ 	    ])
+ 	    ;;
+-	Linux*)
++	Linux*|GNU*|NetBSD-Debian)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
--- tk8.5-8.5.8.orig/debian/patches/rpath.diff
+++ tk8.5-8.5.8/debian/patches/rpath.diff
@@ -0,0 +1,40 @@
+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.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -5557,6 +5557,9 @@
+ 	    # 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"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+--- tk8.5-8.5.8.orig/unix/Makefile.in
++++ tk8.5-8.5.8/unix/Makefile.in
+@@ -713,7 +713,7 @@
+ 	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
+ 	    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 $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
+ 	    ) > "$(PKG_INDEX)"; \
+ 	    fi
+ 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -1433,6 +1433,9 @@
+ 	    # 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"
++
+ 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
--- tk8.5-8.5.8.orig/debian/patches/series
+++ tk8.5-8.5.8/debian/patches/series
@@ -0,0 +1,7 @@
+tkport.diff
+tklibrary.diff
+tkprivate.diff
+confsearch.diff
+rpath.diff
+non-linux.diff
+manpages.diff