r25394 - in /desktop/unstable/meta-gnome2/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct 19 07:05:03 2010
New Revision: 25394

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25394
Log:
* Make gnome-office arch-any.
* Only pull simple-scan on Linux. Closes: #599838.

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

Modified: desktop/unstable/meta-gnome2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/changelog?rev=25394&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/changelog [utf-8] Tue Oct 19 07:05:03 2010
@@ -4,6 +4,8 @@
     lead to having only OOo installed by default. It’s sad since OOo 
     really has a crappy UI, but duplicating the functionality isn’t good 
     either.
+  * Make gnome-office arch-any.
+  * Only pull simple-scan on Linux. Closes: #599838.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 14 Oct 2010 15:16:00 +0200
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=25394&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control [utf-8] Tue Oct 19 07:05:03 2010
@@ -43,7 +43,7 @@
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.30),
             network-manager-gnome (>= 0.8),
-            gnome-office (= ${source:Version}),
+            gnome-office (= ${binary:Version}),
             update-notifier,
             shotwell,
             liferea | evolution-rss | blam,
@@ -191,14 +191,14 @@
  reader, a mouse-only input system, and several other tools.
 
 Package: gnome-office
-Architecture: all
+Architecture: any
 Section: gnome
 Priority: optional
 Depends: abiword (>= 2.8) | openoffice.org-gnome,
          gimp (>= 2.6),
          gnumeric (>= 1.10) | openoffice.org-gnome,
          inkscape (>= 0.47),
-         simple-scan
+         simple-scan [linux-any]
 Suggests: gnucash, dia-gnome, planner
 Description: The GNOME Office suite
  This is a set of applications labeled the "GNOME Office suite". It is a

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=25394&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control.in [utf-8] Tue Oct 19 07:05:03 2010
@@ -38,7 +38,7 @@
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.30),
             network-manager-gnome (>= 0.8),
-            gnome-office (= ${source:Version}),
+            gnome-office (= ${binary:Version}),
             update-notifier,
             shotwell,
             liferea | evolution-rss | blam,
@@ -186,14 +186,14 @@
  reader, a mouse-only input system, and several other tools.
 
 Package: gnome-office
-Architecture: all
+Architecture: any
 Section: gnome
 Priority: optional
 Depends: abiword (>= 2.8) | openoffice.org-gnome,
          gimp (>= 2.6),
          gnumeric (>= 1.10) | openoffice.org-gnome,
          inkscape (>= 0.47),
-         simple-scan
+         simple-scan [linux-any]
 Suggests: gnucash, dia-gnome, planner
 Description: The GNOME Office suite
  This is a set of applications labeled the "GNOME Office suite". It is a