[Pkg-tcltk-commits] r299 - tcltk-defaults/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-18 16:55:40 +0000 (Thu, 18 Oct 2007)
New Revision: 299

Modified:
   tcltk-defaults/trunk/debian/control
   tcltk-defaults/trunk/debian/control.in
Log:
[tcltk-defaults]
Fixed tk conflicts.


Modified: tcltk-defaults/trunk/debian/control
===================================================================
--- tcltk-defaults/trunk/debian/control	2007-10-18 16:46:24 UTC (rev 298)
+++ tcltk-defaults/trunk/debian/control	2007-10-18 16:55:40 UTC (rev 299)
@@ -54,7 +54,7 @@
 Priority: optional
 Architecture: all
 Depends: tk8.4 (>= 8.4.16-2), tcl (= ${binary:Version})
-Conflicts: tcl8.3 (<< 8.3.5-11), tcl8.4 (<< 8.4.16-2), tcl8.5 (<< 0.b1-2)
+Conflicts: tk8.3 (<< 8.3.5-11), tk8.4 (<< 8.4.16-2), tk8.5 (<< 0.b1-2)
 Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.

Modified: tcltk-defaults/trunk/debian/control.in
===================================================================
--- tcltk-defaults/trunk/debian/control.in	2007-10-18 16:46:24 UTC (rev 298)
+++ tcltk-defaults/trunk/debian/control.in	2007-10-18 16:55:40 UTC (rev 299)
@@ -54,7 +54,7 @@
 Priority: optional
 Architecture: all
 Depends: tk at VER@ (>= @TKVER@), tcl (= ${binary:Version})
-Conflicts: tcl8.3 (<< 8.3.5-11), tcl8.4 (<< 8.4.16-2), tcl8.5 (<< 0.b1-2)
+Conflicts: tk8.3 (<< 8.3.5-11), tk8.4 (<< 8.4.16-2), tk8.5 (<< 0.b1-2)
 Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
  Tk is a cross-platform graphical toolkit which provides the Motif
  look-and-feel and is implemented using the Tcl scripting language.