Merge branch 'release/0.28.3-1'0.28.3-1

8 files changed, 50 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index ee3b059..5696176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+shotwell (0.28.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * 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.
+  * debian/control:
+    - Switch Vcs-* to new location.
+  * debian/copyright:
+    - Use secure copyright format URI.
+    - Bump years to 2018.
+  * Declare compliance with Debian Policy 4.1.5 (No changes needed).
+  * Remove unneeded comments from shotwell.lintian-overrides.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 08 Jul 2018 14:34:46 +0200
+
 shotwell (0.26.4-1) unstable; urgency=medium
 
   * New upstream release (Closes: #855681, #841859, #870027):
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..14f05b8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  appstream-util,
- debhelper (>= 10),
+ debhelper (>= 11),
  desktop-file-utils,
  gnome-doc-utils,
  itstool,
@@ -29,10 +29,10 @@ Build-Depends:
  libwebkit2gtk-4.0-dev,
  libxml2 (>= 2.6.32),
  valac (>= 0.22.0)
-Standards-Version: 4.1.2.0
+Standards-Version: 4.1.5
 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
diff --git a/debian/copyright b/debian/copyright
index dd4b907..c8a83db 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 <jim@yorba.org>
 Source: https://wiki.gnome.org/Apps/Shotwell
@@ -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 <d.filoni@ubuntu.com>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 Files: icons/pin-toolbar.svg
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
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..f52cd58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,8 @@
 #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
+#505-fix-viewer-desktop-file.patch
+0105-gitversion.patch
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