summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-06-04 07:16:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-06-04 07:17:28 +0000
commitc49779bc315552fcac2cd8ea21b0ab69fbe18e49 (patch)
tree22dbbd2facda5613400f923fc9e5f9b1ff1ee943
parentMerging upstream version 1:3.22+3. (diff)
downloadmeta-gnome3-c49779bc315552fcac2cd8ea21b0ab69fbe18e49.zip
meta-gnome3-c49779bc315552fcac2cd8ea21b0ab69fbe18e49.tar.xz
Merging debian version 1:3.22+3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rw-r--r--debian/control.in2
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 37e5972..e302366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+meta-gnome3 (1:3.22+3) unstable; 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@debian.org> Fri, 26 May 2017 11:08:56 +0200
+
meta-gnome3 (1:3.22+2-0dschinn1) dschinn; urgency=medium
* Uploading to dschinn, remaining changes:
diff --git a/debian/control b/debian/control
index c01c510..bf6646b 100644
--- a/debian/control
+++ b/debian/control
@@ -123,7 +123,7 @@ Depends: gnome-core (= ${binary:Version}),
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),
diff --git a/debian/control.in b/debian/control.in
index 40f6d59..15d6671 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -119,7 +119,7 @@ Depends: gnome-core (= ${binary:Version}),
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),