[Pkg-tcltk-commits] r384 - in tcl8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Wed Nov 21 15:32:48 UTC 2007
Author: sgolovan-guest
Date: 2007-11-21 15:32:48 +0000 (Wed, 21 Nov 2007)
New Revision: 384
Modified:
tcl8.5/trunk/debian/changelog
tcl8.5/trunk/debian/patches/confsearch.diff
tcl8.5/trunk/debian/patches/manpages.diff
tcl8.5/trunk/debian/patches/non-linux.diff
tcl8.5/trunk/debian/patches/rpath.diff
tcl8.5/trunk/debian/patches/tcllibrary.diff
tcl8.5/trunk/debian/patches/tclpackagepath.diff
tcl8.5/trunk/debian/patches/tclprivate.diff
tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
Refreshed patches to a new b3. Added new --disable-rpath
configure option.
Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/changelog 2007-11-21 15:32:48 UTC (rev 384)
@@ -1,8 +1,8 @@
-tcl8.5 (0.b2-3) UNRELEASED; urgency=low
+tcl8.5 (0.b3-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream beta release.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 14 Nov 2007 09:23:48 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 21 Nov 2007 18:15:50 +0300
tcl8.5 (0.b2-2) unstable; urgency=low
Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/confsearch.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -2,10 +2,10 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
-Index: tcl8.5-0.b1/unix/tcl.m4
+Index: tcl8.5-0.b3/unix/tcl.m4
===================================================================
---- tcl8.5-0.b1.orig/unix/tcl.m4 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/tcl.m4 2007-10-19 15:45:36.000000000 +0400
+--- tcl8.5-0.b3.orig/unix/tcl.m4 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/tcl.m4 2007-11-21 18:21:28.000000000 +0300
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tcl8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.5/trunk/debian/patches/manpages.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/manpages.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -2,10 +2,10 @@
aren't installed by upstream script but are referenced inside other
manual pages.
-Index: tcl8.5-0.b1/unix/installManPage
+Index: tcl8.5-0.b3/unix/installManPage
===================================================================
---- tcl8.5-0.b1.orig/unix/installManPage 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/installManPage 2007-10-18 20:40:02.000000000 +0400
+--- tcl8.5-0.b3.orig/unix/installManPage 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/installManPage 2007-11-21 18:26:34.000000000 +0300
@@ -48,8 +48,16 @@
*.n) SECTION=n ;;
esac
Modified: tcl8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/trunk/debian/patches/non-linux.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/non-linux.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -1,11 +1,11 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
-Index: tcl8.5-0.b1/unix/configure
+Index: tcl8.5-0.b3/unix/configure
===================================================================
---- tcl8.5-0.b1.orig/unix/configure 2007-10-18 20:39:56.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure 2007-10-18 20:39:59.000000000 +0400
-@@ -6518,6 +6518,9 @@
+--- tcl8.5-0.b3.orig/unix/configure 2007-11-21 18:26:17.000000000 +0300
++++ tcl8.5-0.b3/unix/configure 2007-11-21 18:26:23.000000000 +0300
+@@ -6536,6 +6536,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -15,19 +15,19 @@
fi
fi
-@@ -7231,7 +7234,7 @@
- fi
- fi
+@@ -7333,7 +7336,7 @@
+ fi
+
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
-Index: tcl8.5-0.b1/unix/Makefile.in
+Index: tcl8.5-0.b3/unix/Makefile.in
===================================================================
---- tcl8.5-0.b1.orig/unix/Makefile.in 2007-10-18 20:39:56.000000000 +0400
-+++ tcl8.5-0.b1/unix/Makefile.in 2007-10-18 20:39:59.000000000 +0400
+--- tcl8.5-0.b3.orig/unix/Makefile.in 2007-11-21 18:26:17.000000000 +0300
++++ tcl8.5-0.b3/unix/Makefile.in 2007-11-21 18:26:23.000000000 +0300
@@ -169,6 +169,7 @@
SHLIB_LD = @SHLIB_LD@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
@@ -36,11 +36,11 @@
TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
-Index: tcl8.5-0.b1/unix/tcl.m4
+Index: tcl8.5-0.b3/unix/tcl.m4
===================================================================
---- tcl8.5-0.b1.orig/unix/tcl.m4 2007-10-18 20:39:56.000000000 +0400
-+++ tcl8.5-0.b1/unix/tcl.m4 2007-10-18 20:39:59.000000000 +0400
-@@ -961,6 +961,9 @@
+--- tcl8.5-0.b3.orig/unix/tcl.m4 2007-11-21 18:26:17.000000000 +0300
++++ tcl8.5-0.b3/unix/tcl.m4 2007-11-21 18:26:23.000000000 +0300
+@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -50,9 +50,9 @@
fi
fi
])
-@@ -1414,7 +1417,7 @@
- fi
- fi
+@@ -1418,7 +1421,7 @@
+ ])
+ ])
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/rpath.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -1,11 +1,11 @@
Patch by Chris Waters removes -rpath from search flags and adds -soname
to library build options.
-Index: tcl8.5-0.b1/unix/configure
+Index: tcl8.5-0.b3/unix/configure
===================================================================
---- tcl8.5-0.b1.orig/unix/configure 2007-10-18 20:39:49.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure 2007-10-18 20:39:56.000000000 +0400
-@@ -7242,11 +7242,14 @@
+--- tcl8.5-0.b3.orig/unix/configure 2007-11-21 18:20:48.000000000 +0300
++++ tcl8.5-0.b3/unix/configure 2007-11-21 18:26:17.000000000 +0300
+@@ -7344,6 +7344,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,16 +15,10 @@
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}
- if test "`uname -m`" = "alpha" ; then
- CFLAGS="$CFLAGS -mieee"
-Index: tcl8.5-0.b1/unix/Makefile.in
+Index: tcl8.5-0.b3/unix/Makefile.in
===================================================================
---- tcl8.5-0.b1.orig/unix/Makefile.in 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/Makefile.in 2007-10-18 20:39:56.000000000 +0400
+--- tcl8.5-0.b3.orig/unix/Makefile.in 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/Makefile.in 2007-11-21 18:26:17.000000000 +0300
@@ -725,7 +725,10 @@
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -37,11 +31,11 @@
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-Index: tcl8.5-0.b1/unix/tcl.m4
+Index: tcl8.5-0.b3/unix/tcl.m4
===================================================================
---- tcl8.5-0.b1.orig/unix/tcl.m4 2007-10-18 20:39:53.000000000 +0400
-+++ tcl8.5-0.b1/unix/tcl.m4 2007-10-18 20:39:56.000000000 +0400
-@@ -1425,11 +1425,14 @@
+--- tcl8.5-0.b3.orig/unix/tcl.m4 2007-11-21 18:21:28.000000000 +0300
++++ tcl8.5-0.b3/unix/tcl.m4 2007-11-21 18:26:17.000000000 +0300
+@@ -1429,6 +1429,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -51,9 +45,3 @@
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}
- if test "`uname -m`" = "alpha" ; then
- CFLAGS="$CFLAGS -mieee"
Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -1,8 +1,8 @@
-Index: tcl8.5-0.b1/unix/configure
+Index: tcl8.5-0.b3/unix/configure
===================================================================
---- tcl8.5-0.b1.orig/unix/configure 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure 2007-10-18 20:39:45.000000000 +0400
-@@ -17914,7 +17914,7 @@
+--- tcl8.5-0.b3.orig/unix/configure 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/configure 2007-11-21 18:20:19.000000000 +0300
+@@ -18427,7 +18427,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -11,11 +11,11 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
-Index: tcl8.5-0.b1/unix/configure.in
+Index: tcl8.5-0.b3/unix/configure.in
===================================================================
---- tcl8.5-0.b1.orig/unix/configure.in 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure.in 2007-10-18 20:39:45.000000000 +0400
-@@ -672,7 +672,7 @@
+--- tcl8.5-0.b3.orig/unix/configure.in 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/configure.in 2007-11-21 18:20:19.000000000 +0300
+@@ -696,7 +696,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -24,10 +24,10 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
-Index: tcl8.5-0.b1/library/init.tcl
+Index: tcl8.5-0.b3/library/init.tcl
===================================================================
---- tcl8.5-0.b1.orig/library/init.tcl 2007-09-19 21:42:11.000000000 +0400
-+++ tcl8.5-0.b1/library/init.tcl 2007-10-18 20:39:45.000000000 +0400
+--- tcl8.5-0.b3.orig/library/init.tcl 2007-11-19 21:14:49.000000000 +0300
++++ tcl8.5-0.b3/library/init.tcl 2007-11-21 18:20:19.000000000 +0300
@@ -48,7 +48,7 @@
}
namespace eval tcl {
Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -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.
-Index: tcl8.5-0.b1/unix/configure
+Index: tcl8.5-0.b3/unix/configure
===================================================================
---- tcl8.5-0.b1.orig/unix/configure 2007-10-18 20:39:45.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure 2007-10-18 20:39:49.000000000 +0400
-@@ -18051,9 +18051,9 @@
+--- tcl8.5-0.b3.orig/unix/configure 2007-11-21 18:20:19.000000000 +0300
++++ tcl8.5-0.b3/unix/configure 2007-11-21 18:20:48.000000000 +0300
+@@ -18564,9 +18564,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
@@ -18,11 +18,11 @@
fi
#--------------------------------------------------------------------
-Index: tcl8.5-0.b1/unix/configure.in
+Index: tcl8.5-0.b3/unix/configure.in
===================================================================
---- tcl8.5-0.b1.orig/unix/configure.in 2007-10-18 20:39:45.000000000 +0400
-+++ tcl8.5-0.b1/unix/configure.in 2007-10-18 20:39:49.000000000 +0400
-@@ -771,9 +771,9 @@
+--- tcl8.5-0.b3.orig/unix/configure.in 2007-11-21 18:20:19.000000000 +0300
++++ tcl8.5-0.b3/unix/configure.in 2007-11-21 18:20:48.000000000 +0300
+@@ -795,9 +795,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
Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff 2007-11-21 15:32:48 UTC (rev 384)
@@ -2,10 +2,10 @@
with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tcl headers there).
-Index: tcl8.5-0.b1/unix/tclConfig.sh.in
+Index: tcl8.5-0.b3/unix/tclConfig.sh.in
===================================================================
---- tcl8.5-0.b1.orig/unix/tclConfig.sh.in 2007-09-24 19:46:44.000000000 +0400
-+++ tcl8.5-0.b1/unix/tclConfig.sh.in 2007-10-18 20:39:51.000000000 +0400
+--- tcl8.5-0.b3.orig/unix/tclConfig.sh.in 2007-11-20 18:46:40.000000000 +0300
++++ tcl8.5-0.b3/unix/tclConfig.sh.in 2007-11-21 18:21:03.000000000 +0300
@@ -111,7 +111,7 @@
# String to pass to linker to pick up the Tcl library from its
Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules 2007-11-15 17:25:57 UTC (rev 383)
+++ tcl8.5/trunk/debian/rules 2007-11-21 15:32:48 UTC (rev 384)
@@ -37,7 +37,9 @@
TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
./configure --prefix=/usr \
--includedir=/usr/include/tcl$(v) \
- --enable-shared --enable-threads \
+ --enable-shared \
+ --enable-threads \
+ --disable-rpath \
--mandir=/usr/share/man \
--enable-man-symlinks \
--enable-man-compression=gzip && \
@@ -162,8 +164,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tcl8.5_0.b2.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tcl8.5b2-src.tar.gz
+ wget -O tcl8.5_0.b3.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl8.5b3-src.tar.gz
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
More information about the Pkg-tcltk-commits
mailing list