r41142 - in /desktop/unstable/meta-gnome3: ./ debian/changelog debian/control debian/control.in

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sun Mar 30 11:50:08 2014
New Revision: 41142

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41142
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/unstable/meta-gnome3/   (props changed)
    desktop/unstable/meta-gnome3/debian/changelog
    desktop/unstable/meta-gnome3/debian/control
    desktop/unstable/meta-gnome3/debian/control.in

Propchange: desktop/unstable/meta-gnome3/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/wheezy/meta-gnome3:39674

Modified: desktop/unstable/meta-gnome3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/changelog?rev=41142&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/changelog	[utf-8] Sun Mar 30 11:50:08 2014
@@ -1,3 +1,12 @@
+meta-gnome3 (1:3.8+6) UNRELEASED; urgency=medium
+
+  * 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
+
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 30 Mar 2014 13:49:23 +0200
+
 meta-gnome3 (1:3.8+5) unstable; urgency=medium
 
   [ Laurent Bigonville ]

Modified: desktop/unstable/meta-gnome3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control?rev=41142&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control	[utf-8] Sun Mar 30 11:50:08 2014
@@ -7,7 +7,7 @@
 Section: metapackages
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.4
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
@@ -159,8 +159,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}
@@ -174,6 +172,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/unstable/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control.in?rev=41142&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control.in	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control.in	[utf-8] Sun Mar 30 11:50:08 2014
@@ -154,8 +154,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}
@@ -169,6 +167,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