[Pkg-tcltk-commits] r580 - in tk8.4/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Sat Apr 19 14:25:04 UTC 2008
Author: sgolovan-guest
Date: 2008-04-19 14:25:03 +0000 (Sat, 19 Apr 2008)
New Revision: 580
Modified:
tk8.4/trunk/debian/changelog
tk8.4/trunk/debian/patches/manpages.diff
tk8.4/trunk/debian/patches/non-linux.diff
tk8.4/trunk/debian/patches/rpath.diff
tk8.4/trunk/debian/patches/scalable-fonts.diff
tk8.4/trunk/debian/patches/tkinc.diff
tk8.4/trunk/debian/patches/tklibrary.diff
tk8.4/trunk/debian/rules
Log:
[tk8.4]
* New upstream release.
Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/changelog 2008-04-19 14:25:03 UTC (rev 580)
@@ -1,8 +1,8 @@
-tk8.4 (8.4.18-3) UNRELEASED; urgency=low
+tk8.4 (8.4.19-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 14 Apr 2008 23:15:02 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 19 Apr 2008 18:13:39 +0400
tk8.4 (8.4.18-2) unstable; urgency=low
Modified: tk8.4/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.4/trunk/debian/patches/manpages.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/manpages.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -2,10 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
-Index: tk8.4-8.4.16/unix/installManPage
-===================================================================
---- tk8.4-8.4.16.orig/unix/installManPage 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/installManPage 2007-10-18 20:34:33.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/installManPage
++++ tk8.4-8.4.19/unix/installManPage
@@ -49,7 +49,16 @@
}' $MANPAGE`
Modified: tk8.4/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.4/trunk/debian/patches/non-linux.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/non-linux.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -1,10 +1,8 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
-Index: tk8.4-8.4.16/unix/configure
-===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-10-18 20:34:29.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:31.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/configure
++++ tk8.4-8.4.19/unix/configure
@@ -2002,6 +2002,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: tk8.4-8.4.16/unix/tcl.m4
-===================================================================
---- tk8.4-8.4.16.orig/unix/tcl.m4 2007-10-18 20:34:29.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-10-18 20:34:31.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/tcl.m4
++++ tk8.4-8.4.19/unix/tcl.m4
@@ -898,6 +898,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
Modified: tk8.4/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.4/trunk/debian/patches/rpath.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/rpath.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -3,10 +3,8 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
-Index: tk8.4-8.4.16/unix/configure
-===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-10-18 20:34:27.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:29.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/configure
++++ tk8.4-8.4.19/unix/configure
@@ -2568,12 +2568,15 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -24,10 +22,8 @@
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
-Index: tk8.4-8.4.16/unix/Makefile.in
-===================================================================
---- tk8.4-8.4.16.orig/unix/Makefile.in 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/Makefile.in 2007-10-18 20:34:29.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/Makefile.in
++++ tk8.4-8.4.19/unix/Makefile.in
@@ -635,7 +635,7 @@
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
@@ -37,10 +33,8 @@
) > $(PKG_INDEX); \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
-Index: tk8.4-8.4.16/unix/tcl.m4
-===================================================================
---- tk8.4-8.4.16.orig/unix/tcl.m4 2007-10-18 20:34:27.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-10-18 20:34:29.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/tcl.m4
++++ tk8.4-8.4.19/unix/tcl.m4
@@ -1346,20 +1346,23 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tk8.4/trunk/debian/patches/scalable-fonts.diff
===================================================================
--- tk8.4/trunk/debian/patches/scalable-fonts.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/scalable-fonts.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -9,10 +9,8 @@
when no non-scalable fonts are returned and chosen fixed font is infeasible
(this case was never triggered without tkFont.c patch).
-Index: tk8.4-8.4.16/generic/tkFont.c
-===================================================================
---- tk8.4-8.4.16.orig/generic/tkFont.c 2007-05-31 17:39:26.000000000 +0400
-+++ tk8.4-8.4.16/generic/tkFont.c 2007-10-18 20:34:20.000000000 +0400
+--- tk8.4-8.4.19.orig/generic/tkFont.c
++++ tk8.4-8.4.19/generic/tkFont.c
@@ -3454,8 +3454,15 @@
/* XLFD_SPACING ignored. */
@@ -31,10 +29,8 @@
if (FieldSpecified(field[XLFD_CHARSET])) {
xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
} else {
-Index: tk8.4-8.4.16/unix/tkUnixFont.c
-===================================================================
---- tk8.4-8.4.16.orig/unix/tkUnixFont.c 2006-10-06 01:28:17.000000000 +0400
-+++ tk8.4-8.4.16/unix/tkUnixFont.c 2007-10-18 20:34:20.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/tkUnixFont.c
++++ tk8.4-8.4.19/unix/tkUnixFont.c
@@ -2660,6 +2660,9 @@
bestScore[1] = INT_MAX;
}
Modified: tk8.4/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.4/trunk/debian/patches/tkinc.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/tkinc.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -7,10 +7,8 @@
Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.4 and tkConfig.sh
in /usr/share/tcltk/tk8.4 where they are located in Debian installation.
-Index: tk8.4-8.4.16/unix/configure
-===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-10-19 15:47:01.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-10-19 15:47:02.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/configure
++++ tk8.4-8.4.19/unix/configure
@@ -640,6 +640,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
@@ -19,10 +17,8 @@
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
-Index: tk8.4-8.4.16/unix/tkConfig.sh.in
-===================================================================
---- tk8.4-8.4.16.orig/unix/tkConfig.sh.in 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tkConfig.sh.in 2007-10-19 15:47:02.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/tkConfig.sh.in
++++ tk8.4-8.4.19/unix/tkConfig.sh.in
@@ -53,7 +53,7 @@
# String to pass to linker to pick up the Tk library from its
@@ -58,10 +54,8 @@
# Path to the Tk stub library in the install directory.
TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
-Index: tk8.4-8.4.16/unix/tcl.m4
-===================================================================
---- tk8.4-8.4.16.orig/unix/tcl.m4 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/tcl.m4 2007-10-19 15:47:02.000000000 +0400
+--- tk8.4-8.4.19.orig/unix/tcl.m4
++++ tk8.4-8.4.19/unix/tcl.m4
@@ -83,6 +83,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tk8.4/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.4/trunk/debian/patches/tklibrary.diff 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/patches/tklibrary.diff 2008-04-19 14:25:03 UTC (rev 580)
@@ -1,8 +1,6 @@
-Index: tk8.4-8.4.16/unix/configure
-===================================================================
---- tk8.4-8.4.16.orig/unix/configure 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure 2007-10-18 20:34:25.000000000 +0400
-@@ -5858,7 +5858,7 @@
+--- tk8.4-8.4.19.orig/unix/configure
++++ tk8.4-8.4.19/unix/configure
+@@ -5901,7 +5901,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -11,11 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
-Index: tk8.4-8.4.16/unix/configure.in
-===================================================================
---- tk8.4-8.4.16.orig/unix/configure.in 2007-09-21 21:04:18.000000000 +0400
-+++ tk8.4-8.4.16/unix/configure.in 2007-10-18 20:34:25.000000000 +0400
-@@ -402,7 +402,7 @@
+--- tk8.4-8.4.19.orig/unix/configure.in
++++ tk8.4-8.4.19/unix/configure.in
+@@ -421,7 +421,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules 2008-04-19 14:24:29 UTC (rev 579)
+++ tk8.4/trunk/debian/rules 2008-04-19 14:25:03 UTC (rev 580)
@@ -174,8 +174,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.4_8.4.18.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.4.18-src.tar.gz
+ wget -O tk8.4_8.4.19.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk8.4.19-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