r13974 - in /desktop/unstable/gdm/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Dec 19 14:34:37 2007
New Revision: 13974

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13974
Log:
* Conflict against gnome-panel (<< 2.19.2). Closes: #446762.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/control
    desktop/unstable/gdm/debian/control.in

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13974&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Wed Dec 19 14:34:37 2007
@@ -1,8 +1,12 @@
 gdm (2.20.2-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Drop xbase-clients dep; thanks Robert Millan; closes: #455538.
 
- -- Loic Minier <lool at dooz.org>  Mon, 10 Dec 2007 20:32:10 +0100
+  [ Josselin Mouette ]
+  * Conflict against gnome-panel (<< 2.19.2). Closes: #446762.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 19 Dec 2007 15:33:53 +0100
 
 gdm (2.20.2-1) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=13974&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Wed Dec 19 14:34:37 2007
@@ -55,6 +55,7 @@
 Provides: x-display-manager
 Conflicts: fast-user-switch-applet (<< 2.17.4),
            gnome-session (<< 2.19.2),
+           gnome-panel (<< 2.19.2),
            gnome-screensaver (<< 2.17.7)
 Description: GNOME Display Manager
  gdm provides the equivalent of a "login:" prompt for X displays- it

Modified: desktop/unstable/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control.in?rev=13974&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control.in (original)
+++ desktop/unstable/gdm/debian/control.in Wed Dec 19 14:34:37 2007
@@ -55,6 +55,7 @@
 Provides: x-display-manager
 Conflicts: fast-user-switch-applet (<< 2.17.4),
            gnome-session (<< 2.19.2),
+           gnome-panel (<< 2.19.2),
            gnome-screensaver (<< 2.17.7)
 Description: GNOME Display Manager
  gdm provides the equivalent of a "login:" prompt for X displays- it