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

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Jun  9 17:52:44 2009
New Revision: 20303

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20303
Log:
Make tomboy a dependency for gnome, with gnote as an alternative.
Closes: #532355.

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=20303&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/changelog (original)
+++ desktop/unstable/meta-gnome2/debian/changelog Tue Jun  9 17:52:44 2009
@@ -1,3 +1,10 @@
+meta-gnome2 (1:2.24.3~4) UNRELEASED; urgency=low
+
+  * Make tomboy a dependency for gnome, with gnote as an alternative.
+    Closes: #532355.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 09 Jun 2009 19:51:39 +0200
+
 meta-gnome2 (1:2.24.3~3) unstable; urgency=low
 
   * Add libgnomecanvas2-dbg.

Modified: desktop/unstable/meta-gnome2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control?rev=20303&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control (original)
+++ desktop/unstable/meta-gnome2/debian/control Tue Jun  9 17:52:44 2009
@@ -36,12 +36,12 @@
          bluez-gnome,
          arj,
          avahi-daemon,
+         tomboy (>= 0.12.2) | gnote,
          network-manager-gnome | gnome-network-admin (>= 2.22.1)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,
             gnome-office (= ${source:Version}),
-            tomboy (>= 0.12.2),
             update-notifier,
             gparted,
             tsclient,

Modified: desktop/unstable/meta-gnome2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome2/debian/control.in?rev=20303&op=diff
==============================================================================
--- desktop/unstable/meta-gnome2/debian/control.in (original)
+++ desktop/unstable/meta-gnome2/debian/control.in Tue Jun  9 17:52:44 2009
@@ -36,12 +36,12 @@
          bluez-gnome,
          arj,
          avahi-daemon,
+         tomboy (>= 0.12.2) | gnote,
          network-manager-gnome | gnome-network-admin (>= 2.22.1)
 Conflicts: gnome-cups-manager
 Recommends: gnome-games-extra-data (>= 2.24.0),
             epiphany-extensions-more,
             gnome-office (= ${source:Version}),
-            tomboy (>= 0.12.2),
             update-notifier,
             gparted,
             tsclient,