[Pkg-xfce-commits] r2042 - desktop/trunk/orage/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-18 15:22:55 +0000 (Sun, 18 May 2008)
New Revision: 2042

Modified:
   desktop/trunk/orage/debian/changelog
   desktop/trunk/orage/debian/control
Log:
* debian/control: 
  - remove Martin Loschwitz from Uploaders.
  - drop Conflicts/Replaces: xfcalendar, not present in Etch.

Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog	2008-05-18 15:17:44 UTC (rev 2041)
+++ desktop/trunk/orage/debian/changelog	2008-05-18 15:22:55 UTC (rev 2042)
@@ -3,9 +3,11 @@
   * switch to triggers
     - drop debian/postinst
     - debian/control: conflicts against non-triggers-enabled xfce-mcs-manager.
-  * debian/control: remove Martin Loschwitz from Uploaders.
+  * debian/control: 
+    - remove Martin Loschwitz from Uploaders.
+    - drop Conflicts/Replaces: xfcalendar, not present in Etch.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 17:17:23 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 17:22:24 +0200
 
 orage (4.5.12.2-5) unstable; urgency=low
 

Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control	2008-05-18 15:17:44 UTC (rev 2041)
+++ desktop/trunk/orage/debian/control	2008-05-18 15:22:55 UTC (rev 2042)
@@ -13,8 +13,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-mcs-manager
 Suggests: sox
-Conflicts: xfcalendar, xfce-mcs-manager (<< 4.4.2-3)
-Replaces: xfcalendar
+Conflicts: xfce-mcs-manager (<< 4.4.2-3)
 Description: Calendar for Xfce Desktop Environment
  This package contains a calendar for the Xfce4 desktop environment.
  It integrates itself nicely into the desktop environment, is highly