diffstat of debian/ for shotwell_0.30.1-1 shotwell_0.30.1-1endless1

 changelog                               |   11 +++++++++++
 control                                 |    1 +
 patches/endless-desktop-full-mime.patch |   27 +++++++++++++++++++++++++++
 patches/series                          |    1 +
 rules                                   |    2 +-
 5 files changed, 41 insertions(+), 1 deletion(-)

diff -Nru shotwell-0.30.1/debian/changelog shotwell-0.30.1/debian/changelog
--- shotwell-0.30.1/debian/changelog	2018-09-30 17:02:22.000000000 +0000
+++ shotwell-0.30.1/debian/changelog	2019-04-01 07:57:31.000000000 +0000
@@ -1,3 +1,14 @@
+shotwell (0.30.1-1endless1) eos; urgency=medium
+
+  * Rebase on Debian Buster, remaining changes:
+    - debian/control, debian/rules:
+      Build with eoscontent.
+    - debian/patches/endless-desktop-full-mime.patch:
+      Merge MIME types into shotwell.desktop since that's what we use
+      for the Photos app.
+
+ -- Daniel Drake <drake@endlessm.com>  Mon, 01 Apr 2019 15:57:31 +0800
+
 shotwell (0.30.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru shotwell-0.30.1/debian/control shotwell-0.30.1/debian/control
--- shotwell-0.30.1/debian/control	2018-09-30 15:58:10.000000000 +0000
+++ shotwell-0.30.1/debian/control	2019-04-01 07:57:31.000000000 +0000
@@ -31,6 +31,7 @@
  libxml2 (>= 2.6.32),
  meson,
  ninja-build,
+ eos-shell-content-dev,
  valac (>= 0.22.0)
 Standards-Version: 4.2.1
 Homepage: https://wiki.gnome.org/Apps/Shotwell
diff -Nru shotwell-0.30.1/debian/patches/endless-desktop-full-mime.patch shotwell-0.30.1/debian/patches/endless-desktop-full-mime.patch
--- shotwell-0.30.1/debian/patches/endless-desktop-full-mime.patch	1970-01-01 00:00:00.000000000 +0000
+++ shotwell-0.30.1/debian/patches/endless-desktop-full-mime.patch	2019-04-01 07:57:31.000000000 +0000
@@ -0,0 +1,27 @@
+Add MIME types from shotwell-viewer.desktop to shotwell.desktop. We use
+shotwell.desktop for our Photos app and expect that it will open all
+photo file types.
+
+It might be best to do this and remove shotwell-viewer.desktop since
+there will now be two applications showing to handle photos. They do
+have slightly different behavior as one uses %f (launch many times for
+multiple files) vs %U (open all files in one instance).
+
+This also has the disadvantage that the patch would need to be updated
+every time the MIME types in shotwell-viewer are changed upstream.
+
+https://github.com/endlessm/eos-shell/issues/5272
+
+Index: shotwell-0.30.1/misc/shotwell.desktop.in
+===================================================================
+--- shotwell-0.30.1.orig/misc/shotwell.desktop.in
++++ shotwell-0.30.1/misc/shotwell.desktop.in
+@@ -10,7 +10,7 @@ Exec=shotwell %U
+ Icon=shotwell
+ Terminal=false
+ Type=Application
+-MimeType=x-content/image-dcf;
++MimeType=x-content/image-dcf;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;
+ Categories=Graphics;Photography;GNOME;GTK;
+ X-GIO-NoFuse=true
+ X-GNOME-Gettext-Domain=shotwell
diff -Nru shotwell-0.30.1/debian/patches/series shotwell-0.30.1/debian/patches/series
--- shotwell-0.30.1/debian/patches/series	2018-07-09 10:10:39.000000000 +0000
+++ shotwell-0.30.1/debian/patches/series	2019-04-01 07:57:31.000000000 +0000
@@ -11,3 +11,4 @@
 #0515-Fix_background_color_drawing.patch
 #505-fix-viewer-desktop-file.patch
 0105-gitversion.patch
+endless-desktop-full-mime.patch
diff -Nru shotwell-0.30.1/debian/rules shotwell-0.30.1/debian/rules
--- shotwell-0.30.1/debian/rules	2018-09-30 16:06:57.000000000 +0000
+++ shotwell-0.30.1/debian/rules	2019-04-01 07:57:31.000000000 +0000
@@ -5,7 +5,7 @@
 export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
 
 %:
-	dh $@  --buildsystem=meson --with gnome
+	dh $@  --buildsystem=meson --with gnome,eoscontent
 
 override_dh_gnome_clean:
 	dh_gnome_clean --no-control