Merge branch 'release/debian/0.30.15-2'debian/0.30.15-2

5 files changed, 36 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index e38e9cf..7059e0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+shotwell (0.30.15-2) unstable; urgency=medium
+
+  * New debian/patches/0110-use_relative_lib_path.patch:
+    - Use relative path for libs (Closes: #1010571).
+      Thanks to Neil McGovern <neilm@debian.org>.
+  * Remove trailing whitespace from debian/rules.
+  * Rename lintian tag non-dev-pkg-with-shlib-symlink to
+    link-to-shared-library-in-wrong-package.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 05 May 2022 18:06:01 +0200
+
 shotwell (0.30.15-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0110-use_relative_lib_path.patch b/debian/patches/0110-use_relative_lib_path.patch
new file mode 100644
index 0000000..3e64e9f
--- /dev/null
+++ b/debian/patches/0110-use_relative_lib_path.patch
@@ -0,0 +1,22 @@
+Description: Use relative path for lib
+Author: Jens Georg <mail@jensge.org>
+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 5f63750..7063390 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 #0105-gitversion.patch
+0110-use_relative_lib_path.patch
diff --git a/debian/rules b/debian/rules
index a772218..e8ca0d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
 
-#Enable the apport option when building of Ubuntu 
+#Enable the apport option when building of Ubuntu
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
                 APPORT = -Dinstall-apport-hook=true
 endif
diff --git a/debian/shotwell.lintian-overrides b/debian/shotwell.lintian-overrides
index 61210c5..0dd035f 100644
--- a/debian/shotwell.lintian-overrides
+++ b/debian/shotwell.lintian-overrides
@@ -1,2 +1,2 @@
-non-dev-pkg-with-shlib-symlink
+link-to-shared-library-in-wrong-package
 package-name-doesnt-match-sonames libshotwell-authenticator0 libshotwell-plugin-common0 libshotwell-plugin-dev-1.0-0