r36504 - in /desktop/unstable/gnome-shell/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jan  2 20:21:38 2013
New Revision: 36504

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

Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/control
    desktop/unstable/gnome-shell/debian/control.in

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=36504&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Wed Jan  2 20:21:38 2013
@@ -1,10 +1,3 @@
-gnome-shell (3.4.2-5) UNRELEASED; urgency=low
-
-  * Conflict with menu-xdg because the maintainer refuses to fix bug
-    #696530.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 29 Dec 2012 01:54:06 +0100
-
 gnome-shell (3.4.2-4) unstable; urgency=low
 
   * 30_lockup_gc.patch: backported from 3.6. Remove a forced garbage 

Modified: desktop/unstable/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control?rev=36504&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control [utf-8] Wed Jan  2 20:21:38 2013
@@ -95,7 +95,6 @@
         gnome-control-center (<< 1:3.0),
         gnome-session (<< 3.0),
         gnome-tweak-tool (<< 3.3)
-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/unstable/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control.in?rev=36504&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control.in [utf-8] Wed Jan  2 20:21:38 2013
@@ -90,7 +90,6 @@
         gnome-control-center (<< 1:3.0),
         gnome-session (<< 3.0),
         gnome-tweak-tool (<< 3.3)
-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,