[Pkg-tcltk-commits] r276 - tk8.4/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-18 11:52:04 +0000 (Thu, 18 Oct 2007)
New Revision: 276

Modified:
   tk8.4/trunk/debian/changelog
   tk8.4/trunk/debian/control
Log:
[tk8.4]
  * Rearranged conflicts of tk8.4-doc package because of planned adoption of
    real tk-doc package.


Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog	2007-10-18 11:51:42 UTC (rev 275)
+++ tk8.4/trunk/debian/changelog	2007-10-18 11:52:04 UTC (rev 276)
@@ -10,8 +10,10 @@
   * Added Homepage field to debian/control.
   * Fixed segfault in case if only scalable fonts are available and the best
     scored font is infeasible (closes: #444546).
+  * Rearranged conflicts of tk8.4-doc package because of planned adoption of
+    real tk-doc package.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 16 Oct 2007 20:32:58 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Oct 2007 15:47:59 +0400
 
 tk8.4 (8.4.16-1) unstable; urgency=low
 

Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control	2007-10-18 11:51:42 UTC (rev 275)
+++ tk8.4/trunk/debian/control	2007-10-18 11:52:04 UTC (rev 276)
@@ -26,8 +26,8 @@
 Priority: optional
 Architecture: all
 Suggests: tk8.4
-Conflicts: tk-doc
-Provides: tk-doc
+Conflicts: tkdoc, tk8.3-doc, tk8.5-doc
+Provides: tkdoc
 Description: Tk toolkit for Tcl and X11, v8.4 - manual pages
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.