From dc6c76eb04dfe3d4262a1806808f0bc0bf523238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:42:54 +0200 Subject: New upstream release --- debian/changelog | 6 ++++++ debian/files | 1 + 2 files changed, 7 insertions(+) create mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee3b059..5d8ef77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shotwell (0.28.2-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 + shotwell (0.26.4-1) unstable; urgency=medium * New upstream release (Closes: #855681, #841859, #870027): diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..be40916 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +shotwell_0.26.4-1_source.buildinfo gnome optional -- cgit v1.2.3 From 8f3b4c02579d1ad244663842b792919dd6ef6c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 18:12:06 +0200 Subject: work on patches --- debian/changelog | 3 +++ debian/files | 1 - debian/patches/0105-gitversion.patch | 19 +++++++++++++++++++ debian/patches/series | 3 ++- 4 files changed, 24 insertions(+), 2 deletions(-) delete mode 100644 debian/files create mode 100644 debian/patches/0105-gitversion.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d8ef77..83f73cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ shotwell (0.28.2-1) UNRELEASED; urgency=medium * New upstream release. + * Remove upstream applied patches: + - 0100-ios8.patch + * New debian/patches/0105-gitversion.patch to fix FTBFS. -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/files b/debian/files deleted file mode 100644 index be40916..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -shotwell_0.26.4-1_source.buildinfo gnome optional diff --git a/debian/patches/0105-gitversion.patch b/debian/patches/0105-gitversion.patch new file mode 100644 index 0000000..aba218b --- /dev/null +++ b/debian/patches/0105-gitversion.patch @@ -0,0 +1,19 @@ +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/series b/debian/patches/series index ab17c96..035a6e6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ #0502-Have-all-soup-sessions-validate-TLS-certificates.patch #0503-facebook-Dont-disable-XSS-auditor.patch #0600-remove_wrong_marco.patch -0100-ios8.patch +#0100-ios8.patch #0510-Delay_size_request.patch #0515-Fix_background_color_drawing.patch +0105-gitversion.patch -- cgit v1.2.3 From e06daba27d51b7a5196d840f93a0e2476508e067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 18:19:42 +0200 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 83f73cf..5c4f300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ shotwell (0.28.2-1) UNRELEASED; urgency=medium * Remove upstream applied patches: - 0100-ios8.patch * New debian/patches/0105-gitversion.patch to fix FTBFS. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Change debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 2846a52..ece5e8e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: appstream-util, - debhelper (>= 10), + debhelper (>= 11), desktop-file-utils, gnome-doc-utils, itstool, -- cgit v1.2.3 From 0391bb351dc30ba49eb615e976b3c93a819e42d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 18:22:16 +0200 Subject: d/copyright: Use secure copyright format URI --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5c4f300..0b68a82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shotwell (0.28.2-1) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Change debhelper version in debian/control to >= 11. + * debian/copyright: + - Use secure copyright format URI. -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/copyright b/debian/copyright index dd4b907..c075815 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: shotwell Upstream-Contact: Jim Nelson Source: https://wiki.gnome.org/Apps/Shotwell -- cgit v1.2.3 From 5f1388a0513f9e418db91d486988e2e5b41ae2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 18:29:09 +0200 Subject: d/copyright: Bump years to 2018 --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b68a82..5bbd927 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ shotwell (0.28.2-1) UNRELEASED; urgency=medium - Change debhelper version in debian/control to >= 11. * debian/copyright: - Use secure copyright format URI. + - Bump years to 2018. -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/copyright b/debian/copyright index c075815..c8a83db 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,12 +8,12 @@ Copyright: 2009-2013 Yorba Foundation 2010 Evgeniy Polyakov 2010 Maxim Kartashev 2013 Jens Bav - 2016-2017 Software Freedom Conservancy Inc. + 2016-2018 Software Freedom Conservancy Inc. License: LGPL-2.1 Files: debian/* Copyright: 2009-2011 Devid Antonio Filoni - 2014-2017 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: GPL-2+ Files: icons/pin-toolbar.svg -- cgit v1.2.3 From 55778740c211992cc86ea87588ab62c6750f36d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 18:41:09 +0200 Subject: Declare compliance with Debian Policy 4.1.4; typo in debian/patches/series --- debian/changelog | 1 + debian/control | 2 +- debian/patches/series | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5bbd927..23f2277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ shotwell (0.28.2-1) UNRELEASED; urgency=medium * debian/copyright: - Use secure copyright format URI. - Bump years to 2018. + * Declare compliance with Debian Policy 4.1.4 (No changes needed). -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/control b/debian/control index ece5e8e..c3a0e71 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), valac (>= 0.22.0) -Standards-Version: 4.1.2.0 +Standards-Version: 4.1.4 Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ diff --git a/debian/patches/series b/debian/patches/series index 035a6e6..f52cd58 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,5 @@ #0100-ios8.patch #0510-Delay_size_request.patch #0515-Fix_background_color_drawing.patch +#505-fix-viewer-desktop-file.patch 0105-gitversion.patch -- cgit v1.2.3 From e8f4d7a9cdd37c5a9fb3b6991a4e9173829808da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 21:12:07 +0200 Subject: new upstream release 0.28.3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 23f2277..0c9344a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.28.2-1) UNRELEASED; urgency=medium +shotwell (0.28.3-1) UNRELEASED; urgency=medium * New upstream release. * Remove upstream applied patches: -- cgit v1.2.3 From e39fb481451da02b4ecc5e464f427f4efeaad640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 21:21:52 +0200 Subject: Switch VCS-* to new location --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0c9344a..c16f2c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shotwell (0.28.3-1) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Change debhelper version in debian/control to >= 11. + * debian/control: + - Switch Vcs-* to new location. * debian/copyright: - Use secure copyright format URI. - Bump years to 2018. diff --git a/debian/control b/debian/control index c3a0e71..1c53b12 100644 --- a/debian/control +++ b/debian/control @@ -31,8 +31,8 @@ Build-Depends: valac (>= 0.22.0) Standards-Version: 4.1.4 Homepage: https://wiki.gnome.org/Apps/Shotwell -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/shotwell.git/ +Vcs-Git: git://jff.email/opt/git/shotwell.git +Vcs-Browser: https://jff.email/cgit/shotwell.git Package: shotwell Architecture: linux-any -- cgit v1.2.3 From 14b23e61420b28ac1f9ad362294f59b3dcb8db67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 22:22:00 +0200 Subject: Remove unneeded comments from shotwell.lintian-overrides --- debian/changelog | 1 + debian/shotwell.lintian-overrides | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c16f2c7..3857533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ shotwell (0.28.3-1) UNRELEASED; urgency=medium - Use secure copyright format URI. - Bump years to 2018. * Declare compliance with Debian Policy 4.1.4 (No changes needed). + * Remove unneeded comments from shotwell.lintian-overrides. -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 diff --git a/debian/shotwell.lintian-overrides b/debian/shotwell.lintian-overrides index c39dad0..bb5c383 100644 --- a/debian/shotwell.lintian-overrides +++ b/debian/shotwell.lintian-overrides @@ -1,6 +1 @@ -#image-file-in-usr-lib -# -# see debian bug #731987 -# -#sharedobject-in-library-directory-missing-soname non-dev-pkg-with-shlib-symlink -- cgit v1.2.3 From b4af69e6130c434d9ad7ca052128922b4de64d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 22:24:04 +0200 Subject: Change date/time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3857533..66352b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.28.3-1) UNRELEASED; urgency=medium +shotwell (0.28.3-1) unstable; urgency=medium * New upstream release. * Remove upstream applied patches: @@ -15,7 +15,7 @@ shotwell (0.28.3-1) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.1.4 (No changes needed). * Remove unneeded comments from shotwell.lintian-overrides. - -- Jörg Frings-Fürst Tue, 01 May 2018 14:40:57 +0200 + -- Jörg Frings-Fürst Mon, 25 Jun 2018 22:23:15 +0200 shotwell (0.26.4-1) unstable; urgency=medium -- cgit v1.2.3 From 5c8be07095cc04a6d8a95204b0504fd7ab030154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Jul 2018 14:35:12 +0200 Subject: Declare compliance with Debian Policy 4.1.5 --- debian/changelog | 4 ++-- debian/control | 2 +- debian/files | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 66352b6..5696176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,10 +12,10 @@ shotwell (0.28.3-1) unstable; urgency=medium * debian/copyright: - Use secure copyright format URI. - Bump years to 2018. - * Declare compliance with Debian Policy 4.1.4 (No changes needed). + * Declare compliance with Debian Policy 4.1.5 (No changes needed). * Remove unneeded comments from shotwell.lintian-overrides. - -- Jörg Frings-Fürst Mon, 25 Jun 2018 22:23:15 +0200 + -- Jörg Frings-Fürst Sun, 08 Jul 2018 14:34:46 +0200 shotwell (0.26.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 1c53b12..14f05b8 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: libwebkit2gtk-4.0-dev, libxml2 (>= 2.6.32), valac (>= 0.22.0) -Standards-Version: 4.1.4 +Standards-Version: 4.1.5 Homepage: https://wiki.gnome.org/Apps/Shotwell Vcs-Git: git://jff.email/opt/git/shotwell.git Vcs-Browser: https://jff.email/cgit/shotwell.git diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..f95e7a0 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +shotwell_0.28.3-1_source.buildinfo gnome optional -- cgit v1.2.3