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

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Sep 22 12:38:36 2012
New Revision: 35758

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35758
Log:
* Require libreoffice by default, in consistency with d-i.
* Install iceweasel instead of epiphany :(
  See bug#682481.
* Let gnome recommend iceweasel-l10n-all.

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

Modified: desktop/unstable/meta-gnome3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/changelog?rev=35758&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/changelog [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/changelog [utf-8] Sat Sep 22 12:38:36 2012
@@ -1,3 +1,12 @@
+meta-gnome3 (1:3.4+3) UNRELEASED; urgency=low
+
+  * Require libreoffice by default, in consistency with d-i.
+  * Install iceweasel instead of epiphany :(
+    See bug#682481.
+  * Let gnome recommend iceweasel-l10n-all.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 22 Sep 2012 14:35:14 +0200
+
 meta-gnome3 (1:3.4+2) unstable; urgency=low
 
   * Depend on g-tweak-tool, it is too useful to be left out.

Modified: desktop/unstable/meta-gnome3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control?rev=35758&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control [utf-8] Sat Sep 22 12:38:36 2012
@@ -28,7 +28,6 @@
          dconf-tools (>= 0.12),
          empathy (>= 3.4),
          eog (>= 3.4),
-         epiphany-browser (>= 3.4),
          evince (>= 3.4),
          evolution-data-server (>= 3.4),
          fonts-cantarell (>= 0.0.8),
@@ -76,6 +75,7 @@
          gtk2-engines (>= 2.20.2),
          gucharmap (>= 1:3.4),
          gvfs-backends (>= 1.12),
+         iceweasel (>= 10),
          libcanberra-pulse,
          metacity (>= 1:2.34),
          mousetweaks (>= 3.4),
@@ -124,15 +124,15 @@
          totem (>= 3.0),
          vinagre (>= 3.4),
 # More applications
-         abiword (>= 2.8) | libreoffice-gnome,
          alacarte (>= 0.13.4),
          avahi-daemon,
          gimp (>= 2.8),
          gnome-media (>= 3.4),
          gnome-tweak-tool (>= 3.4),
-         gnumeric (>= 1.10) | libreoffice-gnome,
          hamster-applet (>= 2.91.3),
          inkscape (>= 0.48),
+         libreoffice-gnome | abiword (>= 2.8),
+         libreoffice-gnome | gnumeric (>= 1.10),
          rhythmbox (>= 2.96),
          shotwell [linux-any],
          simple-scan [linux-any],
@@ -143,7 +143,6 @@
          xdg-user-dirs-gtk,
 # Plugins for core and apps
          cups-pk-helper (>= 0.2),
-         epiphany-extensions (>= 3.4),
          gedit-plugins (>= 3.4),
          gnome-applets (>= 3.4),
          gstreamer0.10-ffmpeg (>= 0.10.13),
@@ -163,6 +162,7 @@
 Recommends: browser-plugin-gnash,
             gdebi,
             gnome-games-extra-data (>= 3.0),
+            iceweasel-l10n-all,
             liferea | evolution-rss | blam,
             menu-xdg,
             nautilus-sendto-empathy,

Modified: desktop/unstable/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control.in?rev=35758&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control.in [utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control.in [utf-8] Sat Sep 22 12:38:36 2012
@@ -23,7 +23,6 @@
          dconf-tools (>= 0.12),
          empathy (>= 3.4),
          eog (>= 3.4),
-         epiphany-browser (>= 3.4),
          evince (>= 3.4),
          evolution-data-server (>= 3.4),
          fonts-cantarell (>= 0.0.8),
@@ -71,6 +70,7 @@
          gtk2-engines (>= 2.20.2),
          gucharmap (>= 1:3.4),
          gvfs-backends (>= 1.12),
+         iceweasel (>= 10),
          libcanberra-pulse,
          metacity (>= 1:2.34),
          mousetweaks (>= 3.4),
@@ -119,15 +119,15 @@
          totem (>= 3.0),
          vinagre (>= 3.4),
 # More applications
-         abiword (>= 2.8) | libreoffice-gnome,
          alacarte (>= 0.13.4),
          avahi-daemon,
          gimp (>= 2.8),
          gnome-media (>= 3.4),
          gnome-tweak-tool (>= 3.4),
-         gnumeric (>= 1.10) | libreoffice-gnome,
          hamster-applet (>= 2.91.3),
          inkscape (>= 0.48),
+         libreoffice-gnome | abiword (>= 2.8),
+         libreoffice-gnome | gnumeric (>= 1.10),
          rhythmbox (>= 2.96),
          shotwell [linux-any],
          simple-scan [linux-any],
@@ -138,7 +138,6 @@
          xdg-user-dirs-gtk,
 # Plugins for core and apps
          cups-pk-helper (>= 0.2),
-         epiphany-extensions (>= 3.4),
          gedit-plugins (>= 3.4),
          gnome-applets (>= 3.4),
          gstreamer0.10-ffmpeg (>= 0.10.13),
@@ -158,6 +157,7 @@
 Recommends: browser-plugin-gnash,
             gdebi,
             gnome-games-extra-data (>= 3.0),
+            iceweasel-l10n-all,
             liferea | evolution-rss | blam,
             menu-xdg,
             nautilus-sendto-empathy,