[Pkg-tcltk-commits] r277 - tk8.5/trunk/debian

[sgolovan-guest at alioth.debian.org]

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

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


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2007-10-18 11:52:04 UTC (rev 276)
+++ tk8.5/trunk/debian/changelog	2007-10-18 11:52:51 UTC (rev 277)
@@ -7,8 +7,10 @@
   * Removed conflicts with tcl and providing tcl-dev packages from
     debian/control to prepare binary packages for default tcl and tcl-dev.
   * Added Homepage field to debian/control.
+  * Rearranged conflicts of tk8.5-doc package because of planned adoption of
+    real tk-doc package.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 14 Oct 2007 21:56:36 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Oct 2007 15:47:59 +0400
 
 tk8.5 (0.b1-1) unstable; urgency=low
 

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