[Pkg-tcltk-commits] r812 - in tk8.5/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Wed Feb 25 13:41:35 UTC 2009
Author: sgolovan-guest
Date: 2009-02-25 13:41:35 +0000 (Wed, 25 Feb 2009)
New Revision: 812
Added:
tk8.5/trunk/debian/patches/canvasps.diff
tk8.5/trunk/debian/patches/fontsize.diff
Removed:
tk8.5/trunk/debian/patches/fontsize.diff
tk8.5/trunk/debian/patches/tk-lastevent.diff
Modified:
tk8.5/trunk/debian/changelog
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:
[tk8.5]
* Upload to unstable.
* Fixed showing widget options in manual pages (closes: #516311).
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/changelog 2009-02-25 13:41:35 UTC (rev 812)
@@ -1,9 +1,32 @@
-tk8.5 (8.5.3-5) UNRELEASED; urgency=low
+tk8.5 (8.5.6-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Upload to unstable.
+ * Fixed showing widget options in manual pages (closes: #516311).
- -- Sergei Golovan <sgolovan at debian.org> Sun, 09 Nov 2008 11:29:33 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 25 Feb 2009 16:34:01 +0300
+tk8.5 (8.5.6-1) experimental; urgency=low
+
+ * New upstream release.
+ * Removed patch which fixed mirrored text in canvas postscript because
+ the bug is fixed upstream.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 24 Dec 2008 14:24:03 +0300
+
+tk8.5 (8.5.5-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixed bug with mirrored text in canvas postscript output
+ (closes: #498408).
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 17 Oct 2008 12:41:07 +0400
+
+tk8.5 (8.5.4-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 23 Aug 2008 16:40:42 +0400
+
tk8.5 (8.5.3-4) unstable; urgency=low
* Fixed bug with mirrored text in canvas postscript output
Copied: tk8.5/trunk/debian/patches/canvasps.diff (from rev 811, tk8.5/branches/experimental/debian/patches/canvasps.diff)
===================================================================
--- tk8.5/trunk/debian/patches/canvasps.diff (rev 0)
+++ tk8.5/trunk/debian/patches/canvasps.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -0,0 +1,23 @@
+Patch by Sergei Golovan.
+
+It ensures that font size is positive (measured in pixels). This fixes
+mirrored text problem in canvas postscript output.
+
+--- tk8.5-8.5.5.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.5/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+ ftFont = GetFont(fontPtr, 0);
+ fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+ GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++ fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+ GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+
+ return fontPtr;
+@@ -518,6 +519,7 @@
+
+ GetTkFontAttributes(ftFont, faPtr);
+ faPtr->underline = fontPtr->font.fa.underline;
++ faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+ faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
+
Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/confsearch.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/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.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/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` \
Deleted: tk8.5/trunk/debian/patches/fontsize.diff
===================================================================
--- tk8.5/trunk/debian/patches/fontsize.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/fontsize.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -1,21 +0,0 @@
-Patch by Sergei Golovan fixes mirroring font in canvas postscript when its
-size is specified in pixels (negative).
-
---- tk8.5-8.5.3.orig/unix/tkUnixRFont.c
-+++ tk8.5-8.5.3/unix/tkUnixRFont.c
-@@ -260,6 +260,7 @@
- ftFont = GetFont(fontPtr, 0);
- fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
- GetTkFontAttributes(ftFont, &fontPtr->font.fa);
-+ fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
- GetTkFontMetrics(ftFont, &fontPtr->font.fm);
-
- return fontPtr;
-@@ -517,6 +518,7 @@
- /* Actual font used to render the character */
-
- GetTkFontAttributes(ftFont, faPtr);
-+ faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
- faPtr->underline = fontPtr->font.fa.underline;
- faPtr->overstrike = fontPtr->font.fa.overstrike;
- }
Copied: tk8.5/trunk/debian/patches/fontsize.diff (from rev 811, tk8.5/branches/experimental/debian/patches/fontsize.diff)
===================================================================
--- tk8.5/trunk/debian/patches/fontsize.diff (rev 0)
+++ tk8.5/trunk/debian/patches/fontsize.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -0,0 +1,21 @@
+Patch by Sergei Golovan fixes mirroring font in canvas postscript when its
+size is specified in pixels (negative).
+
+--- tk8.5-8.5.4.orig/unix/tkUnixRFont.c
++++ tk8.5-8.5.4/unix/tkUnixRFont.c
+@@ -260,6 +260,7 @@
+ ftFont = GetFont(fontPtr, 0);
+ fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+ GetTkFontAttributes(ftFont, &fontPtr->font.fa);
++ fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size);
+ GetTkFontMetrics(ftFont, &fontPtr->font.fm);
+
+ return fontPtr;
+@@ -517,6 +518,7 @@
+ /* Actual font used to render the character */
+
+ GetTkFontAttributes(ftFont, faPtr);
++ faPtr->size = TkFontGetPoints(tkwin, faPtr->size);
+ faPtr->underline = fontPtr->font.fa.underline;
+ faPtr->overstrike = fontPtr->font.fa.overstrike;
+ }
Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/manpages.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.5-8.5.3.orig/unix/installManPage
-+++ tk8.5-8.5.3/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/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/non-linux.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -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.3.orig/unix/configure
-+++ tk8.5-8.5.3/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.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/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/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/rpath.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -3,8 +3,8 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/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.3.orig/unix/Makefile.in
-+++ tk8.5-8.5.3/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.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/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/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/series 2009-02-25 13:41:35 UTC (rev 812)
@@ -1,4 +1,3 @@
-tk-lastevent.diff
tkport.diff
tklibrary.diff
tkprivate.diff
@@ -6,4 +5,3 @@
rpath.diff
non-linux.diff
manpages.diff
-fontsize.diff
Deleted: tk8.5/trunk/debian/patches/tk-lastevent.diff
===================================================================
--- tk8.5/trunk/debian/patches/tk-lastevent.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/tk-lastevent.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -1,29 +0,0 @@
-Date: Sat Jul 12 09:40:30 PDT 2008
-Files: generic/tk.h
-Bugid: 2010422
-
---- tk8.4-8.4.19.orig/generic/tk.h
-+++ tk8.4-8.4.19/generic/tk.h
-@@ -627,17 +627,15 @@
- *---------------------------------------------------------------------------
- */
-
--#define VirtualEvent (LASTEvent)
--#define ActivateNotify (LASTEvent + 1)
--#define DeactivateNotify (LASTEvent + 2)
--#define MouseWheelEvent (LASTEvent + 3)
--#define TK_LASTEVENT (LASTEvent + 4)
-+#define VirtualEvent (MappingNotify + 1)
-+#define ActivateNotify (MappingNotify + 2)
-+#define DeactivateNotify (MappingNotify + 3)
-+#define MouseWheelEvent (MappingNotify + 4)
-+#define TK_LASTEVENT (MappingNotify + 5)
-
- #define MouseWheelMask (1L << 28)
--
- #define ActivateMask (1L << 29)
- #define VirtualEventMask (1L << 30)
--#define TK_LASTEVENT (LASTEvent + 4)
-
- /*
- * A virtual event shares most of its fields with the XKeyEvent and
Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/tklibrary.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -1,5 +1,5 @@
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/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.3.orig/unix/configure.in
-+++ tk8.5-8.5.3/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/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/tkport.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -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.3.orig/generic/tkPort.h
-+++ tk8.5-8.5.3/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/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/patches/tkprivate.diff 2009-02-25 13:41:35 UTC (rev 812)
@@ -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.3.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.3/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/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules 2009-02-25 13:23:22 UTC (rev 811)
+++ tk8.5/trunk/debian/rules 2009-02-25 13:41:35 UTC (rev 812)
@@ -116,6 +116,8 @@
-e 's/tclvars(n)/tclvars(3tcl)/g' \
-e 's/unknown(n)/unknown(3tcl)/g' \
-e 's/(n)/(3tk)/g' \
+ -e 's/^\.de OP$$/.de OOP/' \
+ -e 's/^.OP /.OOP /' \
| gzip -9 >$$f2 ; \
rm $$f ; \
fi ; \
@@ -173,8 +175,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.5_8.5.3.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.5.3-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