[Pkg-tcltk-commits] r1648 - in tk8.6/tags: . 8.6.1-6/debian 8.6.1-6/debian/patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Jul 18 18:56:32 UTC 2014
Author: sgolovan
Date: 2014-07-18 18:56:32 +0000 (Fri, 18 Jul 2014)
New Revision: 1648
Added:
tk8.6/tags/8.6.1-6/
tk8.6/tags/8.6.1-6/debian/changelog
tk8.6/tags/8.6.1-6/debian/patches/series
tk8.6/tags/8.6.1-6/debian/patches/shutdown-crash.diff
Removed:
tk8.6/tags/8.6.1-6/debian/changelog
tk8.6/tags/8.6.1-6/debian/patches/series
Log:
[svn-buildpackage] Tagging tk8.6 8.6.1-6
Deleted: tk8.6/tags/8.6.1-6/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog 2014-03-08 09:37:40 UTC (rev 1590)
+++ tk8.6/tags/8.6.1-6/debian/changelog 2014-07-18 18:56:32 UTC (rev 1648)
@@ -1,169 +0,0 @@
-tk8.6 (8.6.1-5) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 08 Mar 2014 08:56:59 +0400
-
-tk8.6 (8.6.1-4) experimental; urgency=low
-
- * Restored tk8.6 prerm script which removes alternative for /usr/bin/wish.
- * Added ${misc:Depends} substvar for libtk8.6-dbg package.
- * Bumped standards version to 3.9.5.
-
- -- Sergei Golovan <sgolovan at debian.org> Fri, 10 Jan 2014 13:00:35 +0400
-
-tk8.6 (8.6.1-3) experimental; urgency=low
-
- * Added the libtk8.6-dbg package with libtk8.6 debug symbols in it.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 05 Oct 2013 11:59:47 +0400
-
-tk8.6 (8.6.1-2) experimental; urgency=low
-
- * Renamed the development package back to tk8.6-dev after a discussion
- on debian-devel mailing list.
-
- -- Sergei Golovan <sgolovan at debian.org> Wed, 25 Sep 2013 22:08:28 +0400
-
-tk8.6 (8.6.1-1) experimental; urgency=low
-
- * New upstream release.
- * Make tk8.6-doc replace tk8.6 because of moving the
- /usr/share/tcltk/tk8.6/demos link.
-
- -- Sergei Golovan <sgolovan at debian.org> Tue, 24 Sep 2013 20:23:15 +0400
-
-tk8.6 (8.6.0-4) experimental; urgency=low
-
- * Removed unnecessary patch to tkPort.h.
- * Make libtk8.6-dev depend on tk8.6 for better backward compatibility.
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 19 Aug 2013 21:25:44 +0400
-
-tk8.6 (8.6.0-3) experimental; urgency=low
-
- * Renamed tk8.6-lib and tk8.6-dev packages to libtk8.6 and libtk8.6-dev
- because the latter is a much more common naming scheme.
- * Added conflict with older tk8.6 to the tk8.6-doc package (a link to
- Tk demos was moved from one package to the other).
- * Fixed the maintainer 'name'.
-
- -- Sergei Golovan <sgolovan at debian.org> Wed, 31 Jul 2013 12:01:00 +0400
-
-tk8.6 (8.6.0-2) experimental; urgency=low
-
- * Bumped debhelper compatibility version to 9.
- * Added multi-arch support. This includes splitting out the tk8.6-lib
- library package with libtk8.6.so and tkConfig.sh moved into a
- multi-archified location.
- * Recreated /usr/lib/tk8.6/tkConfig.sh for backward compatibility (intend
- to remove in the future).
- * Removed .0 suffix from the libtk8.6.so library in order to remove
- unnecessary diversions from the upstream practice, provided the symlink
- for backward compatibility (intend to remove in the future).
- * Switched to calculating dependency on libtk8.6 via a symbols table.
- * Don't use the alternatives mechanism for selecting /usr/bin/wish. This
- package ships only /usr/bin/wish8.6. The tcltk-defaults package provides
- the necessary symlink. This also means that tk8.6 does no longer provide
- the wish virtual package.
- * Moved the old changelog to the tk8.6-doc package to reduce size of the
- tk8.6 one.
- * Moved the Tk demos to the tk8.6-doc package.
- * Fixed clean target in debian/rules.
- * Bumped standards version to 3.9.4.
-
- -- Sergei Golovan <sgolovan at debian.org> Tue, 30 Jul 2013 20:27:35 +0400
-
-tk8.6 (8.6.0-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Sergei Golovan <sgolovan at debian.org> Fri, 21 Dec 2012 08:34:11 +0400
-
-tk8.6 (8.6.0~b3-1) experimental; urgency=low
-
- * New upstream beta release.
-
- -- Sergei Golovan <sgolovan at debian.org> Fri, 21 Sep 2012 08:49:05 +0400
-
-tk8.6 (8.6.0~b2-2) experimental; urgency=low
-
- * Fixed options(3tk) manpage.
- * Install FontId(3tk) and MeasureChar(3tk) manpages because they are
- referenced in the other manpages.
- * Fixed references to tclvars manpage.
- * Removed Chris Waters wrom the uploaders list (closes: #664118).
- * Switched to 3.0 (quilt) source package format.
- * Bumped debhelper compatibility version to 8.
- * Added hardening build flags using dpkg-buildflags.
- * Bumped standards version to 3.9.3.
-
- -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:44:31 +0400
-
-tk8.6 (8.6.0~b2-1) experimental; urgency=low
-
- * New upstream beta release.
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 08 Aug 2011 23:12:55 +0400
-
-tk8.6 (8.6.0~b2~rc4-1) experimental; urgency=low
-
- * New upstream beta release candidate.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 07 Aug 2011 12:30:32 +0400
-
-tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
-
- * New upstream beta release candidate.
- * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
- * Fixed Xft detection in configure script, which is broken since xft-config
- was removed from the libxft-dev package.
- * Added README.source which explains how to apply quilt patches.
- * Bumped standards version to 3.9.2.
-
- -- Sergei Golovan <sgolovan at debian.org> Thu, 21 Jul 2011 10:31:32 +0400
-
-tk8.6 (8.6.0~b1-3) experimental; urgency=low
-
- * Added libxft-dev to tk8.6-dev dependencies because -lXft is stored in
- tkConfig.sh configuration script.
- * Replaced xterm by xvt in recommended dependencies to reduce implicit
- dependencies list.
- * Added ${misc:Depends} to debian/control file because the binary packages
- are built using debhelper.
- * Bumped standards version to 3.9.1.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 31 Oct 2010 14:58:40 +0300
-
-tk8.6 (8.6.0~b1-2) experimental; urgency=low
-
- * Don't remove wish alternative in case of package upgrade because the
- manually installed alternative is also removed which isn't desirable.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 01 Mar 2009 10:39:30 +0300
-
-tk8.6 (8.6.0~b1-1) experimental; urgency=low
-
- * New upstream beta release.
- * Added private ttk headers to tk8.6-dev binary package.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 27 Dec 2008 14:39:54 +0300
-
-tk8.6 (8.6.0~a3-1) experimental; urgency=low
-
- * New upstream alpha release.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 11 Oct 2008 02:19:43 +0400
-
-tk8.6 (8.6.0~a2-1) experimental; urgency=low
-
- * New upstream alpha release.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 23 Aug 2008 12:35:08 +0400
-
-tk8.6 (8.6.0~a1-1) experimental; urgency=low
-
- * Initial alpha release (closes: #488655).
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 30 Jun 2008 15:57:54 +0400
-
Copied: tk8.6/tags/8.6.1-6/debian/changelog (from rev 1647, tk8.6/trunk/debian/changelog)
===================================================================
--- tk8.6/tags/8.6.1-6/debian/changelog (rev 0)
+++ tk8.6/tags/8.6.1-6/debian/changelog 2014-07-18 18:56:32 UTC (rev 1648)
@@ -0,0 +1,176 @@
+tk8.6 (8.6.1-6) unstable; urgency=low
+
+ * Added patch from upstream which fixes freeing fonts on exit (thanks
+ to Adam Conrad <adconrad at ubuntu.com> for picking it up, closes: #755195).
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 18 Jul 2014 22:51:01 +0400
+
+tk8.6 (8.6.1-5) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 08 Mar 2014 08:56:59 +0400
+
+tk8.6 (8.6.1-4) experimental; urgency=low
+
+ * Restored tk8.6 prerm script which removes alternative for /usr/bin/wish.
+ * Added ${misc:Depends} substvar for libtk8.6-dbg package.
+ * Bumped standards version to 3.9.5.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 10 Jan 2014 13:00:35 +0400
+
+tk8.6 (8.6.1-3) experimental; urgency=low
+
+ * Added the libtk8.6-dbg package with libtk8.6 debug symbols in it.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 05 Oct 2013 11:59:47 +0400
+
+tk8.6 (8.6.1-2) experimental; urgency=low
+
+ * Renamed the development package back to tk8.6-dev after a discussion
+ on debian-devel mailing list.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 25 Sep 2013 22:08:28 +0400
+
+tk8.6 (8.6.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Make tk8.6-doc replace tk8.6 because of moving the
+ /usr/share/tcltk/tk8.6/demos link.
+
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 24 Sep 2013 20:23:15 +0400
+
+tk8.6 (8.6.0-4) experimental; urgency=low
+
+ * Removed unnecessary patch to tkPort.h.
+ * Make libtk8.6-dev depend on tk8.6 for better backward compatibility.
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 19 Aug 2013 21:25:44 +0400
+
+tk8.6 (8.6.0-3) experimental; urgency=low
+
+ * Renamed tk8.6-lib and tk8.6-dev packages to libtk8.6 and libtk8.6-dev
+ because the latter is a much more common naming scheme.
+ * Added conflict with older tk8.6 to the tk8.6-doc package (a link to
+ Tk demos was moved from one package to the other).
+ * Fixed the maintainer 'name'.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 31 Jul 2013 12:01:00 +0400
+
+tk8.6 (8.6.0-2) experimental; urgency=low
+
+ * Bumped debhelper compatibility version to 9.
+ * Added multi-arch support. This includes splitting out the tk8.6-lib
+ library package with libtk8.6.so and tkConfig.sh moved into a
+ multi-archified location.
+ * Recreated /usr/lib/tk8.6/tkConfig.sh for backward compatibility (intend
+ to remove in the future).
+ * Removed .0 suffix from the libtk8.6.so library in order to remove
+ unnecessary diversions from the upstream practice, provided the symlink
+ for backward compatibility (intend to remove in the future).
+ * Switched to calculating dependency on libtk8.6 via a symbols table.
+ * Don't use the alternatives mechanism for selecting /usr/bin/wish. This
+ package ships only /usr/bin/wish8.6. The tcltk-defaults package provides
+ the necessary symlink. This also means that tk8.6 does no longer provide
+ the wish virtual package.
+ * Moved the old changelog to the tk8.6-doc package to reduce size of the
+ tk8.6 one.
+ * Moved the Tk demos to the tk8.6-doc package.
+ * Fixed clean target in debian/rules.
+ * Bumped standards version to 3.9.4.
+
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 30 Jul 2013 20:27:35 +0400
+
+tk8.6 (8.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 21 Dec 2012 08:34:11 +0400
+
+tk8.6 (8.6.0~b3-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 21 Sep 2012 08:49:05 +0400
+
+tk8.6 (8.6.0~b2-2) experimental; urgency=low
+
+ * Fixed options(3tk) manpage.
+ * Install FontId(3tk) and MeasureChar(3tk) manpages because they are
+ referenced in the other manpages.
+ * Fixed references to tclvars manpage.
+ * Removed Chris Waters wrom the uploaders list (closes: #664118).
+ * Switched to 3.0 (quilt) source package format.
+ * Bumped debhelper compatibility version to 8.
+ * Added hardening build flags using dpkg-buildflags.
+ * Bumped standards version to 3.9.3.
+
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:44:31 +0400
+
+tk8.6 (8.6.0~b2-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 08 Aug 2011 23:12:55 +0400
+
+tk8.6 (8.6.0~b2~rc4-1) experimental; urgency=low
+
+ * New upstream beta release candidate.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 07 Aug 2011 12:30:32 +0400
+
+tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
+
+ * New upstream beta release candidate.
+ * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
+ * Fixed Xft detection in configure script, which is broken since xft-config
+ was removed from the libxft-dev package.
+ * Added README.source which explains how to apply quilt patches.
+ * Bumped standards version to 3.9.2.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 21 Jul 2011 10:31:32 +0400
+
+tk8.6 (8.6.0~b1-3) experimental; urgency=low
+
+ * Added libxft-dev to tk8.6-dev dependencies because -lXft is stored in
+ tkConfig.sh configuration script.
+ * Replaced xterm by xvt in recommended dependencies to reduce implicit
+ dependencies list.
+ * Added ${misc:Depends} to debian/control file because the binary packages
+ are built using debhelper.
+ * Bumped standards version to 3.9.1.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 31 Oct 2010 14:58:40 +0300
+
+tk8.6 (8.6.0~b1-2) experimental; urgency=low
+
+ * Don't remove wish alternative in case of package upgrade because the
+ manually installed alternative is also removed which isn't desirable.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 01 Mar 2009 10:39:30 +0300
+
+tk8.6 (8.6.0~b1-1) experimental; urgency=low
+
+ * New upstream beta release.
+ * Added private ttk headers to tk8.6-dev binary package.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 27 Dec 2008 14:39:54 +0300
+
+tk8.6 (8.6.0~a3-1) experimental; urgency=low
+
+ * New upstream alpha release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 11 Oct 2008 02:19:43 +0400
+
+tk8.6 (8.6.0~a2-1) experimental; urgency=low
+
+ * New upstream alpha release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 23 Aug 2008 12:35:08 +0400
+
+tk8.6 (8.6.0~a1-1) experimental; urgency=low
+
+ * Initial alpha release (closes: #488655).
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 30 Jun 2008 15:57:54 +0400
+
Deleted: tk8.6/tags/8.6.1-6/debian/patches/series
===================================================================
--- tk8.6/trunk/debian/patches/series 2014-03-08 09:37:40 UTC (rev 1590)
+++ tk8.6/tags/8.6.1-6/debian/patches/series 2014-07-18 18:56:32 UTC (rev 1648)
@@ -1,6 +0,0 @@
-tklibrary.diff
-tkprivate.diff
-confsearch.diff
-non-linux.diff
-manpages.diff
-xft.diff
Copied: tk8.6/tags/8.6.1-6/debian/patches/series (from rev 1647, tk8.6/trunk/debian/patches/series)
===================================================================
--- tk8.6/tags/8.6.1-6/debian/patches/series (rev 0)
+++ tk8.6/tags/8.6.1-6/debian/patches/series 2014-07-18 18:56:32 UTC (rev 1648)
@@ -0,0 +1,7 @@
+tklibrary.diff
+tkprivate.diff
+confsearch.diff
+non-linux.diff
+manpages.diff
+xft.diff
+shutdown-crash.diff
Copied: tk8.6/tags/8.6.1-6/debian/patches/shutdown-crash.diff (from rev 1647, tk8.6/trunk/debian/patches/shutdown-crash.diff)
===================================================================
--- tk8.6/tags/8.6.1-6/debian/patches/shutdown-crash.diff (rev 0)
+++ tk8.6/tags/8.6.1-6/debian/patches/shutdown-crash.diff 2014-07-18 18:56:32 UTC (rev 1648)
@@ -0,0 +1,153 @@
+Description: Fix crash on shutdown
+Bug: http://core.tcl.tk/tk/info/f214b8ad5b
+Origin: http://core.tcl.tk/tk/vpatch?from=8b40f8cacfa04130&to=9fc8df19b1c093ef
+
+Index: generic/tkFont.c
+==================================================================
+--- x/generic/tkFont.c
++++ x/generic/tkFont.c
+@@ -419,11 +419,11 @@
+ searchPtr != NULL;
+ searchPtr = Tcl_NextHashEntry(&search)) {
+ fontsLeft++;
+ #ifdef DEBUG_FONTS
+ fprintf(stderr, "Font %s still in cache.\n",
+- Tcl_GetHashKey(&fiPtr->fontCache, searchPtr));
++ (char *) Tcl_GetHashKey(&fiPtr->fontCache, searchPtr));
+ #endif
+ }
+
+ #ifdef PURIFY
+ if (fontsLeft) {
+@@ -1091,11 +1091,12 @@
+ Tcl_HashEntry *cacheHashPtr, *namedHashPtr;
+ TkFont *fontPtr, *firstFontPtr, *oldFontPtr;
+ int isNew, descent;
+ NamedFont *nfPtr;
+
+- if (objPtr->typePtr != &tkFontObjType) {
++ if (objPtr->typePtr != &tkFontObjType
++ || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) {
+ SetFontFromAny(interp, objPtr);
+ }
+
+ oldFontPtr = objPtr->internalRep.twoPtrValue.ptr1;
+ if (oldFontPtr != NULL) {
+@@ -1131,10 +1132,11 @@
+ fontPtr = fontPtr->nextPtr) {
+ if (Tk_Screen(tkwin) == fontPtr->screen) {
+ fontPtr->resourceRefCount++;
+ fontPtr->objRefCount++;
+ objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
++ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
+ return (Tk_Font) fontPtr;
+ }
+ }
+
+ /*
+@@ -1241,10 +1243,11 @@
+ fontPtr->underlineHeight = 1;
+ }
+ }
+
+ objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
++ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
+ return (Tk_Font) fontPtr;
+ }
+
+ /*
+ *----------------------------------------------------------------------
+@@ -1273,11 +1276,12 @@
+ {
+ TkFontInfo *fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
+ TkFont *fontPtr;
+ Tcl_HashEntry *hashPtr;
+
+- if (objPtr->typePtr != &tkFontObjType) {
++ if (objPtr->typePtr != &tkFontObjType
++ || objPtr->internalRep.twoPtrValue.ptr2 != fiPtr) {
+ SetFontFromAny(NULL, objPtr);
+ }
+
+ fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
+ if (fontPtr != NULL) {
+@@ -1309,10 +1313,11 @@
+ for (fontPtr = Tcl_GetHashValue(hashPtr); fontPtr != NULL;
+ fontPtr = fontPtr->nextPtr) {
+ if (Tk_Screen(tkwin) == fontPtr->screen) {
+ fontPtr->objRefCount++;
+ objPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
++ objPtr->internalRep.twoPtrValue.ptr2 = fiPtr;
+ return (Tk_Font) fontPtr;
+ }
+ }
+ }
+
+@@ -1354,10 +1359,11 @@
+ if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
+ typePtr->freeIntRepProc(objPtr);
+ }
+ objPtr->typePtr = &tkFontObjType;
+ objPtr->internalRep.twoPtrValue.ptr1 = NULL;
++ objPtr->internalRep.twoPtrValue.ptr2 = NULL;
+
+ return TCL_OK;
+ }
+
+ /*
+@@ -1517,10 +1523,11 @@
+ fontPtr->objRefCount--;
+ if ((fontPtr->resourceRefCount == 0) && (fontPtr->objRefCount == 0)) {
+ ckfree(fontPtr);
+- objPtr->internalRep.twoPtrValue.ptr1 = NULL;
+ }
++ objPtr->internalRep.twoPtrValue.ptr1 = NULL;
++ objPtr->internalRep.twoPtrValue.ptr2 = NULL;
+ }
+ }
+
+ /*
+ *---------------------------------------------------------------------------
+@@ -1547,10 +1554,12 @@
+ {
+ TkFont *fontPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
+
+ dupObjPtr->typePtr = srcObjPtr->typePtr;
+ dupObjPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
++ dupObjPtr->internalRep.twoPtrValue.ptr2
++ = srcObjPtr->internalRep.twoPtrValue.ptr2;
+
+ if (fontPtr != NULL) {
+ fontPtr->objRefCount++;
+ }
+ }
+
+Index: tests/font.test
+==================================================================
+--- x/tests/font.test
++++ x/tests/font.test
+@@ -2343,13 +2343,23 @@
+
+ test font-46.5 {font actual, too many chars} -body {
+ font actual {times 10} 123456789012345678901234567890123456789012345678901
+ } -returnCodes error -result {expected a single character but got "1234567890123456789012345678901234567..."}
+
++test font-47.1 {Bug f214b8ad5b} -body {
++ interp create one
++ interp create two
++ load {} Tk one
++ load {} Tk two
++ one eval menu .menubar
++ two eval menu .menubar
++ interp delete one
++ interp delete two
++} -result {}
+
+ # cleanup
+ cleanupTests
+ return
+
+
+
+
+
More information about the Pkg-tcltk-commits
mailing list