From 397db8ca4d79a1a12db6c2fd4555c93ac1b5dee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 1 Oct 2022 22:20:25 +0200 Subject: Declare compliance with Debian Policy 4.6.1.0 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8d57c03..35780cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +shotwell (0.30.17-1) UNRELEASED; urgency=medium + + * New upstream release. + * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). + + -- Jörg Frings-Fürst Sat, 01 Oct 2022 21:55:48 +0200 + shotwell (0.30.16-1) unstable; urgency=medium * New upstream release: diff --git a/debian/control b/debian/control index 6fd47f7..2fdcdb3 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Build-Depends: meson, ninja-build, valac (>= 0.46.0) -Standards-Version: 4.6.0.1 +Standards-Version: 4.6.1.0 Rules-Requires-Root: binary-targets Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Git: git://jff.email/opt/git/shotwell.git -- cgit v1.2.3 From 75a936e5054cb15a73f385874fa499735a00230a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 1 Oct 2022 22:23:09 +0200 Subject: Delete not used patches --- debian/changelog | 1 + debian/patches/0105-gitversion.patch | 19 ------------------- debian/patches/0110-use_relative_lib_path.patch | 22 ---------------------- debian/patches/series | 2 -- 4 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 debian/patches/0105-gitversion.patch delete mode 100644 debian/patches/0110-use_relative_lib_path.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 35780cd..0917cfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ shotwell (0.30.17-1) UNRELEASED; urgency=medium * New upstream release. * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). + * Delete not used patches. -- Jörg Frings-Fürst Sat, 01 Oct 2022 21:55:48 +0200 diff --git a/debian/patches/0105-gitversion.patch b/debian/patches/0105-gitversion.patch deleted file mode 100644 index aba218b..0000000 --- a/debian/patches/0105-gitversion.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Typo in git version macro -Author: Jörg Fringy-Fürst -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=795719 -Last-Update: 2018-05-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/Resources.vala -=================================================================== ---- trunk.orig/src/Resources.vala -+++ trunk/src/Resources.vala -@@ -18,7 +18,7 @@ namespace Resources { - public const string APP_DIRECT_ROLE = _("Photo Viewer"); - public const string APP_VERSION = _VERSION; - --#if _GITVERSION -+#if _GIT_VERSION - public const string? GIT_VERSION = _GIT_VERSION; - #else - public const string? GIT_VERSION = null; diff --git a/debian/patches/0110-use_relative_lib_path.patch b/debian/patches/0110-use_relative_lib_path.patch deleted file mode 100644 index 3e64e9f..0000000 --- a/debian/patches/0110-use_relative_lib_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Use relative path for lib -Author: Jens Georg -Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/b3216719e9504518d6866adaaec532e5a7c09481 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010571 -Forwarded: not-needed -Applied-Upstream: commit -Last-Update: 2022-05-04 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/meson.build -=================================================================== ---- trunk.orig/meson.build -+++ trunk/meson.build -@@ -12,7 +12,7 @@ conf.set('_VERSION', '"@0@"'.format(meso - conf.set('_PREFIX', '"@0@"'.format(get_option('prefix'))) - conf.set('_LANG_SUPPORT_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('localedir')))) - conf.set('_LIBEXECDIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libexecdir')))) --conf.set('_LIB', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libdir')))) -+conf.set('_LIB', '"@0@"'.format(get_option('libdir'))) - configure_file(output : 'config.h', configuration: conf) - - config_incdir = include_directories('.') diff --git a/debian/patches/series b/debian/patches/series index cd86938..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -#0105-gitversion.patch -#0110-use_relative_lib_path.patch -- cgit v1.2.3 From 0fa5c3c25e4eb9aa7b7ad87996cb9151cc11831b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2022 08:03:40 +0200 Subject: Cherry-pick patch for Shotwell Viewer to open webp files --- debian/changelog | 3 +++ debian/control | 3 ++- debian/patches/0100-webp.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0100-webp.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0917cfe..4bb4f4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ shotwell (0.30.17-1) UNRELEASED; urgency=medium * New upstream release. * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). * Delete not used patches. + * Cherry-pick patch for Shotwell Viewer to open webp files (Closes: #1018025). + - New debian/patches/0100-webp.patch. + - debian/control: Add webp-pixbuf-loader to Build-Depends. -- Jörg Frings-Fürst Sat, 01 Oct 2022 21:55:48 +0200 diff --git a/debian/control b/debian/control index 2fdcdb3..4a37625 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,8 @@ Build-Depends: libxml2 (>= 2.6.32), meson, ninja-build, - valac (>= 0.46.0) + valac (>= 0.46.0), + webp-pixbuf-loader Standards-Version: 4.6.1.0 Rules-Requires-Root: binary-targets Homepage: https://wiki.gnome.org/Apps/Shotwell diff --git a/debian/patches/0100-webp.patch b/debian/patches/0100-webp.patch new file mode 100644 index 0000000..2686139 --- /dev/null +++ b/debian/patches/0100-webp.patch @@ -0,0 +1,21 @@ +Description: data: Declare support for WebP and GIF in viewer +Author: Jens Georg +Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/82c6707284bd590c5813691d602d87d8d237ac00 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018025 +Forwarded: no +Last-Update: 2022-10-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/misc/shotwell-viewer.desktop.in b/misc/shotwell-viewer.desktop.in +index b5e41f3..20b2f6e 100644 +--- a/misc/shotwell-viewer.desktop.in ++++ b/misc/shotwell-viewer.desktop.in +@@ -8,7 +8,7 @@ Icon=shotwell + Terminal=false + NoDisplay=true + Type=Application +-MimeType=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; ++MimeType=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;image/gif;image/webp + Categories=Graphics;Viewer;Photography;GNOME;GTK; + X-GIO-NoFuse=true + X-GNOME-Gettext-Domain=shotwell diff --git a/debian/patches/series b/debian/patches/series index e69de29..f7b4a86 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0100-webp.patch -- cgit v1.2.3 From 133064a8fce1a02e83874295ab20ab1dee304777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2022 08:11:19 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4bb4f4a..02ea115 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.30.17-1) UNRELEASED; urgency=medium +shotwell (0.30.17-1) unstable; urgency=medium * New upstream release. * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). @@ -7,7 +7,7 @@ shotwell (0.30.17-1) UNRELEASED; urgency=medium - New debian/patches/0100-webp.patch. - debian/control: Add webp-pixbuf-loader to Build-Depends. - -- Jörg Frings-Fürst Sat, 01 Oct 2022 21:55:48 +0200 + -- Jörg Frings-Fürst Sun, 02 Oct 2022 08:09:21 +0200 shotwell (0.30.16-1) unstable; urgency=medium -- cgit v1.2.3