[neon/backports-focal/wayland-protocols/Neon/release] debian: manually merge in https://salsa.debian.org/xorg-team/wayland/wayland-protocols.git debian-unstable branch

[Jonathan Riddell]

Git commit 9fc743653a07f255816dec8028eaa05f7d2c992a by Jonathan Riddell.
Committed on 01/12/2021 at 14:37.
Pushed by jriddell into branch 'Neon/release'.

manually merge in https://salsa.debian.org/xorg-team/wayland/wayland-protocols.git debian-unstable branch

M  +22   -3    debian/changelog
M  +1    -0    debian/control
A  +3    -0    debian/gbp.conf
A  +1    -0    debian/source/local-options

https://invent.kde.org/neon/backports-focal/wayland-protocols/commit/9fc743653a07f255816dec8028eaa05f7d2c992a

diff --git a/debian/changelog b/debian/changelog
index d1b7738..be44794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
-wayland-protocols (1.24-0neon) UNRELEASED; urgency=medium
+wayland-protocols (1.24-1) unstable; urgency=medium
 
-  * New release
+  * New upstream release.
+  * debian/control: build depends on meson >= 0.54.0.
+
+ -- Héctor Orón Martínez <zumbi at debian.org>  Sun, 28 Nov 2021 19:10:03 +0100
+
+wayland-protocols (1.23-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Héctor Orón Martínez <zumbi at debian.org>  Mon, 11 Oct 2021 12:16:36 +0200
+
+wayland-protocols (1.21-2) unstable; urgency=medium
+
+  * Release to unstable (Closes: #992857)
+
+ -- Héctor Orón Martínez <zumbi at debian.org>  Mon, 30 Aug 2021 19:17:15 +0200
+
+wayland-protocols (1.21-1) experimental; urgency=medium
+
+  * New upstream release.
 
- -- Jonathan Riddell <jr at jriddell.org>  Tue, 25 May 2021 10:45:27 +0100
+ -- Héctor Orón Martínez <zumbi at debian.org>  Fri, 25 Jun 2021 01:17:05 +0200
 
 wayland-protocols (1.20-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 44cbebd..f7b8b72 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Héctor Orón Martínez <zumbi at debian.org>,
            Emilio Pozuelo Monfort <pochu at debian.org>
 Build-Depends:
  debhelper (>=10),
+ meson (>= 0.54.0),
  libwayland-dev,
  pkg-config
 Standards-Version: 4.5.0
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..d73ee77
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = debian-unstable
+upstream-branch = upstream-unstable
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..88bdab7
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+extend-diff-ignore = autogen\.sh|m4/compat\.m4|\.editorconfig|\.gitlab-ci.yml