r36505 - in /desktop/experimental/gnome-shell: ./ debian/changelog debian/control debian/control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jan  2 20:23:30 2013
New Revision: 36505

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36505
Log:
Revert previous commit, we work around menu-xdg in gnome-menus now.

Modified:
    desktop/experimental/gnome-shell/   (props changed)
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/control
    desktop/experimental/gnome-shell/debian/control.in

Propchange: desktop/experimental/gnome-shell/
            ('svn:mergeinfo' removed)

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=36505&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Wed Jan  2 20:23:30 2013
@@ -2,8 +2,6 @@
 
   [ Josselin Mouette ]
   * Recommend gkbd-capplet for gkbd-keyboard-display. Closes: #691731.
-  * Conflict with menu-xdg because the maintainer refuses to fix bug
-    #696530.
 
   [ Jeremy Bicha ]
   * debian/control.in: Bump minimum mutter & eds depends

Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=36505&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Wed Jan  2 20:23:30 2013
@@ -105,7 +105,6 @@
         gnome-tweak-tool (<< 3.5),
         gdm3 (<< 3.5.90)
 Conflicts: gnome-screensaver (<< 3.6)
-Conflicts: menu-xdg
 Description: graphical shell for the GNOME desktop
  The GNOME Shell redefines user interactions with the GNOME desktop.
  In particular, it offers new paradigms for launching applications,

Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=36505&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Wed Jan  2 20:23:30 2013
@@ -101,7 +101,6 @@
         gnome-tweak-tool (<< 3.5),
         gdm3 (<< 3.5.90)
 Conflicts: gnome-screensaver (<< 3.6)
-Conflicts: menu-xdg
 Description: graphical shell for the GNOME desktop
  The GNOME Shell redefines user interactions with the GNOME desktop.
  In particular, it offers new paradigms for launching applications,