[Pkg-tcltk-commits] r1142 - in tcl8.6/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Jul 20 17:53:47 UTC 2011
Author: sgolovan
Date: 2011-07-20 17:53:46 +0000 (Wed, 20 Jul 2011)
New Revision: 1142
Modified:
tcl8.6/trunk/debian/changelog
tcl8.6/trunk/debian/control
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/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/tcl8.6-dev.dirs
tcl8.6/trunk/debian/tcl8.6-dev.files
Log:
[tcl8.6]
* New upstream release.
* Moved /usr/share/tcltk/tcl8.6/tclConfig.sh back to the /usr/lib/tcl8.6
directory because it is architecture dependent.
* Bumped standards version to 3.9.2.
Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/changelog 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,8 +1,11 @@
-tcl8.6 (8.6.0~b1-5) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Moved /usr/share/tcltk/tcl8.6/tclConfig.sh back to the /usr/lib/tcl8.6
+ directory because it is architecture dependent.
+ * Bumped standards version to 3.9.2.
- -- Sergei Golovan <sgolovan at debian.org> Thu, 29 Jul 2010 09:58:19 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 20 Jul 2011 14:27:26 +0400
tcl8.6 (8.6.0~b1-4) experimental; urgency=low
Modified: tcl8.6/trunk/debian/control
===================================================================
--- tcl8.6/trunk/debian/control 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/control 2011-07-20 17:53:46 UTC (rev 1142)
@@ -4,7 +4,7 @@
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), zlib1g-dev, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.9.2
Homepage: http://www.tcl.tk/
Package: tcl8.6
Modified: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/confsearch.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,22 +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
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.6
+and tkConfig.sh in /usr/lib/tk8.6 where they are located in Debian
installation.
---- tcl8.6-8.6.0~a3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a3/unix/tcl.m4
+--- tcl8.6b2.orig/unix/tcl.m4
++++ tcl8.6b2/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/tcl8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 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/tk8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tkConfig.sh" ; then
Modified: tcl8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.6/trunk/debian/patches/manpages.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/manpages.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -2,22 +2,26 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tcl8.6-8.6.0~a3.orig/unix/installManPage
-+++ tcl8.6-8.6.0~a3/unix/installManPage
-@@ -48,8 +48,16 @@
- *.n) SECTION=n ;;
+--- tcl8.6b2.orig/unix/installManPage
++++ tcl8.6b2/unix/installManPage
+@@ -92,12 +92,20 @@
+ exit 2 ;;
esac
-+NAME=`basename $MANPAGE .$SECTION`
- SRCDIR=`dirname $MANPAGE`
++Name=`basename $ManPage .$Section`
+ SrcDir=`dirname $ManPage`
-+SPECIALS="DString Thread Notifier RegExp"
-+for n in $SPECIALS; do
-+ if [ "$NAME" = "$n" ] ; then
-+ NAMES="$n $NAMES"
+ ########################################################################
+ ### Process Page to Create Target Pages
+ ###
+
++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
+ First=""
+ for Target in $Names; do
+ Target=$Target.$Section$Suffix
Modified: tcl8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.6/trunk/debian/patches/non-linux.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/non-linux.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tcl8.6-8.6.0~a3.orig/unix/configure
-+++ tcl8.6-8.6.0~a3/unix/configure
-@@ -6154,6 +6154,9 @@
+--- tcl8.6b2.orig/unix/configure
++++ tcl8.6b2/unix/configure
+@@ -6659,6 +6659,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,27 +13,27 @@
fi
fi
-@@ -6952,7 +6955,7 @@
+@@ -7495,7 +7498,7 @@
fi
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
---- tcl8.6-8.6.0~a3.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~a3/unix/Makefile.in
-@@ -169,6 +169,7 @@
+
+--- tcl8.6b2.orig/unix/Makefile.in
++++ tcl8.6b2/unix/Makefile.in
+@@ -178,6 +178,7 @@
SHLIB_LD = @SHLIB_LD@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
+ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -DBUILD_tcl
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~a3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a3/unix/tcl.m4
+--- tcl8.6b2.orig/unix/tcl.m4
++++ tcl8.6b2/unix/tcl.m4
@@ -925,6 +925,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -44,12 +44,12 @@
fi
fi
])
-@@ -1380,7 +1383,7 @@
+@@ -1379,7 +1382,7 @@
])
])
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
+
Modified: tcl8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/rpath.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/rpath.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,9 +1,9 @@
Patch by Chris Waters removes -rpath from search flags and adds -soname
to library build options.
---- tcl8.6-8.6.0~a3.orig/unix/configure
-+++ tcl8.6-8.6.0~a3/unix/configure
-@@ -6963,6 +6963,9 @@
+--- tcl8.6b2.orig/unix/configure
++++ tcl8.6b2/unix/configure
+@@ -7505,6 +7505,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -13,23 +13,23 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
---- tcl8.6-8.6.0~a3.orig/unix/Makefile.in
-+++ tcl8.6-8.6.0~a3/unix/Makefile.in
-@@ -742,7 +742,10 @@
- fi
- @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+--- tcl8.6b2.orig/unix/Makefile.in
++++ tcl8.6b2/unix/Makefile.in
+@@ -784,7 +784,10 @@
+ done;
+ @echo "Installing $(LIB_FILE) to @DLL_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~a3.orig/unix/tcl.m4
-+++ tcl8.6-8.6.0~a3/unix/tcl.m4
-@@ -1391,6 +1391,9 @@
+- @chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
++ mv "@DLL_INSTALL_DIR@"/$(LIB_FILE) "@DLL_INSTALL_DIR@"/$(LIB_FILE).0
++ ln -sf $(LIB_FILE).0 "@DLL_INSTALL_DIR@"/$(LIB_FILE)
++ ln -sf "@DLL_INSTALL_DIR@"/$(LIB_FILE).0 ./
++ @chmod 555 "@DLL_INSTALL_DIR@"/$(LIB_FILE).0
+ @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
+ @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)${EXE_SUFFIX}
+ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
+--- tcl8.6b2.orig/unix/tcl.m4
++++ tcl8.6b2/unix/tcl.m4
+@@ -1389,6 +1389,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tcl8.6/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tcllibrary.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/tcllibrary.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,6 +1,6 @@
---- tcl8.6-8.6.0~a3.orig/unix/configure
-+++ tcl8.6-8.6.0~a3/unix/configure
-@@ -18276,7 +18276,7 @@
+--- tcl8.6b2.orig/unix/configure
++++ tcl8.6b2/unix/configure
+@@ -19217,7 +19217,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -9,9 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.6-8.6.0~a3.orig/unix/configure.in
-+++ tcl8.6-8.6.0~a3/unix/configure.in
-@@ -693,7 +693,7 @@
+--- tcl8.6b2.orig/unix/configure.in
++++ tcl8.6b2/unix/configure.in
+@@ -762,7 +762,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,9 +20,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
---- tcl8.6-8.6.0~a3.orig/library/init.tcl
-+++ tcl8.6-8.6.0~a3/library/init.tcl
-@@ -48,7 +48,7 @@
+--- tcl8.6b2.orig/library/init.tcl
++++ tcl8.6b2/library/init.tcl
+@@ -46,7 +46,7 @@
}
namespace eval tcl {
variable Dir
Modified: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -2,11 +2,11 @@
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~a3.orig/unix/configure
-+++ tcl8.6-8.6.0~a3/unix/configure
-@@ -18413,9 +18413,9 @@
+--- tcl8.6b2.orig/unix/configure
++++ tcl8.6b2/unix/configure
+@@ -19348,9 +19348,9 @@
test -z "$TCL_MODULE_PATH" && \
- TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
+ TCL_MODULE_PATH="~/Library/Tcl /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"
@@ -16,11 +16,11 @@
fi
#--------------------------------------------------------------------
---- tcl8.6-8.6.0~a3.orig/unix/configure.in
-+++ tcl8.6-8.6.0~a3/unix/configure.in
-@@ -792,9 +792,9 @@
+--- tcl8.6b2.orig/unix/configure.in
++++ tcl8.6b2/unix/configure.in
+@@ -855,9 +855,9 @@
test -z "$TCL_MODULE_PATH" && \
- TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl"
+ TCL_MODULE_PATH="~/Library/Tcl /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"
Modified: tcl8.6/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclport.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/tclport.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,14 +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~a3.orig/generic/tclPort.h
-+++ tcl8.6-8.6.0~a3/generic/tclPort.h
-@@ -24,7 +24,7 @@
- #if defined(__WIN32__)
- # include "../win/tclWinPort.h"
- #else
+--- tcl8.6b2.orig/generic/tclPort.h
++++ tcl8.6b2/generic/tclPort.h
+@@ -22,7 +22,7 @@
+ #endif
+ #include "tcl.h"
+ #if !defined(_WIN32)
-# include "tclUnixPort.h"
+# include "../unix/tclUnixPort.h"
#endif
- #if !defined(LLONG_MIN)
+ #if defined(__CYGWIN__)
Modified: tcl8.6/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclprivate.diff 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/patches/tclprivate.diff 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,5 +1,5 @@
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
+with Tcl sources to a subdirectory of /usr/include/tcl8.6 (debian/rules
puts private Tcl headers there).
--- tcl8.6-8.6.0~a3.orig/unix/tclConfig.sh.in
Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/rules 2011-07-20 17:53:46 UTC (rev 1142)
@@ -98,7 +98,8 @@
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)
+ mkdir debian/tmp/usr/lib/tcl$(v)
+ mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/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
#
@@ -109,6 +110,8 @@
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
+ install -d debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
+ cp libtommath/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
rm debian/tmp/usr/include/tcl$(v)/tdbc*.h
#
# Fix up the manpages.
@@ -157,15 +160,11 @@
dh_testdir -a
dh_testroot -a
dh_movefiles -a
- # now, fix up file locations for .sh and .m4
+ # now, fix up file locations for .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)
sh debian/filterconfig \
- debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)/tclConfig.sh
- ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
- debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
+ debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
dh_installdocs -a
dh_installmenu -a
dh_installchangelogs -a ChangeLog
@@ -187,8 +186,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tcl8.6_8.6.0~b1.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tcl8.6b1-src.tar.gz
+ wget -O tcl8.6_8.6.0~b2~rc0.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl8.6b2rc0-src.tar.gz
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
Modified: tcl8.6/trunk/debian/tcl8.6-dev.dirs
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.dirs 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/tcl8.6-dev.dirs 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,3 +1,2 @@
usr/lib/tcl8.6
usr/share/aclocal
-usr/share/tcltk/tcl8.6
Modified: tcl8.6/trunk/debian/tcl8.6-dev.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.files 2011-06-26 08:34:20 UTC (rev 1141)
+++ tcl8.6/trunk/debian/tcl8.6-dev.files 2011-07-20 17:53:46 UTC (rev 1142)
@@ -1,3 +1,4 @@
usr/include
usr/lib/*.a
usr/lib/*.so
+usr/lib/tcl8.6/*.sh
More information about the Pkg-tcltk-commits
mailing list