diffstat for shotwell-0.26.4 shotwell-0.26.4 changelog | 22 ++++++++++++++++++++++ control | 1 + patches/endless-desktop-full-mime.patch | 25 +++++++++++++++++++++++++ patches/series | 1 + rules | 2 +- 5 files changed, 50 insertions(+), 1 deletion(-) diff -Nru shotwell-0.26.4/debian/changelog shotwell-0.26.4/debian/changelog --- shotwell-0.26.4/debian/changelog 2017-12-15 10:52:17.000000000 +0000 +++ shotwell-0.26.4/debian/changelog 2018-03-23 17:32:08.000000000 +0000 @@ -1,3 +1,14 @@ +shotwell (0.26.4-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. + + -- Ben Hutchings Fri, 23 Mar 2018 17:32:08 +0000 + shotwell (0.26.4-1) unstable; urgency=medium * New upstream release (Closes: #855681, #841859, #870027): @@ -33,6 +44,17 @@ -- Jörg Frings-Fürst Fri, 15 Dec 2017 11:52:17 +0100 +shotwell (0.25.4+really0.24.5-0.1endless1) eos; urgency=medium + + * Rebase on new upstream. 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 Mon, 27 Nov 2017 15:08:23 +0000 + shotwell (0.25.4+really0.24.5-0.1) unstable; urgency=medium * Revert to last stable release 0.24.5 (Closes: #850149). diff -Nru shotwell-0.26.4/debian/control shotwell-0.26.4/debian/control --- shotwell-0.26.4/debian/control 2017-12-15 09:57:18.000000000 +0000 +++ shotwell-0.26.4/debian/control 2018-03-23 17:31:56.000000000 +0000 @@ -28,6 +28,7 @@ libsqlite3-dev (>= 3.5.9), libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), + eos-shell-content-dev, valac (>= 0.22.0) Standards-Version: 4.1.2.0 Homepage: https://wiki.gnome.org/Apps/Shotwell diff -Nru shotwell-0.26.4/debian/patches/endless-desktop-full-mime.patch shotwell-0.26.4/debian/patches/endless-desktop-full-mime.patch --- shotwell-0.26.4/debian/patches/endless-desktop-full-mime.patch 1970-01-01 00:00:00.000000000 +0000 +++ shotwell-0.26.4/debian/patches/endless-desktop-full-mime.patch 2018-03-23 17:31:56.000000000 +0000 @@ -0,0 +1,25 @@ +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 + +--- a/misc/shotwell.desktop.in.in ++++ b/misc/shotwell.desktop.in.in +@@ -8,7 +8,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.26.4/debian/patches/series shotwell-0.26.4/debian/patches/series --- shotwell-0.26.4/debian/patches/series 2017-03-22 06:53:09.000000000 +0000 +++ shotwell-0.26.4/debian/patches/series 2018-03-23 17:31:56.000000000 +0000 @@ -9,3 +9,4 @@ 0100-ios8.patch #0510-Delay_size_request.patch #0515-Fix_background_color_drawing.patch +endless-desktop-full-mime.patch diff -Nru shotwell-0.26.4/debian/rules shotwell-0.26.4/debian/rules --- shotwell-0.26.4/debian/rules 2017-08-13 14:32:28.000000000 +0000 +++ shotwell-0.26.4/debian/rules 2018-03-23 17:31:56.000000000 +0000 @@ -7,7 +7,7 @@ B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)") %: - dh $@ + dh $@ --with eoscontent override_dh_auto_configure: dh_auto_configure -- --prefix=/usr \