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

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Nov  4 23:21:05 2014
New Revision: 43829

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43829
Log:
 * Merge tomboy | gnote dependency with bijiben dependency.
   - they're all note-takeing apps, who needs more then one?

Modified:
    desktop/unstable/meta-gnome3/debian/changelog
    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=43829&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/changelog	[utf-8] Tue Nov  4 23:21:05 2014
@@ -33,6 +33,8 @@
    * Initial pass at updating required versions to jessie version.
      - lots of packages versions bumped.
      - libvte-2.90-dev changed to libvte-2.91-dev
+   * Merge tomboy | gnote dependency with bijiben dependency.
+     - they're all note-takeing apps, who needs more then one?
 
  -- Laurent Bigonville <bigon at debian.org>  Wed, 10 Sep 2014 11:12:22 +0200
 

Modified: desktop/unstable/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control.in?rev=43829&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control.in	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control.in	[utf-8] Tue Nov  4 23:21:05 2014
@@ -100,7 +100,7 @@
          network-manager-gnome (>= 0.9.4) [linux-any],
 # Official apps modules
          aisleriot (>= 1:3.14),
-         bijiben,
+         bijiben | tomboy (>= 1.14) [!mips !mipsel !alpha !hppa] | gnote,
          cheese (>= 3.14) [linux-any],
          evolution (>= 3.12),
          evolution-plugins (>= 3.12),
@@ -139,7 +139,6 @@
          shotwell [linux-any],
          simple-scan [linux-any],
          sound-juicer (>= 3.14),
-         tomboy (>= 1.14) [!mips !mipsel !alpha !hppa] | gnote,
          tracker-gui,
          transmission-gtk,
          xdg-user-dirs-gtk,