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

[bigon at users.alioth.debian.org]

Author: bigon
Date: Fri Apr 28 14:52:03 2017
New Revision: 52366

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52366
Log:
debian/control.in: Install shotwell by default again and keep gnome-photos
as an alternative. gnome-photos is not mature enough for now.

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=52366&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/changelog	[utf-8] Fri Apr 28 14:52:03 2017
@@ -1,3 +1,10 @@
+meta-gnome3 (1:3.22+3) UNRELEASED; urgency=medium
+
+  * debian/control.in: Install shotwell by default again and keep gnome-photos
+    as an alternative. gnome-photos is not mature enough for now.
+
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 28 Apr 2017 16:49:58 +0200
+
 meta-gnome3 (1:3.22+2) unstable; urgency=medium
 
   * Add chrome-gnome-shell dependency to gnome-core. This enables Chromium and

Modified: desktop/unstable/meta-gnome3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control?rev=52366&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control	[utf-8] Fri Apr 28 14:52:03 2017
@@ -112,7 +112,7 @@
          gnome-getting-started-docs (>= 3.22),
          gnome-maps (>= 3.22),
          gnome-music (>= 3.22),
-         gnome-photos (>= 3.22) | shotwell,
+         shotwell | gnome-photos (>= 3.22),
          gnome-screenshot (>= 3.22),
          gnome-sound-recorder,
          gnome-tweak-tool (>= 3.22),

Modified: desktop/unstable/meta-gnome3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/meta-gnome3/debian/control.in?rev=52366&op=diff
==============================================================================
--- desktop/unstable/meta-gnome3/debian/control.in	[utf-8] (original)
+++ desktop/unstable/meta-gnome3/debian/control.in	[utf-8] Fri Apr 28 14:52:03 2017
@@ -108,7 +108,7 @@
          gnome-getting-started-docs (>= 3.22),
          gnome-maps (>= 3.22),
          gnome-music (>= 3.22),
-         gnome-photos (>= 3.22) | shotwell,
+         shotwell | gnome-photos (>= 3.22),
          gnome-screenshot (>= 3.22),
          gnome-sound-recorder,
          gnome-tweak-tool (>= 3.22),