[neon/backports-jammy/libsignon-glib/Neon/unstable] debian: update the patches

[Pino Toscano]

Git commit 3e2705c85d3e10cbf6f617b684e238c8f0a0374d by Pino Toscano.
Committed on 31/12/2020 at 12:49.
Pushed by carlosdem into branch 'Neon/unstable'.

update the patches

- remove-pluginlibdir.patch: drop, fixed upstream
- disable-deprecation-error.patch: update

M  +3    -0    debian/changelog
M  +6    -9    debian/patches/disable-deprecation-error.patch
D  +0    -15   debian/patches/remove-pluginlibdir.patch
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/backports-jammy/libsignon-glib/-/commit/3e2705c85d3e10cbf6f617b684e238c8f0a0374d

diff --git a/debian/changelog b/debian/changelog
index 3285609..7b5be08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ libsignon-glib (1.15-0r1) UNRELEASED; urgency=medium
     - explicitly add valac, already used
     - drop signond-dev, no more needed
   * Remove libsignon-glib-dbg in favour of the -dbgsym packages.
+  * Update the patches:
+    - remove-pluginlibdir.patch: drop, fixed upstream
+    - disable-deprecation-error.patch: update
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Dec 2020 12:54:04 +0100
 
diff --git a/debian/patches/disable-deprecation-error.patch b/debian/patches/disable-deprecation-error.patch
index 15f10ab..a18c894 100644
--- a/debian/patches/disable-deprecation-error.patch
+++ b/debian/patches/disable-deprecation-error.patch
@@ -1,16 +1,13 @@
 Author: Adrian Bunk
 Subject: Don't build with -Werror
-diff --git a/libsignon-glib/Makefile.am b/libsignon-glib/Makefile.am
-index e208101..f534d84 100644
 --- a/libsignon-glib/Makefile.am
 +++ b/libsignon-glib/Makefile.am
-@@ -7,7 +7,7 @@ libsignon_glib_la_CPPFLAGS = \
- 	-I$(top_builddir) \
- 	-I$(builddir) \
+@@ -9,7 +9,7 @@ libsignon_glib_la_CPPFLAGS = \
+ libsignon_glib_la_CFLAGS = \
  	$(DEPS_CFLAGS) \
--	-Wall -Werror
-+	-Wall
+ 	$(COVERAGE_CFLAGS) \
+-	-Wall -Werror -Wno-error=deprecated-declarations
++	-Wall -Wno-error=deprecated-declarations
  libsignon_glib_la_LIBADD = $(DEPS_LIBS)
  libsignon_glib_la_LDFLAGS = \
- 	-version-info 1:0:0 \
-
+ 	$(COVERAGE_LDFLAGS) \
diff --git a/debian/patches/remove-pluginlibdir.patch b/debian/patches/remove-pluginlibdir.patch
deleted file mode 100644
index f94592f..0000000
--- a/debian/patches/remove-pluginlibdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Diane Trout <diane at debian.org>
-Description: @pluginlibdir@ is never set in 1.12 and so
- generates a lintian error message, about pkg-config-bad-directive.
- This removes it for the moment.
-Bug: https://gitlab.com/accounts-sso/libsignon-glib/issues/1
---- a/libsignon-glib.pc.in
-+++ b/libsignon-glib.pc.in
-@@ -2,7 +2,6 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--pluginlibdir=@pluginlibdir@
- 
- Name: libsignon-glib
- Description: A low-level library for managing account credentials.
diff --git a/debian/patches/series b/debian/patches/series
index 02cc8ed..52801d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-remove-pluginlibdir.patch
 disable-deprecation-error.patch