r15713 - in /desktop/unstable/meta-gnome2/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Apr 20 14:33:38 2008
New Revision: 15713

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15713
Log:
* Drop gnome-keyring-manager. Closes: #476327.
* gnome conflicts with gnome-cups-manager, to force its removal and 
  avoid having two "Printing" icons in the menu.

Modified:
    desktop/unstable/meta-gnome2/debian/changelog
    desktop/unstable/meta-gnome2/debian/control
    desktop/unstable/meta-gnome2/debian/control.in

Modified: desktop/unstable/meta-gnome2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/changelog?rev=15713&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog (original)
+++ desktop/unstable/meta-gnome2/debian/changelog Sun Apr 20 14:33:38 2008
@@ -3,6 +3,9 @@
   * Replace gnome-cups-manager by system-config-printer.
     Closes: #451360.
   * libnss3-0d-dbg is now libnss3-1d-dbg. Closes: #469871.
+  * Drop gnome-keyring-manager. Closes: #476327.
+  * gnome conflicts with gnome-cups-manager, to force its removal and 
+    avoid having two "Printing" icons in the menu.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 17 Feb 2008 12:57:01 +0100
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=15713&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control (original)
+++ desktop/unstable/meta-gnome2/debian/control Sun Apr 20 14:33:38 2008
@@ -30,6 +30,7 @@
          epiphany-extensions,
          evolution-webcal (>= 2.12.0),
          serpentine
+Conflicts: gnome-cups-manager
 Suggests: gnome-dbg
 Description: The GNOME Desktop Environment, with extra components
  This is the GNOME Desktop environment, an intuitive and attractive
@@ -87,7 +88,6 @@
          gnome-backgrounds (>= 2.20.0),
          gnome-about (>= 2.20.2),
          gnome-keyring (>= 2.20.3),
-         gnome-keyring-manager (>= 2.20.0),
          gnome-media (>= 2.20.1),
          gnome-menus (>= 2.20.2),
          gnome-netstatus-applet (>= 2.12.1),

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=15713&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in (original)
+++ desktop/unstable/meta-gnome2/debian/control.in Sun Apr 20 14:33:38 2008
@@ -30,6 +30,7 @@
          epiphany-extensions,
          evolution-webcal (>= 2.12.0),
          serpentine
+Conflicts: gnome-cups-manager
 Suggests: gnome-dbg
 Description: The GNOME Desktop Environment, with extra components
  This is the GNOME Desktop environment, an intuitive and attractive
@@ -87,7 +88,6 @@
          gnome-backgrounds (>= 2.20.0),
          gnome-about (>= 2.20.2),
          gnome-keyring (>= 2.20.3),
-         gnome-keyring-manager (>= 2.20.0),
          gnome-media (>= 2.20.1),
          gnome-menus (>= 2.20.2),
          gnome-netstatus-applet (>= 2.12.1),