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

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 16 16:34:25 2009
New Revision: 22357

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22357
Log:
* Make gnome architecture: any.
* Do not require tomboy on alpha, hppa, mips and mipsel. Drop the 
  gnote alternative.

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=22357&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/changelog [utf-8] Mon Nov 16 16:34:25 2009
@@ -2,6 +2,9 @@
 
   * gnome-user-share should be available again on non-Linux 
     architectures.
+  * Make gnome architecture: any.
+  * Do not require tomboy on alpha, hppa, mips and mipsel. Drop the 
+    gnote alternative.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 14 Nov 2009 13:42:16 +0100
 

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=22357&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control [utf-8] Mon Nov 16 16:34:25 2009
@@ -10,10 +10,10 @@
                dpkg-dev (>= 1.13.19)
 
 Package: gnome
-Architecture: all
-Section: gnome
-Priority: optional
-Depends: gnome-desktop-environment (>= ${source:Version}),
+Architecture: any
+Section: gnome
+Priority: optional
+Depends: gnome-desktop-environment (= ${binary:Version}),
          gdm-themes | gdm (>= 2.26),
          gnome-themes-extras,
          gnome-games (>= 1:2.28),
@@ -33,7 +33,7 @@
          transmission-gtk,
          arj,
          avahi-daemon,
-         tomboy (>= 1.0) | gnote,
+         tomboy (>= 1.0) [!mips !mipsel !alpha !hppa],
          gnome-volume-manager (>= 2.24)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.28),

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=22357&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in [utf-8] (original)
+++ desktop/unstable/meta-gnome2/debian/control.in [utf-8] Mon Nov 16 16:34:25 2009
@@ -10,10 +10,10 @@
                dpkg-dev (>= 1.13.19)
 
 Package: gnome
-Architecture: all
-Section: gnome
-Priority: optional
-Depends: gnome-desktop-environment (>= ${source:Version}),
+Architecture: any
+Section: gnome
+Priority: optional
+Depends: gnome-desktop-environment (= ${binary:Version}),
          gdm-themes | gdm (>= 2.26),
          gnome-themes-extras,
          gnome-games (>= 1:2.28),
@@ -33,7 +33,7 @@
          transmission-gtk,
          arj,
          avahi-daemon,
-         tomboy (>= 1.0) | gnote,
+         tomboy (>= 1.0) [!mips !mipsel !alpha !hppa],
          gnome-volume-manager (>= 2.24)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.28),