r39674 - in /desktop/wheezy/meta-gnome3/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep 26 10:04:18 2013
New Revision: 39674

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39674
Log:
Demote xul-ext-adblock-plus to Suggests. Icedove and Iceweasel receive
major updates via stable-security causing them to get out of sync and
making xul-ext-adblock-plus and thus gnome-core uninstallable.
Closes: #715555

Modified:
    desktop/wheezy/meta-gnome3/debian/changelog
    desktop/wheezy/meta-gnome3/debian/control
    desktop/wheezy/meta-gnome3/debian/control.in

Modified: desktop/wheezy/meta-gnome3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/meta-gnome3/debian/changelog?rev=39674&op=diff
==============================================================================
--- desktop/wheezy/meta-gnome3/debian/changelog	[utf-8] (original)
+++ desktop/wheezy/meta-gnome3/debian/changelog	[utf-8] Thu Sep 26 10:04:18 2013
@@ -1,3 +1,12 @@
+meta-gnome3 (1:3.4+8) UNRELEASED; urgency=low
+
+  * Demote xul-ext-adblock-plus to Suggests. Icedove and Iceweasel receive
+    major updates via stable-security causing them to get out of sync and
+    making xul-ext-adblock-plus and thus gnome-core uninstallable.
+    Closes: #715555
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 26 Sep 2013 11:54:31 +0200
+
 meta-gnome3 (1:3.4+7) unstable; urgency=low
 
   * Depend on gkbd-capplet for the gkbd-keyboard-display binary.

Modified: desktop/wheezy/meta-gnome3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/meta-gnome3/debian/control?rev=39674&op=diff
==============================================================================
--- desktop/wheezy/meta-gnome3/debian/control	[utf-8] (original)
+++ desktop/wheezy/meta-gnome3/debian/control	[utf-8] Thu Sep 26 10:04:18 2013
@@ -160,8 +160,6 @@
          telepathy-rakia,
          telepathy-salut,
          totem-plugins,
-# To match functionality that used to be in epiphany
-         xul-ext-adblock-plus,
 # For debconf
          libgtk2-perl (>= 1:1.130),
          ${misc:Depends}
@@ -176,6 +174,8 @@
           libreoffice-evolution,
           planner,
           iceweasel-l10n-all,
+# To match functionality that used to be in epiphany
+          xul-ext-adblock-plus,
           xul-ext-gnome-keyring
 Description: Full GNOME Desktop Environment, with extra components
  This is the GNOME Desktop environment, an intuitive and attractive

Modified: desktop/wheezy/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/meta-gnome3/debian/control.in?rev=39674&op=diff
==============================================================================
--- desktop/wheezy/meta-gnome3/debian/control.in	[utf-8] (original)
+++ desktop/wheezy/meta-gnome3/debian/control.in	[utf-8] Thu Sep 26 10:04:18 2013
@@ -155,8 +155,6 @@
          telepathy-rakia,
          telepathy-salut,
          totem-plugins,
-# To match functionality that used to be in epiphany
-         xul-ext-adblock-plus,
 # For debconf
          libgtk2-perl (>= 1:1.130),
          ${misc:Depends}
@@ -171,6 +169,8 @@
           libreoffice-evolution,
           planner,
           iceweasel-l10n-all,
+# To match functionality that used to be in epiphany
+          xul-ext-adblock-plus,
           xul-ext-gnome-keyring
 Description: Full GNOME Desktop Environment, with extra components
  This is the GNOME Desktop environment, an intuitive and attractive