[neon/backports-jammy/libsignon-glib/Neon/unstable] debian: optional-documentation.diff: replace by upstream commit

[Pino Toscano]

Git commit f3a27cd336c254df253c548fc472a72d4a151f67 by Pino Toscano.
Committed on 05/01/2021 at 15:26.
Pushed by carlosdem into branch 'Neon/unstable'.

optional-documentation.diff: replace by upstream commit

M  +4    -0    debian/changelog
D  +0    -18   debian/patches/optional-documentation.diff
M  +1    -1    debian/patches/series
A  +28   -0    debian/patches/upstream_build-make-documentation-really-optional.patch

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

diff --git a/debian/changelog b/debian/changelog
index 807c66b..9dec2c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 libsignon-glib (2.1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Replace the patch optional-documentation.diff with upstream commit
+    fc1098b3a376a04020c9e733eafda9fa0ac51723; patch
+    upstream_build-make-documentation-really-optional.patch.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2021 16:24:18 +0100
 
diff --git a/debian/patches/optional-documentation.diff b/debian/patches/optional-documentation.diff
deleted file mode 100644
index 8587fe1..0000000
--- a/debian/patches/optional-documentation.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Make the API documentation optional.
-Forwarded: no
-Last-Update: 2020-12-31
-
---- a/meson.build
-+++ b/meson.build
-@@ -23,7 +23,9 @@ endif
- root_dir = include_directories ('.')
- 
- subdir('libsignon-glib')
--subdir('docs')
-+if get_option('documentation')
-+    subdir('docs')
-+endif
- 
- if get_option('python')
-     subdir('pygobject')
diff --git a/debian/patches/series b/debian/patches/series
index 3171841..b87b7d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
+upstream_build-make-documentation-really-optional.patch
 fix-interfaces-path.diff
-optional-documentation.diff
diff --git a/debian/patches/upstream_build-make-documentation-really-optional.patch b/debian/patches/upstream_build-make-documentation-really-optional.patch
new file mode 100644
index 0000000..e56a31c
--- /dev/null
+++ b/debian/patches/upstream_build-make-documentation-really-optional.patch
@@ -0,0 +1,28 @@
+From fc1098b3a376a04020c9e733eafda9fa0ac51723 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sat, 2 Jan 2021 14:19:18 +0100
+Subject: [PATCH] build: make documentation really optional
+
+Build of the documentation only if the meson option for it is enabled.
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5d0de55..b10f80d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -23,7 +23,9 @@ endif
+ root_dir = include_directories ('.')
+ 
+ subdir('libsignon-glib')
+-subdir('docs')
++if get_option('documentation')
++    subdir('docs')
++endif
+ 
+ if get_option('python')
+     subdir('pygobject')
+-- 
+2.29.2
+