[Pkg-tcltk-commits] r852 - in tk8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Fri Apr 17 15:22:02 UTC 2009
Author: sgolovan-guest
Date: 2009-04-17 15:22:02 +0000 (Fri, 17 Apr 2009)
New Revision: 852
Removed:
tk8.5/trunk/debian/patches/createimageformat.diff
Modified:
tk8.5/trunk/debian/changelog
tk8.5/trunk/debian/control
tk8.5/trunk/debian/patches/confsearch.diff
tk8.5/trunk/debian/patches/manpages.diff
tk8.5/trunk/debian/patches/non-linux.diff
tk8.5/trunk/debian/patches/rpath.diff
tk8.5/trunk/debian/patches/series
tk8.5/trunk/debian/patches/tklibrary.diff
tk8.5/trunk/debian/patches/tkport.diff
tk8.5/trunk/debian/patches/tkprivate.diff
tk8.5/trunk/debian/rules
Log:
* New upstream release.
* Bumped standards version to 3.8.1.
* Removed patch which copied newly created image format name because the
bug is fixed upstream.
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/changelog 2009-04-17 15:22:02 UTC (rev 852)
@@ -1,8 +1,11 @@
-tk8.5 (8.5.6-4) UNRELEASED; urgency=low
+tk8.5 (8.5.7-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Bumped standards version to 3.8.1.
+ * Removed patch which copied newly created image format name because the
+ bug is fixed upstream.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 01 Mar 2009 13:20:06 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 17 Apr 2009 19:09:21 +0400
tk8.5 (8.5.6-3) unstable; urgency=low
Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/control 2009-04-17 15:22:02 UTC (rev 852)
@@ -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), x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0), quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.tcl.tk/
Package: tk8.5
Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/confsearch.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.5-8.5.6.orig/unix/configure
-+++ tk8.5-8.5.6/unix/configure
+--- tk8.5-8.5.7.orig/unix/configure
++++ tk8.5-8.5.7/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.6.orig/unix/tcl.m4
-+++ tk8.5-8.5.6/unix/tcl.m4
+--- tk8.5-8.5.7.orig/unix/tcl.m4
++++ tk8.5-8.5.7/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Deleted: tk8.5/trunk/debian/patches/createimageformat.diff
===================================================================
--- tk8.5/trunk/debian/patches/createimageformat.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/createimageformat.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -1,39 +0,0 @@
-Patch which reverts changes introduced in 8.5.6 in Tk_CreatePhotoImageFormat().
-Copying format name leads to a bit higher memoty consumption but protects if
-the caller decides to destroy name string
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=517159).
-
---- tk8.5-8.5.6.orig/generic/tkImgPhoto.c
-+++ tk8.5-8.5.6/generic/tkImgPhoto.c
-@@ -473,11 +473,13 @@
- while (tsdPtr->oldFormatList != NULL) {
- freePtr = tsdPtr->oldFormatList;
- tsdPtr->oldFormatList = tsdPtr->oldFormatList->nextPtr;
-+ ckfree((char *) freePtr->name);
- ckfree((char *) freePtr);
- }
- while (tsdPtr->formatList != NULL) {
- freePtr = tsdPtr->formatList;
- tsdPtr->formatList = tsdPtr->formatList->nextPtr;
-+ ckfree((char *) freePtr->name);
- ckfree((char *) freePtr);
- }
- }
-@@ -518,6 +520,8 @@
- }
- copyPtr = (Tk_PhotoImageFormat *) ckalloc(sizeof(Tk_PhotoImageFormat));
- *copyPtr = *formatPtr;
-+ copyPtr->name = (char *) ckalloc((unsigned) (strlen(formatPtr->name) + 1));
-+ strcpy(copyPtr->name, formatPtr->name);
- copyPtr->nextPtr = tsdPtr->oldFormatList;
- tsdPtr->oldFormatList = copyPtr;
- }
-@@ -539,6 +543,8 @@
- }
- copyPtr = (Tk_PhotoImageFormat *) ckalloc(sizeof(Tk_PhotoImageFormat));
- *copyPtr = *formatPtr;
-+ copyPtr->name = (char *) ckalloc((unsigned) (strlen(formatPtr->name) + 1));
-+ strcpy(copyPtr->name, formatPtr->name);
- if (isupper((unsigned char) *formatPtr->name)) {
- copyPtr->nextPtr = tsdPtr->oldFormatList;
- tsdPtr->oldFormatList = copyPtr;
Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/manpages.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.5-8.5.6.orig/unix/installManPage
-+++ tk8.5-8.5.6/unix/installManPage
+--- tk8.5-8.5.7.orig/unix/installManPage
++++ tk8.5-8.5.7/unix/installManPage
@@ -51,7 +51,16 @@
}' $MANPAGE`
Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/non-linux.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -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.6.orig/unix/configure
-+++ tk8.5-8.5.6/unix/configure
+--- tk8.5-8.5.7.orig/unix/configure
++++ tk8.5-8.5.7/unix/configure
@@ -4741,6 +4741,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,7 +13,7 @@
fi
fi
-@@ -5538,7 +5541,7 @@
+@@ -5544,7 +5547,7 @@
fi
;;
@@ -22,8 +22,8 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
---- tk8.5-8.5.6.orig/unix/tcl.m4
-+++ tk8.5-8.5.6/unix/tcl.m4
+--- tk8.5-8.5.7.orig/unix/tcl.m4
++++ tk8.5-8.5.7/unix/tcl.m4
@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -34,7 +34,7 @@
fi
fi
])
-@@ -1418,7 +1421,7 @@
+@@ -1421,7 +1424,7 @@
])
])
;;
Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/rpath.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -3,9 +3,9 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
---- tk8.5-8.5.6.orig/unix/configure
-+++ tk8.5-8.5.6/unix/configure
-@@ -5549,6 +5549,9 @@
+--- tk8.5-8.5.7.orig/unix/configure
++++ tk8.5-8.5.7/unix/configure
+@@ -5555,6 +5555,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,9 +15,9 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
---- tk8.5-8.5.6.orig/unix/Makefile.in
-+++ tk8.5-8.5.6/unix/Makefile.in
-@@ -707,7 +707,7 @@
+--- tk8.5-8.5.7.orig/unix/Makefile.in
++++ tk8.5-8.5.7/unix/Makefile.in
+@@ -711,7 +711,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)\
@@ -26,9 +26,9 @@
) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.6.orig/unix/tcl.m4
-+++ tk8.5-8.5.6/unix/tcl.m4
-@@ -1429,6 +1429,9 @@
+--- tk8.5-8.5.7.orig/unix/tcl.m4
++++ tk8.5-8.5.7/unix/tcl.m4
+@@ -1432,6 +1432,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/series 2009-04-17 15:22:02 UTC (rev 852)
@@ -1,4 +1,3 @@
-createimageformat.diff
tkport.diff
tklibrary.diff
tkprivate.diff
Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/tklibrary.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.6.orig/unix/configure
-+++ tk8.5-8.5.6/unix/configure
-@@ -10746,7 +10746,7 @@
+--- tk8.5-8.5.7.orig/unix/configure
++++ tk8.5-8.5.7/unix/configure
+@@ -11052,7 +11052,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
@@ -9,9 +9,9 @@
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
TK_PKG_DIR='tk$(VERSION)'
---- tk8.5-8.5.6.orig/unix/configure.in
-+++ tk8.5-8.5.6/unix/configure.in
-@@ -558,7 +558,7 @@
+--- tk8.5-8.5.7.orig/unix/configure.in
++++ tk8.5-8.5.7/unix/configure.in
+@@ -597,7 +597,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/tkport.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -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.6.orig/generic/tkPort.h
-+++ tk8.5-8.5.6/generic/tkPort.h
+--- tk8.5-8.5.7.orig/generic/tkPort.h
++++ tk8.5-8.5.7/generic/tkPort.h
@@ -29,7 +29,7 @@
# if defined(MAC_OSX_TK)
# include "tkMacOSXPort.h"
Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/patches/tkprivate.diff 2009-04-17 15:22:02 UTC (rev 852)
@@ -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.6.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.6/unix/tkConfig.sh.in
+--- tk8.5-8.5.7.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.7/unix/tkConfig.sh.in
@@ -55,7 +55,7 @@
# String to pass to linker to pick up the Tk library from its
Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules 2009-04-17 15:20:10 UTC (rev 851)
+++ tk8.5/trunk/debian/rules 2009-04-17 15:22:02 UTC (rev 852)
@@ -175,8 +175,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.5_8.5.6.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.5.6-src.tar.gz
+ wget -O tk8.5_8.5.7.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk8.5.7-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