[Pkg-tcltk-commits] r556 - in tcl8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Tue Apr 1 11:27:18 UTC 2008
Author: sgolovan-guest
Date: 2008-04-01 11:27:18 +0000 (Tue, 01 Apr 2008)
New Revision: 556
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]
* New upstream release. Refreshed patches.
Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/changelog 2008-04-01 11:27:18 UTC (rev 556)
@@ -1,11 +1,12 @@
-tcl8.5 (8.5.1-2) unstable; urgency=low
+tcl8.5 (8.5.2-1) unstable; urgency=low
+ * New upstream release.
* 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.
* Cleaned up debian/rules.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 25 Feb 2008 10:28:42 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 01 Apr 2008 15:10:39 +0400
tcl8.5 (8.5.1-1) unstable; urgency=low
Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/confsearch.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -2,10 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
-Index: tcl8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tcl8.5-8.5.0.orig/unix/tcl.m4 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/tcl.m4 2007-12-19 10:33:40.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/tcl.m4
++++ tcl8.5-8.5.2/unix/tcl.m4
@@ -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 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/manpages.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -2,10 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
-Index: tcl8.5-8.5.0/unix/installManPage
-===================================================================
---- tcl8.5-8.5.0.orig/unix/installManPage 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/installManPage 2007-12-19 10:33:52.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/installManPage
++++ tcl8.5-8.5.2/unix/installManPage
@@ -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 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/non-linux.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -1,10 +1,8 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
-Index: tcl8.5-8.5.0/unix/configure
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure 2007-12-19 10:33:43.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure 2007-12-19 10:33:49.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/configure
++++ tcl8.5-8.5.2/unix/configure
@@ -6536,6 +6536,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -24,10 +22,8 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
-Index: tcl8.5-8.5.0/unix/Makefile.in
-===================================================================
---- tcl8.5-8.5.0.orig/unix/Makefile.in 2007-12-19 10:33:43.000000000 +0300
-+++ tcl8.5-8.5.0/unix/Makefile.in 2007-12-19 10:33:49.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/Makefile.in
++++ tcl8.5-8.5.2/unix/Makefile.in
@@ -169,6 +169,7 @@
SHLIB_LD = @SHLIB_LD@
SHLIB_CFLAGS = @SHLIB_CFLAGS@
@@ -36,10 +32,8 @@
TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
-Index: tcl8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tcl8.5-8.5.0.orig/unix/tcl.m4 2007-12-19 10:33:43.000000000 +0300
-+++ tcl8.5-8.5.0/unix/tcl.m4 2007-12-19 10:33:49.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/tcl.m4
++++ tcl8.5-8.5.2/unix/tcl.m4
@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/rpath.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -1,10 +1,8 @@
Patch by Chris Waters removes -rpath from search flags and adds -soname
to library build options.
-Index: tcl8.5-8.5.0/unix/configure
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure 2007-12-19 10:33:34.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure 2007-12-19 10:33:43.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/configure
++++ tcl8.5-8.5.2/unix/configure
@@ -7344,6 +7344,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,26 +13,22 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
-Index: tcl8.5-8.5.0/unix/Makefile.in
-===================================================================
---- tcl8.5-8.5.0.orig/unix/Makefile.in 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/Makefile.in 2007-12-19 10:33:43.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/Makefile.in
++++ tcl8.5-8.5.2/unix/Makefile.in
@@ -725,7 +725,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
+- @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) \
-Index: tcl8.5-8.5.0/unix/tcl.m4
-===================================================================
---- tcl8.5-8.5.0.orig/unix/tcl.m4 2007-12-19 10:33:40.000000000 +0300
-+++ tcl8.5-8.5.0/unix/tcl.m4 2007-12-19 10:33:43.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/tcl.m4
++++ tcl8.5-8.5.2/unix/tcl.m4
@@ -1429,6 +1429,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -1,8 +1,6 @@
-Index: tcl8.5-8.5.0/unix/configure
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure 2007-12-19 10:33:28.000000000 +0300
-@@ -18427,7 +18427,7 @@
+--- tcl8.5-8.5.2.orig/unix/configure
++++ tcl8.5-8.5.2/unix/configure
+@@ -18454,7 +18454,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -11,11 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
-Index: tcl8.5-8.5.0/unix/configure.in
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure.in 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure.in 2007-12-19 10:33:28.000000000 +0300
-@@ -696,7 +696,7 @@
+--- tcl8.5-8.5.2.orig/unix/configure.in
++++ tcl8.5-8.5.2/unix/configure.in
+@@ -692,7 +692,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -24,10 +20,8 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
-Index: tcl8.5-8.5.0/library/init.tcl
-===================================================================
---- tcl8.5-8.5.0.orig/library/init.tcl 2007-12-13 18:26:03.000000000 +0300
-+++ tcl8.5-8.5.0/library/init.tcl 2007-12-19 10:33:28.000000000 +0300
+--- tcl8.5-8.5.2.orig/library/init.tcl
++++ tcl8.5-8.5.2/library/init.tcl
@@ -48,7 +48,7 @@
}
namespace eval tcl {
Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -2,11 +2,9 @@
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-8.5.0/unix/configure
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure 2007-12-19 10:33:28.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure 2007-12-19 10:33:34.000000000 +0300
-@@ -18564,9 +18564,9 @@
+--- tcl8.5-8.5.2.orig/unix/configure
++++ tcl8.5-8.5.2/unix/configure
+@@ -18591,9 +18591,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 +16,9 @@
fi
#--------------------------------------------------------------------
-Index: tcl8.5-8.5.0/unix/configure.in
-===================================================================
---- tcl8.5-8.5.0.orig/unix/configure.in 2007-12-19 10:33:28.000000000 +0300
-+++ tcl8.5-8.5.0/unix/configure.in 2007-12-19 10:33:34.000000000 +0300
-@@ -795,9 +795,9 @@
+--- tcl8.5-8.5.2.orig/unix/configure.in
++++ tcl8.5-8.5.2/unix/configure.in
+@@ -791,9 +791,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 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff 2008-04-01 11:27:18 UTC (rev 556)
@@ -2,10 +2,8 @@
with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tcl headers there).
-Index: tcl8.5-8.5.0/unix/tclConfig.sh.in
-===================================================================
---- tcl8.5-8.5.0.orig/unix/tclConfig.sh.in 2007-12-18 19:08:39.000000000 +0300
-+++ tcl8.5-8.5.0/unix/tclConfig.sh.in 2007-12-19 10:33:37.000000000 +0300
+--- tcl8.5-8.5.2.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.2/unix/tclConfig.sh.in
@@ -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 2008-03-23 07:47:24 UTC (rev 555)
+++ tcl8.5/trunk/debian/rules 2008-04-01 11:27:18 UTC (rev 556)
@@ -179,8 +179,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tcl8.5_8.5.1.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tcl8.5.1-src.tar.gz
+ wget -O tcl8.5_8.5.2.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tcl8.5.2-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