[Pkg-xfce-commits] r2050 - desktop/trunk/xfce4-session/debian

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-18 16:09:45 +0000 (Sun, 18 May 2008)
New Revision: 2050

Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
Log:
* debian/control:
  - remove Conflicts/Replaces: xfce4-toys, since it's not in Etch.
  - drop Martin Loschwitz from Uploaders.
  - remove Conflicts on desktop-base since Etch as a correct version.

Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2008-05-18 16:07:10 UTC (rev 2049)
+++ desktop/trunk/xfce4-session/debian/changelog	2008-05-18 16:09:45 UTC (rev 2050)
@@ -3,8 +3,12 @@
   * switch to triggers:
     - debian/{postinst,prerm} dropped.
     - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. 
+  * debian/control:
+    - remove Conflicts/Replaces: xfce4-toys, since it's not in Etch.
+    - drop Martin Loschwitz from Uploaders.
+    - remove Conflicts on desktop-base since Etch as a correct version.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 17:54:42 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 May 2008 18:09:06 +0200
 
 xfce4-session (4.4.2-4) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2008-05-18 16:07:10 UTC (rev 2049)
+++ desktop/trunk/xfce4-session/debian/control	2008-05-18 16:09:45 UTC (rev 2050)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.4.2), xbase-clients, libxml-parser-perl, chrpath, quilt, fortune-mod, libdbus-1-dev
 Standards-Version: 3.7.3
 Homepage: http://www.xfce.org/
@@ -15,8 +15,7 @@
 Recommends: xbase-clients, xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11
 Suggests: sudo
 Provides: x-session-manager
-Conflicts: xfce4-toys, desktop-base (<< 0.3.20), xfce-mcs-manager (<< 4.4.2-3)
-Replaces: xfce4-toys
+Conflicts: xfce-mcs-manager (<< 4.4.2-3)
 Description: Xfce4 Session Manager
  xfce4-session is an X11-compliant "session manager" designed for use with
  the Xfce4 Desktop Environment. On log out, the session manager saves the