Merge ~mkukri/ubuntu/+source/kannel:merge into ubuntu/+source/kannel:debian/sid

[Mate Kukri]

Merge with Debian sid.
* Rebased single Ubuntu change (MySQL 8 still looks relevant).
* Local test build is okay.

[Simon Quigley (tsimonq2)]

+1, let's keep this delta through the LTS.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6d8e3bf..2d518f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kannel (1.4.5-13ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+      (LP #1863026)
+
+ -- Mate Kukri <[e-mail]>  Fri, 05 Jan 2024 10:41:05 +0000
+
 kannel (1.4.5-13) unstable; urgency=medium
 
   * Disable PCRE support, as PCRE3 will go away from Debian (Closes: #1000133)
@@ -26,6 +34,28 @@ kannel (1.4.5-10) unstable; urgency=medium
 
  -- Chris Hofstaedtler <[e-mail]>  Tue, 05 Oct 2021 08:26:39 +0000
 
+kannel (1.4.5-9ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against openssl3
+
+ -- Simon Chopin <[e-mail]>  Fri, 03 Dec 2021 14:33:51 +0100
+
+kannel (1.4.5-9ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable.  Remaining changes:
+    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+      (LP #1863026)
+  * Dropped:
+    - Disable PostScript documentation generation to fix the build now
+      that ImageMagick PostScript conversion is no longer permitted
+      (LP #1838425).
+      [Included in Debian as of 1.4.5-7]
+    - Drop Build-Depends-Indep on imagemagick since it is no longer
+      required following the above change.
+      [Included in Debian as of 1.4.5-7]
+
+ -- Bryce Harrington <[e-mail]>  Tue, 15 Dec 2020 08:56:28 -0800
+
 kannel (1.4.5-9) unstable; urgency=medium
 
   * Fix FTBFS with gcc-10 by hiding some local symbols (Closes: #957396)
@@ -60,6 +90,23 @@ kannel (1.4.5-6) unstable; urgency=medium
 
  -- Chris Hofstaedtler <[e-mail]>  Thu, 28 Nov 2019 10:06:57 +0000
 
+kannel (1.4.5-3ubuntu2) focal; urgency=medium
+
+  * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+    (LP: #1863026)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 13 Feb 2020 13:28:28 -0300
+
+kannel (1.4.5-3ubuntu1) eoan; urgency=medium
+
+  * Disable PostScript documentation generation to fix the build now
+    that ImageMagick PostScript conversion is no longer permitted
+    (LP: #1838425).
+  * Drop Build-Depends-Indep on imagemagick since it is no required following
+    the above change.
+
+ -- Robie Basak <[e-mail]>  Wed, 31 Jul 2019 12:59:05 +0000
+
 kannel (1.4.5-5) unstable; urgency=medium
 
   * d/copyright: update file wildcards
diff --git a/debian/control b/debian/control
index 231e535..9baf90c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: kannel
 Section: net
 Priority: optional
-Maintainer: Chris Hofstaedtler <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Chris Hofstaedtler <[e-mail]>
 Build-Depends: autoconf,
                automake,
                debhelper-compat (= 12),
diff --git a/debian/patches/mysql8_my_bool.patch b/debian/patches/mysql8_my_bool.patch
new file mode 100644
index 0000000..a3becb4
--- /dev/null
+++ b/debian/patches/mysql8_my_bool.patch
@@ -0,0 +1,19 @@
+Description: Reintroduce my_bool to fix build with MySQL 8
+Author: Andreas Hasenack <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gambas3/+bug/1863026
+Forwarded: no
+Last-Update: 2020-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/gwlib/dbpool_mysql.c b/gwlib/dbpool_mysql.c
+index b64b5e2..da244d5 100644
+--- a/gwlib/dbpool_mysql.c
++++ b/gwlib/dbpool_mysql.c
+@@ -65,6 +65,7 @@
+ 
+ #ifdef HAVE_MYSQL
+ #include <mysql.h>
++typedef bool my_bool;
+ #include <mysqld_error.h>
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 85e04a2..6194d9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 40_strip_date_from_version_report_string.patch
 50_disable-ps-docs.patch
 60_libxml2_detect.patch
+mysql8_my_bool.patch