[Pkg-tcltk-commits] r792 - in tk8.5/branches/experimental/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Wed Dec 24 11:37:15 UTC 2008
Author: sgolovan-guest
Date: 2008-12-24 11:37:14 +0000 (Wed, 24 Dec 2008)
New Revision: 792
Modified:
tk8.5/branches/experimental/debian/changelog
tk8.5/branches/experimental/debian/patches/confsearch.diff
tk8.5/branches/experimental/debian/patches/manpages.diff
tk8.5/branches/experimental/debian/patches/non-linux.diff
tk8.5/branches/experimental/debian/patches/rpath.diff
tk8.5/branches/experimental/debian/patches/series
tk8.5/branches/experimental/debian/patches/tklibrary.diff
tk8.5/branches/experimental/debian/patches/tkport.diff
tk8.5/branches/experimental/debian/patches/tkprivate.diff
tk8.5/branches/experimental/debian/rules
Log:
[tk8.5-experimental]
* New upstream release.
Modified: tk8.5/branches/experimental/debian/changelog
===================================================================
--- tk8.5/branches/experimental/debian/changelog 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/changelog 2008-12-24 11:37:14 UTC (rev 792)
@@ -1,8 +1,8 @@
-tk8.5 (8.5.5-2) UNRELEASED; urgency=low
+tk8.5 (8.5.6-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 17 Oct 2008 13:29:55 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 24 Dec 2008 14:24:03 +0300
tk8.5 (8.5.5-1) experimental; urgency=low
Modified: tk8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/confsearch.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/confsearch.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.5-8.5.4.orig/unix/configure
-+++ tk8.5-8.5.4/unix/configure
+--- tk8.5-8.5.6.orig/unix/configure
++++ tk8.5-8.5.6/unix/configure
@@ -1430,6 +1430,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
---- tk8.5-8.5.4.orig/unix/tcl.m4
-+++ tk8.5-8.5.4/unix/tcl.m4
+--- tk8.5-8.5.6.orig/unix/tcl.m4
++++ tk8.5-8.5.6/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tk8.5/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/manpages.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/manpages.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.5-8.5.4.orig/unix/installManPage
-+++ tk8.5-8.5.4/unix/installManPage
+--- tk8.5-8.5.6.orig/unix/installManPage
++++ tk8.5-8.5.6/unix/installManPage
@@ -51,7 +51,16 @@
}' $MANPAGE`
Modified: tk8.5/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/non-linux.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/non-linux.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -1,8 +1,8 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tk8.5-8.5.4.orig/unix/configure
-+++ tk8.5-8.5.4/unix/configure
+--- tk8.5-8.5.6.orig/unix/configure
++++ tk8.5-8.5.6/unix/configure
@@ -4741,6 +4741,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
---- tk8.5-8.5.4.orig/unix/tcl.m4
-+++ tk8.5-8.5.4/unix/tcl.m4
+--- tk8.5-8.5.6.orig/unix/tcl.m4
++++ tk8.5-8.5.6/unix/tcl.m4
@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
Modified: tk8.5/branches/experimental/debian/patches/rpath.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/rpath.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/rpath.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -3,8 +3,8 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
---- tk8.5-8.5.4.orig/unix/configure
-+++ tk8.5-8.5.4/unix/configure
+--- tk8.5-8.5.6.orig/unix/configure
++++ tk8.5-8.5.6/unix/configure
@@ -5549,6 +5549,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,10 +15,10 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
---- tk8.5-8.5.4.orig/unix/Makefile.in
-+++ tk8.5-8.5.4/unix/Makefile.in
-@@ -708,7 +708,7 @@
- $(TCLVERSION)$(TCLPATCHL)}]} { return }";\
+--- tk8.5-8.5.6.orig/unix/Makefile.in
++++ tk8.5-8.5.6/unix/Makefile.in
+@@ -707,7 +707,7 @@
+ echo "if {[catch {package present Tcl 8.5.0-8.6}]} { 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]";\
@@ -26,8 +26,8 @@
) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.4.orig/unix/tcl.m4
-+++ tk8.5-8.5.4/unix/tcl.m4
+--- tk8.5-8.5.6.orig/unix/tcl.m4
++++ tk8.5-8.5.6/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: tk8.5/branches/experimental/debian/patches/series
===================================================================
--- tk8.5/branches/experimental/debian/patches/series 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/series 2008-12-24 11:37:14 UTC (rev 792)
@@ -5,5 +5,3 @@
rpath.diff
non-linux.diff
manpages.diff
-#fontsize.diff
-canvasps.diff
Modified: tk8.5/branches/experimental/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tklibrary.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/tklibrary.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -1,5 +1,5 @@
---- tk8.5-8.5.4.orig/unix/configure
-+++ tk8.5-8.5.4/unix/configure
+--- tk8.5-8.5.6.orig/unix/configure
++++ tk8.5-8.5.6/unix/configure
@@ -10746,7 +10746,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -9,8 +9,8 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)'
---- tk8.5-8.5.4.orig/unix/configure.in
-+++ tk8.5-8.5.4/unix/configure.in
+--- tk8.5-8.5.6.orig/unix/configure.in
++++ tk8.5-8.5.6/unix/configure.in
@@ -558,7 +558,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.5/branches/experimental/debian/patches/tkport.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tkport.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/tkport.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -1,8 +1,8 @@
Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
---- tk8.5-8.5.4.orig/generic/tkPort.h
-+++ tk8.5-8.5.4/generic/tkPort.h
+--- tk8.5-8.5.6.orig/generic/tkPort.h
++++ tk8.5-8.5.6/generic/tkPort.h
@@ -29,7 +29,7 @@
# if defined(MAC_OSX_TK)
# include "tkMacOSXPort.h"
Modified: tk8.5/branches/experimental/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tkprivate.diff 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/patches/tkprivate.diff 2008-12-24 11:37:14 UTC (rev 792)
@@ -2,8 +2,8 @@
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tk headers there).
---- tk8.5-8.5.4.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.4/unix/tkConfig.sh.in
+--- tk8.5-8.5.6.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.6/unix/tkConfig.sh.in
@@ -55,7 +55,7 @@
# String to pass to linker to pick up the Tk library from its
Modified: tk8.5/branches/experimental/debian/rules
===================================================================
--- tk8.5/branches/experimental/debian/rules 2008-12-24 11:30:32 UTC (rev 791)
+++ tk8.5/branches/experimental/debian/rules 2008-12-24 11:37:14 UTC (rev 792)
@@ -172,8 +172,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.5_8.5.5.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.5.5-src.tar.gz
+ wget -O tk8.5_8.5.6.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk8.5.6-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