From 6edcf4a90a0f80f6112ac4c29d2a311de8bdd0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 4 May 2022 20:52:40 +0200 Subject: New debian/patches/0110-use_relative_lib_path.patch --- debian/changelog | 8 ++++++++ debian/patches/0110-use_relative_lib_path.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/0110-use_relative_lib_path.patch diff --git a/debian/changelog b/debian/changelog index e38e9cf..85745f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shotwell (0.30.15-2) UNRELEASED; urgency=medium + + * New debian/patches/0110-use_relative_lib_path.patch: + - Use relative path for libs (Closes: #1010571). + Thanks to Neil McGovern . + + -- Jörg Frings-Fürst Wed, 04 May 2022 19:36:55 +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..34b366c --- /dev/null +++ b/debian/patches/0110-use_relative_lib_path.patch @@ -0,0 +1,22 @@ +Description: Use relative path for lib +Author: +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 -- cgit v1.2.3 From 3a5dc5fe5c3a67c49af613e1385b5c1553f3385d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 4 May 2022 21:20:50 +0200 Subject: Remove trailing whitespace from debian/rules --- debian/changelog | 5 +++-- debian/rules | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85745f5..9f4359c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -shotwell (0.30.15-2) UNRELEASED; urgency=medium +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 . + * Remove trailing whitespace from debian/rules. - -- Jörg Frings-Fürst Wed, 04 May 2022 19:36:55 +0200 + -- Jörg Frings-Fürst Wed, 04 May 2022 20:59:00 +0200 shotwell (0.30.15-1) unstable; urgency=medium 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 -- cgit v1.2.3 From 51e563ab46627e4b518bd0dce840ea156780d90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 4 May 2022 21:49:58 +0200 Subject: Rename lintian tag --- debian/changelog | 2 ++ debian/shotwell.lintian-overrides | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9f4359c..3ff303e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ shotwell (0.30.15-2) unstable; urgency=medium - Use relative path for libs (Closes: #1010571). Thanks to Neil McGovern . * 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 Wed, 04 May 2022 20:59:00 +0200 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 -- cgit v1.2.3 From a41c1dfd8794c14cd05cc1ca53090b53e2651d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 4 May 2022 21:52:19 +0200 Subject: d/changelog: change date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ff303e..facab98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ shotwell (0.30.15-2) unstable; urgency=medium * Rename lintian tag non-dev-pkg-with-shlib-symlink to link-to-shared-library-in-wrong-package. - -- Jörg Frings-Fürst Wed, 04 May 2022 20:59:00 +0200 + -- Jörg Frings-Fürst Wed, 04 May 2022 21:51:16 +0200 shotwell (0.30.15-1) unstable; urgency=medium -- cgit v1.2.3 From 390d0d61f21b935741f53760d3e1b661ca33ab2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 5 May 2022 18:05:53 +0200 Subject: Fix the patch metadata: Author --- debian/patches/0110-use_relative_lib_path.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0110-use_relative_lib_path.patch b/debian/patches/0110-use_relative_lib_path.patch index 34b366c..3e64e9f 100644 --- a/debian/patches/0110-use_relative_lib_path.patch +++ b/debian/patches/0110-use_relative_lib_path.patch @@ -1,5 +1,5 @@ Description: Use relative path for lib -Author: +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 -- cgit v1.2.3 From b23befd6c67f54ff4c71bb7c125f11b694e7e513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 6 May 2022 08:02:12 +0200 Subject: d/changelog: Change date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index facab98..7059e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ shotwell (0.30.15-2) unstable; urgency=medium * Rename lintian tag non-dev-pkg-with-shlib-symlink to link-to-shared-library-in-wrong-package. - -- Jörg Frings-Fürst Wed, 04 May 2022 21:51:16 +0200 + -- Jörg Frings-Fürst Thu, 05 May 2022 18:06:01 +0200 shotwell (0.30.15-1) unstable; urgency=medium -- cgit v1.2.3