[Pkg-tcltk-commits] r672 - in tcl8.6/trunk: . debian debian/patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Mon Jun 30 11:53:20 UTC 2008
Author: sgolovan-guest
Date: 2008-06-30 11:53:18 +0000 (Mon, 30 Jun 2008)
New Revision: 672
Added:
tcl8.6/trunk/debian/
tcl8.6/trunk/debian/README.Debian
tcl8.6/trunk/debian/README.TCL_INC
tcl8.6/trunk/debian/changelog
tcl8.6/trunk/debian/compat
tcl8.6/trunk/debian/control
tcl8.6/trunk/debian/copyright
tcl8.6/trunk/debian/patches/
tcl8.6/trunk/debian/patches/confsearch.diff
tcl8.6/trunk/debian/patches/manpages.diff
tcl8.6/trunk/debian/patches/non-linux.diff
tcl8.6/trunk/debian/patches/rpath.diff
tcl8.6/trunk/debian/patches/series
tcl8.6/trunk/debian/patches/tcllibrary.diff
tcl8.6/trunk/debian/patches/tclpackagepath.diff
tcl8.6/trunk/debian/patches/tclport.diff
tcl8.6/trunk/debian/patches/tclprivate.diff
tcl8.6/trunk/debian/rules
tcl8.6/trunk/debian/shlibs.local
tcl8.6/trunk/debian/tcl8.6-dev.dirs
tcl8.6/trunk/debian/tcl8.6-dev.docs
tcl8.6/trunk/debian/tcl8.6-dev.files
tcl8.6/trunk/debian/tcl8.6-doc.files
tcl8.6/trunk/debian/tcl8.6.dirs
tcl8.6/trunk/debian/tcl8.6.docs
tcl8.6/trunk/debian/tcl8.6.files
tcl8.6/trunk/debian/tcl8.6.lintian-override
tcl8.6/trunk/debian/tcl8.6.menu
tcl8.6/trunk/debian/tcl8.6.postinst
tcl8.6/trunk/debian/tcl8.6.prerm
tcl8.6/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: tcl8.6/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: tcl8.6/trunk/debian/README.Debian
===================================================================
--- tcl8.6/trunk/debian/README.Debian (rev 0)
+++ tcl8.6/trunk/debian/README.Debian 2008-06-30 11:53:18 UTC (rev 672)
@@ -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.
Added: tcl8.6/trunk/debian/README.TCL_INC
===================================================================
--- tcl8.6/trunk/debian/README.TCL_INC (rev 0)
+++ tcl8.6/trunk/debian/README.TCL_INC 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,17 @@
+Packages which used to use the debian-specific hack TCL_INC_DIR from
+tclConfig.sh to find the tcl (or tk) headers should be modified to use
+the new patented upstream TCL_INCLUDE_SPEC variable instead.
+
+TCL_INCLUDE_SPEC is a little different than TCL_INC_DIR -- it includes
+a "-I" in front of the path, so if you were using "-I$TCL_INC_DIR",
+you should change it to just "$TCL_INCLUDE_SPEC". If you were doing
+something with TCL_INC_DIR that isn't compatible with have "-I" at the
+front, LET US KNOW!
+
+TCL_INC_DIR is removed from tcl8.5 and wasn't introduced in tcl8.6.
+So, anything still using TCL_INC_DIR will *break* if you want to build
+it with Tcl/Tk 8.6! If you have a problem with that, LET US KNOW, as
+soon as possible!
+
+cheers
+Chris Waters, 8 Dec 2002, Sergei Golovan, 26 Jun 2008
Added: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog (rev 0)
+++ tcl8.6/trunk/debian/changelog 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,6 @@
+tcl8.6 (8.6.0~a1-1) experimental; urgency=low
+
+ * Initial alpha release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 26 Jun 2008 20:10:45 +0400
+
Added: tcl8.6/trunk/debian/compat
===================================================================
--- tcl8.6/trunk/debian/compat (rev 0)
+++ tcl8.6/trunk/debian/compat 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+5
Added: tcl8.6/trunk/debian/control
===================================================================
--- tcl8.6/trunk/debian/control (rev 0)
+++ tcl8.6/trunk/debian/control 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,43 @@
+Source: tcl8.6
+Section: libs
+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), quilt
+Standards-Version: 3.8.0
+Homepage: http://www.tcl.tk/
+
+Package: tcl8.6
+Section: interpreters
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: tcl74 (<= 7.4p3-2)
+Provides: tclsh
+Suggests: tclreadline
+Description: Tcl (the Tool Command Language) v8.6 - run-time files
+ Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
+ scripting language. This package contains everything you need to run
+ Tcl scripts and Tcl-enabled apps. This version includes thread support.
+
+Package: tcl8.6-doc
+Section: doc
+Priority: optional
+Architecture: all
+Suggests: tcl8.6
+Conflicts: tcldoc
+Provides: tcldoc
+Description: Tcl (the Tool Command Language) v8.6 - manual pages
+ Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
+ scripting language. This package contains the man pages for Tcl commands.
+
+Package: tcl8.6-dev
+Section: devel
+Priority: optional
+Architecture: any
+Depends: tcl8.6 (= ${binary:Version})
+Suggests: tcl8.6-doc
+Description: Tcl (the Tool Command Language) v8.6 - development files
+ Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
+ scripting language. This package contains the headers and libraries
+ needed to embed or extend Tcl.
Added: tcl8.6/trunk/debian/copyright
===================================================================
--- tcl8.6/trunk/debian/copyright (rev 0)
+++ tcl8.6/trunk/debian/copyright 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,152 @@
+This package was originally debianized by David Engel <david at debiang.org>
+from sources obtained at http://prdownloads.sourceforge.net/tcl
+
+List of copyright holders mentioned in individual files:
+
+Copyright 1983, 1987-1994 The Regents of the University of California
+Copyright 1992-1999 Karl Lehenbauer and Mark Diekhans
+Copyright 1992,1993,1995,1996, Jens-Uwe Mager, Helios Software GmbH
+Copyright 1992-1996 Free Software Foundation, Inc.
+Copyright 1993-1994 Lockheed Missle & Space Company, AI Center
+Copyright 1993-1997 Bell Labs Innovations for Lucent Technologies
+Copyright 1993-1998 Lucent Technologies
+Copyright 1994-2000 Sun Microsystems, Inc.
+Copyright 1995 General Electric Company
+Copyright 1995 Dave Nebinger
+Copyright 1995-1997 Roger E. Critchlow Jr
+Copyright 1996 Lucent Technologies and Jim Ingham
+Copyright 1997-2000 Ajuba Solutions
+Copyright 1998-2000 Scriptics Corporation
+Copyright 1998-1999 Henry Spencer
+Copyright 1998 Paul Duffin
+Copyright 1998 Mark Harrison
+Copyright 1998 Nat Pryce
+Copyright 1999 America Online, Inc.
+Copyright 1999-2000,2002,2004-2007 Andreas Kupries
+Copyright 2000-2001 ActiveState Corporation, et al
+Copyright 2001 ActiveState Tool Corp.
+Copyright 2001-2002 Apple Computer, Inc.
+Copyright 2001-2004 David Gravereaux
+Copyright 2001-2004 Vincent Darley
+Copyright 2001-2008 Donal K. Fellows
+Copyright 2001-2008 ActiveState Corporation
+Copyright 2001-2007 Kevin B. Kenny
+Copyright 2001-2008 Daniel A. Steffen
+Copyright 2002-2007 Miguel Sofer
+Copyright 2003 Simon Geard
+Copyright 2003-2004 Georgios Petasis
+Copyright 2003-2004,2006-2008 Joe Mistachkin
+Copyright 2003-2008 Pat Thoyts
+Copyright 2004 Zoran Vasiljevic
+Copyright 2005,2008 George Peter Staplin
+Copyright 2006 Neil Madden
+Copyright 2006 Peter Spjuth
+Copyright 2008 Tcl Core Team
+Contributions from Don Porter, NIST, 2002-2003. (not subject to US copyright)
+
+Copyright:
+
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., Scriptics Corporation,
+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.
+
+Several files are distributed under other conditions:
+
+compat/strftime.c:
+/*
+ * strftime.c --
+ *
+ * This file contains a modified version of the BSD 4.4 strftime
+ * function.
+ *
+ * This file is a modified version of the strftime.c file from the BSD 4.4
+ * source. See the copyright notice below for details on redistribution
+ * restrictions. The "license.terms" file does not apply to this file.
+ *
+ * Changes 2002 Copyright (c) 2002 ActiveState Corporation.
+ *
+ * RCS: @(#) $Id: strftime.c,v 1.10.2.3 2005/11/04 18:18:04 kennykb Exp $
+ */
+
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+compat/dlfcn.h and unix/tclLoadAix.c:
+ * This file is subject to the following copyright notice, which is
+ * different from the notice used elsewhere in Tcl but rougly
+ * equivalent in meaning.
+ *
+ * Copyright (c) 1992,1993,1995,1996, Jens-Uwe Mager, Helios Software GmbH
+ * Not derived from licensed software.
+ *
+ * Permission is granted to freely use, copy, modify, and redistribute
+ * this software, provided that the author is not construed to be liable
+ * for any results of using the software, alterations are clearly marked
+ * as such, and this notice is not modified.
+
Added: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/confsearch.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,22 @@
+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.
+
+--- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a1/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
Added: tcl8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.6/trunk/debian/patches/manpages.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/manpages.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -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.
+
+--- tcl8.6-8.6.0~a1.orig/unix/installManPage
++++ tcl8.6-8.6.0~a1/unix/installManPage
+@@ -48,8 +48,16 @@
+ *.n) SECTION=n ;;
+ esac
+
++NAME=`basename $MANPAGE .$SECTION`
+ SRCDIR=`dirname $MANPAGE`
+
++SPECIALS="DString Thread Notifier RegExp"
++for n in $SPECIALS; do
++ if [ "$NAME" = "$n" ] ; then
++ NAMES="$n $NAMES"
++ fi
++done
++
+ FIRST=""
+ for f in $NAMES; do
+ f=$f.$SECTION$SUFFIX
Added: tcl8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.6/trunk/debian/patches/non-linux.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/non-linux.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,55 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- tcl8.6-8.6.0~a1.orig/unix/configure
++++ tcl8.6-8.6.0~a1/unix/configure
+@@ -6536,6 +6536,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
++ system=NetBSD-Debian
++ fi
+ fi
+ fi
+
+@@ -7333,7 +7336,7 @@
+ fi
+
+ ;;
+- Linux*)
++ Linux*|GNU*|NetBSD-Debian)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+--- tcl8.6-8.6.0~a1.orig/unix/Makefile.in
++++ tcl8.6-8.6.0~a1/unix/Makefile.in
+@@ -169,6 +169,7 @@
+ SHLIB_LD = @SHLIB_LD@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
++SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
+ TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
+
+ SHLIB_SUFFIX = @SHLIB_SUFFIX@
+--- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a1/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
+ ])
+@@ -1418,7 +1421,7 @@
+ ])
+ ])
+ ;;
+- Linux*)
++ Linux*|GNU*|NetBSD-Debian)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
Added: tcl8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/rpath.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/rpath.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,41 @@
+Patch by Chris Waters removes -rpath from search flags and adds -soname
+to library build options.
+
+--- tcl8.6-8.6.0~a1.orig/unix/configure
++++ tcl8.6-8.6.0~a1/unix/configure
+@@ -7344,6 +7344,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
++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+--- tcl8.6-8.6.0~a1.orig/unix/Makefile.in
++++ tcl8.6-8.6.0~a1/unix/Makefile.in
+@@ -742,7 +742,10 @@
+ fi
+ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ @@INSTALL_LIB@
+- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
++ mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
++ ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
++ ln -sf "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 ./
++ @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
+ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
+ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+--- tcl8.6-8.6.0~a1.orig/unix/tcl.m4
++++ tcl8.6-8.6.0~a1/unix/tcl.m4
+@@ -1429,6 +1429,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
++ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
++
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
Added: tcl8.6/trunk/debian/patches/series
===================================================================
--- tcl8.6/trunk/debian/patches/series (rev 0)
+++ tcl8.6/trunk/debian/patches/series 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,8 @@
+tclport.diff
+tcllibrary.diff
+tclpackagepath.diff
+tclprivate.diff
+confsearch.diff
+rpath.diff
+non-linux.diff
+manpages.diff
Added: tcl8.6/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tcllibrary.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/tcllibrary.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,33 @@
+--- tcl8.6-8.6.0~a1.orig/unix/configure
++++ tcl8.6-8.6.0~a1/unix/configure
+@@ -18724,7 +18724,7 @@
+
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+
+--- tcl8.6-8.6.0~a1.orig/unix/configure.in
++++ tcl8.6-8.6.0~a1/unix/configure.in
+@@ -713,7 +713,7 @@
+
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+
+--- tcl8.6-8.6.0~a1.orig/library/init.tcl
++++ tcl8.6-8.6.0~a1/library/init.tcl
+@@ -48,7 +48,7 @@
+ }
+ namespace eval tcl {
+ variable Dir
+- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
++ foreach Dir [list $::tcl_library] {
+ if {$Dir ni $::auto_path} {
+ lappend ::auto_path $Dir
+ }
Added: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,32 @@
+Patch by Sergei Golovan allows to specify TCL_PACKAGE_PATH at configure stage
+without adding /usr/lib to it. It helps to put the policy compliant value to
+::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
+
+--- tcl8.6-8.6.0~a1.orig/unix/configure
++++ tcl8.6-8.6.0~a1/unix/configure
+@@ -18861,9 +18861,9 @@
+ test -z "$TCL_MODULE_PATH" && \
+ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
+ fi
+
+ #--------------------------------------------------------------------
+--- tcl8.6-8.6.0~a1.orig/unix/configure.in
++++ tcl8.6-8.6.0~a1/unix/configure.in
+@@ -812,9 +812,9 @@
+ test -z "$TCL_MODULE_PATH" && \
+ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
+ fi
+
+ #--------------------------------------------------------------------
Added: tcl8.6/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclport.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/tclport.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
+
+--- tcl8.6-8.6.0~a1.orig/generic/tclPort.h
++++ tcl8.6-8.6.0~a1/generic/tclPort.h
+@@ -24,7 +24,7 @@
+ #if defined(__WIN32__)
+ # include "../win/tclWinPort.h"
+ #else
+-# include "tclUnixPort.h"
++# include "../unix/tclUnixPort.h"
+ #endif
+
+ #if !defined(LLONG_MIN)
Added: tcl8.6/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclprivate.diff (rev 0)
+++ tcl8.6/trunk/debian/patches/tclprivate.diff 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,41 @@
+Patch by Chris Waters sets paths which are normally point to a directory
+with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
+puts private Tcl headers there).
+
+--- tcl8.6-8.6.0~a1.orig/unix/tclConfig.sh.in
++++ tcl8.6-8.6.0~a1/unix/tclConfig.sh.in
+@@ -111,7 +111,7 @@
+
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
+-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
++TCL_BUILD_LIB_SPEC='@TCL_LIB_SPEC@'
+
+ # String to pass to linker to pick up the Tcl library from its
+ # installed directory.
+@@ -146,7 +146,7 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tcl was
+ # compiled.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR='@includedir@/tcl-private'
+
+ # List of standard directories in which to look for packages during
+ # "package require" commands. Contains the "prefix" directory plus also
+@@ -164,14 +164,14 @@
+
+ # String to pass to linker to pick up the Tcl stub library from its
+ # build directory.
+-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
++TCL_BUILD_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+
+ # String to pass to linker to pick up the Tcl stub library from its
+ # installed directory.
+ TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
+
+ # Path to the Tcl stub library in the build directory.
+-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
++TCL_BUILD_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+
+ # Path to the Tcl stub library in the install directory.
+ TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
Added: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules (rev 0)
+++ tcl8.6/trunk/debian/rules 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,188 @@
+#!/usr/bin/make -f
+# debian/rules that uses debhelper.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+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.6
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS=-g -O0
+else
+# See bug #446335 for -fno-unit-at-a-time
+ifeq ($(DEB_HOST_ARCH), hppa)
+# Disable stack checking for hppa (it doesn't work properly yet)
+CFLAGS=-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1
+else
+CFLAGS=-g -O2 -fno-unit-at-a-time
+endif
+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
+ # So so ugly but it works...
+ touch generic/tclStubInit.c
+ cd unix && \
+ TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
+ TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
+ ./configure --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --includedir=/usr/include/tcl$(v) \
+ --enable-shared \
+ --enable-threads \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --enable-man-symlinks \
+ --enable-man-compression=gzip && \
+ touch ../generic/tclStubInit.c && \
+ $(MAKE) CFLAGS="$(CFLAGS)"
+ # Build the static library.
+ cd unix && \
+ ar cr libtcl$(v).a *.o && \
+ ar d libtcl$(v).a tclAppInit.o && \
+ ranlib libtcl$(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
+ # Remove forgotten files
+ rm -f tests/pkg/pkga.so unix/config.log unix/Tcltest.so
+
+install: install-stamp
+install-stamp: build-stamp
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ 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 \
+ TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
+ install
+ # Fix up the modules.
+ sed -i -e's:variable paths {}:variable paths {/usr/share/tcltk/tcl$(v)/tcl8}:' \
+ debian/tmp/usr/share/tcltk/tcl$(v)/tm.tcl
+ install -d -m 755 `pwd`/debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
+ mv debian/tmp/usr/share/tcltk/tcl8/*/* debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
+ # Fix up the libraries.
+ cp unix/libtcl$(v).a debian/tmp/usr/lib
+ #mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
+ #ln -sf libtcl$(v).so.0 debian/tmp/usr/lib/libtcl$(v).so
+ mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tcl$(v)
+ cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
+ rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
+ # Fix up the include files.
+ install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
+ cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
+ install -d debian/tmp/usr/include/tcl$(v)/tcl-private/unix
+ cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
+ install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+ cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+ # Fix up the manpages.
+ cd debian/tmp/usr/share/man/man1 && \
+ zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
+ rm tclsh.1.gz
+ cd debian/tmp/usr/share/man/man3 && \
+ for f in *.[3n].gz ; do \
+ f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
+ if [ -L $$f ]; then \
+ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
+ rm $$f ; \
+ ln -sf $$l $$f2 ; \
+ else \
+ zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+ -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
+ -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
+ -e 's/send(n)/send(3tk)/g' \
+ -e 's/text(n)/text(3tk)/g' \
+ -e 's/tk(n)/tk(3tk)/g' \
+ -e 's/winfo(n)/winfo(3tk)/g' \
+ -e 's/(n)/(3tcl)/g' \
+ -e "s/\\N'244'/\\[^o]/g" \
+ | gzip -9 >$$f2 ; \
+ rm $$f ; \
+ fi ; \
+ done
+ 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 and .m4
+ mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tcl.m4 \
+ debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
+ mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tclConfig.sh \
+ debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
+ ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
+ debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
+ dh_installdocs -a
+ dh_installmenu -a
+ dh_installchangelogs -a ChangeLog
+ install -m 644 debian/tcl$(v).lintian-override \
+ debian/tcl$(v)/usr/share/lintian/overrides/tcl$(v)
+ dh_fixperms -a
+ dh_strip -a
+ dh_compress -a
+ dh_makeshlibs -a -V 'tcl$(v) (>= 8.6.0~a1)' -XTcltest
+ dh_installdeb -a
+ dh_shlibdeps -a -ldebian/tcl$(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 tcl8.6_8.6.0~a1.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl8.6a1-src.tar.gz
+
+.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
+
Property changes on: tcl8.6/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: tcl8.6/trunk/debian/shlibs.local
===================================================================
--- tcl8.6/trunk/debian/shlibs.local (rev 0)
+++ tcl8.6/trunk/debian/shlibs.local 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+libtcl8.6 1
Added: tcl8.6/trunk/debian/tcl8.6-dev.dirs
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.dirs (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-dev.dirs 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,3 @@
+usr/lib/tcl8.6
+usr/share/aclocal
+usr/share/tcltk/tcl8.6
Added: tcl8.6/trunk/debian/tcl8.6-dev.docs
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.docs (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-dev.docs 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+debian/README.TCL_INC
Added: tcl8.6/trunk/debian/tcl8.6-dev.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.files (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-dev.files 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.a
+usr/lib/*.so
Added: tcl8.6/trunk/debian/tcl8.6-doc.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-doc.files (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-doc.files 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+usr/share/man/man3
Added: tcl8.6/trunk/debian/tcl8.6.dirs
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.dirs (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.dirs 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+usr/share/lintian/overrides
Added: tcl8.6/trunk/debian/tcl8.6.docs
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.docs (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.docs 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,3 @@
+README
+changes
+ChangeLog.[12]*
Added: tcl8.6/trunk/debian/tcl8.6.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.files (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.files 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,5 @@
+usr/bin
+usr/share/tcltk/tcl8
+usr/share/tcltk/tcl8.6
+usr/lib/*.so.*
+usr/share/man/man1
Added: tcl8.6/trunk/debian/tcl8.6.lintian-override
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.lintian-override (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.lintian-override 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1 @@
+tcl8.6: package-name-doesnt-match-sonames
Added: tcl8.6/trunk/debian/tcl8.6.menu
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.menu (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.menu 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,4 @@
+?package(tcl8.6):needs="text"\
+ section="Applications/Programming"\
+ title="Tclsh8.6"\
+ command="/usr/bin/tclsh8.6"
Added: tcl8.6/trunk/debian/tcl8.6.postinst
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.postinst (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.postinst 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+ update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh8.6 835 \
+ --slave /usr/share/man/man1/tclsh.1.gz tclsh.1 \
+ /usr/share/man/man1/tclsh8.6.1.gz
+fi
+
+#DEBHELPER#
Added: tcl8.6/trunk/debian/tcl8.6.prerm
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.prerm (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6.prerm 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --remove tclsh /usr/bin/tclsh8.6
+
+#DEBHELPER#
Added: tcl8.6/trunk/debian/watch
===================================================================
--- tcl8.6/trunk/debian/watch (rev 0)
+++ tcl8.6/trunk/debian/watch 2008-06-30 11:53:18 UTC (rev 672)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/tcl/tcl(8\.6\.\d+)-src\.tar\.gz
More information about the Pkg-tcltk-commits
mailing list