[Pkg-xfce-commits] r3486 - goodies/trunk/xfce4-clipman-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2009-09-07 17:55:59 +0000 (Mon, 07 Sep 2009)
New Revision: 3486

Modified:
   goodies/trunk/xfce4-clipman-plugin/debian/changelog
   goodies/trunk/xfce4-clipman-plugin/debian/control
Log:
upload

Modified: goodies/trunk/xfce4-clipman-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/changelog	2009-09-07 07:01:00 UTC (rev 3485)
+++ goodies/trunk/xfce4-clipman-plugin/debian/changelog	2009-09-07 17:55:59 UTC (rev 3486)
@@ -1,3 +1,11 @@
+xfce4-clipman-plugin (2:1.1.0-3) unstable; urgency=low
+
+  * debian/control:
+    - make xfce4-clipman conflicts against old xfce4-clipman-plugin because
+      there are file conflicts.                                 closes: #545501
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 07 Sep 2009 19:32:50 +0200
+
 xfce4-clipman-plugin (2:1.1.0-2) unstable; urgency=low
 
   * debian/control:

Modified: goodies/trunk/xfce4-clipman-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/control	2009-09-07 07:01:00 UTC (rev 3485)
+++ goodies/trunk/xfce4-clipman-plugin/debian/control	2009-09-07 17:55:59 UTC (rev 3486)
@@ -17,6 +17,8 @@
 Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: xfce4-clipman-plugin (< 2:1.1.0)
+Replaces: xfce4-clipman-plugin (< 2:1.1.0)
 Description: clipboard history utility
  Clipman enables you to store and recall X selections, as well as GTK+
  clipboard content. You can also define actions to be triggered by selecting