diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 18:12:06 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 18:12:06 +0200 |
| commit | 8f3b4c02579d1ad244663842b792919dd6ef6c6a (patch) | |
| tree | db020502acd0334d4975f48819449ccafcad5de3 | |
| parent | 2b3f22361da0c1d8e6ce70d71352821758186db7 (diff) | |
work on patches
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/files | 1 | ||||
| -rw-r--r-- | debian/patches/0105-gitversion.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 24 insertions, 2 deletions
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 <debian@jff.email> 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 <debian@jff.email> +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 |