diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-05-06 08:04:19 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-05-06 08:04:19 +0200 |
| commit | 6dc4a14e122270c93a2940011ec451719aac22d2 (patch) | |
| tree | 1b23c15f5e0de5eee8004827ea7b9dcbc90fac48 | |
| parent | 6edcf4a90a0f80f6112ac4c29d2a311de8bdd0d0 (diff) | |
| parent | 2861a48339aa0756131008dfaf399426c97de34b (diff) | |
Merge tag 'debian/0.30.15-2' into develop
Bugfix release
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0110-use_relative_lib_path.patch | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/shotwell.lintian-overrides | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 85745f5..7059e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ -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 <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> Wed, 04 May 2022 19:36:55 +0200 + -- Jörg Frings-Fürst <debian@jff.email> Thu, 05 May 2022 18:06:01 +0200 shotwell (0.30.15-1) unstable; urgency=medium 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: <name and email of author, optional> +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 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 |