CVS commit by benb:
Prepare for 3.2.3 upload.
M +7 -0 changelog 1.72.2.7
M +15 -15 control 1.66.2.5
--- kdetoys/debian/changelog #1.72.2.6:1.72.2.7
@@ -1,2 +1,9 @@
+kdetoys (4:3.2.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Don't abuse conflicts (use replaces instead where this is more proper).
+
+ -- Ben Burton <[EMAIL PROTECTED]> Tue, 15 Jun 2004 08:38:18 +1000
+
kdetoys (4:3.2.2-1) unstable; urgency=low
--- kdetoys/debian/control #1.66.2.4:1.66.2.5
@@ -19,5 +19,5 @@
Section: doc
Suggests: www-browser, kdetoys
-Conflicts: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0),
kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
+Replaces: amor (<< 4:2.2.0-0), kmoon (<< 4:2.2.0-0), kodo (<< 4:2.2.0-0),
kteatime (<< 4:2.2.0-0), kweather (<< 4:3.0.0-0), kworldclock (<< 4:2.2.0-0)
Description: KDE toys documentation in HTML format
By default the toys provided with KDE (the K Desktop Environment) only
@@ -40,6 +40,6 @@
Recommends: kwin
Suggests: khelpcenter, kdetoys-doc-html
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: a KDE creature for your desktop
AMOR stands for Amusing Misuse Of Resources. It provides several different
@@ -56,6 +56,6 @@
Depends: ${shlibs:Depends}
Recommends: kicker
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys (<< 4:2.0-final-7)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: eyes applet for KDE
An applet for the KDE panel containing a pair of eyes that follow your mouse
@@ -82,6 +82,6 @@
Recommends: kicker
Suggests: khelpcenter, kdetoys-doc-html
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: moon phase indicator for KDE
Displays the current phase of the moon in the KDE system tray.
@@ -94,6 +94,6 @@
Depends: ${shlibs:Depends}
Suggests: khelpcenter, kdetoys-doc-html
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: mouse odometer for KDE
KOdometer measures your desktop mileage. It tracks the movement of your mouse
@@ -110,6 +110,6 @@
Recommends: kicker
Suggests: khelpcenter, kdetoys-doc-html
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: KDE utility for making a fine cup of tea
KTeaTime is a handy timer for steeping tea. No longer will you have to
@@ -127,6 +127,6 @@
Depends: ${shlibs:Depends}
Suggests: kwin
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys
-Replaces: kdetoys (<< 4:3.0.1-0)
+Conflicts: task-kdetoys
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys
Description: Tux screensaver for KDE
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
@@ -156,6 +156,6 @@
Depends: ${shlibs:Depends}
Suggests: kdeartwork-misc, kicker, khelpcenter, kdetoys-doc-html
-Conflicts: kdetoys (<< 4:3.0.1-0), task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
-Replaces: kdetoys (<< 4:3.0.1-0), kworldwatch (<= 4:2.2-beta1-1)
+Conflicts: task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
+Replaces: kdetoys (<< 4:3.0.1-0), task-kdetoys, kworldwatch (<= 4:2.2-beta1-1)
Provides: kworldwatch
Description: earth watcher for KDE
