Merge ~bryce/ubuntu/+source/tango:merge-v9.3.4adfsg1-1-impish into ubuntu/+source/tango:debian/sid

[Bryce Harrington]

Merge with Debian's package. Another trivial one, just one patch on our end that I gather still needs carried forward.

Usual tags pushed for review:
 - tags/old/debian 748b6b5
 - tags/new/debian 8abe72e
 - tags/old/ubuntu 7d98694
 - tags/logical/9.2.5a+dfsg1-2ubuntu1 6e17fb2
 - tags/reconstruct/9.2.5a+dfsg1-2ubuntu1 74839aa
 - tags/split/9.2.5a+dfsg1-2ubuntu1 f783e12

PPA: https://launchpad.net/~bryce/+archive/ubuntu/tango-merge-v9.3.4adfsg1-1

Still TODO: Fix ftbfs due to C++-17-isms

79da53f... by Bryce Harrington on 2021-08-13

      + Refresh patch

92ad3d2... by Bryce Harrington on 2021-08-13

merge-changelogs

1a53b21... by Bryce Harrington on 2021-08-13

reconstruct-changelog

eaf4bfa... by Bryce Harrington on 2021-08-13

update-maintainer

[Utkarsh Gupta (utkarsh)]

I see you marked it as "Work in progress" again, so I/we are not reviewing. Let us know if that's not intentional or something.

[Bryce Harrington (bryce)]

On Fri, Aug 13, 2021 at 04:39:29AM -0000, Utkarsh Gupta wrote:
> I see you marked it as "Work in progress" again, so I/we are not reviewing. Let us know if that's not intentional or something.
> --

Yeah I discovered a build issue, unrelated to the merge.
There's some C++17 assertion stuff that doesn't work with the new gcc.
I'll fix that up and then un-WIP the mp.

[Bryce Harrington (bryce)]

Didn't get a chance to fix the ftbfs before FF, and not good candidate to FFe so leaving to next cycle.

Unmerged commits

eaf4bfa... by Bryce Harrington on 2021-08-13

update-maintainer

1a53b21... by Bryce Harrington on 2021-08-13

reconstruct-changelog

92ad3d2... by Bryce Harrington on 2021-08-13

merge-changelogs

79da53f... by Bryce Harrington on 2021-08-13

      + Refresh patch

f49456f... by Bryce Harrington on 2021-08-12

    - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
      (LP: #1863026)

diff --git a/debian/changelog b/debian/changelog
index 76e8adb..9433650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tango (9.3.4+dfsg1-1ubuntu1) impish; 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)
+      + Refresh patch
+
+ -- Bryce Harrington <[e-mail]>  Thu, 12 Aug 2021 20:39:44 -0700
+
 tango (9.3.4+dfsg1-1) unstable; urgency=medium
 
   * New upstream version 9.3.4+dfsg1
@@ -67,6 +76,25 @@ tango (9.3.4~rc2+dfsg2-1~exp1) experimental; urgency=medium
 
  -- Picca Frédéric-Emmanuel <[e-mail]>  Wed, 13 Nov 2019 21:31:59 +0100
 
+tango (9.2.5a+dfsg1-2ubuntu1) focal; urgency=medium
+
+  * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+    (LP: #1863026)
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 14 Feb 2020 15:20:27 -0300
+
+tango (9.2.5a+dfsg1-2build2) eoan; urgency=medium
+
+  * No change rebuild for libmysqlclient21.
+
+ -- Robie Basak <[e-mail]>  Mon, 12 Aug 2019 02:06:15 +0000
+
+tango (9.2.5a+dfsg1-2build1) bionic; urgency=medium
+
+  * No-change rebuild for omniorb soname changes.
+
+ -- Matthias Klose <[e-mail]>  Wed, 07 Feb 2018 11:38:05 +0000
+
 tango (9.2.5a+dfsg1-2) unstable; urgency=high
 
   * fix for real #848137.
diff --git a/debian/control b/debian/control
index 5d19d81..bdb04e6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: tango
-Maintainer: Debian Science Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Science Maintainers <[e-mail]>
 Uploaders: Picca Frédéric-Emmanuel <[e-mail]>
 Section: science
 Priority: optional
diff --git a/debian/patches/0003-doc-not-install-doc-with-make-install.patch b/debian/patches/0003-doc-not-install-doc-with-make-install.patch
index 5e9d026..ec5174a 100644
--- a/debian/patches/0003-doc-not-install-doc-with-make-install.patch
+++ b/debian/patches/0003-doc-not-install-doc-with-make-install.patch
@@ -8,8 +8,6 @@ this way we can install the doc only during the non-arch part
  doc/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 68632fc..c964e3b 100644
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/mysql8_my_bool.patch b/debian/patches/mysql8_my_bool.patch
new file mode 100644
index 0000000..94000a1
--- /dev/null
+++ b/debian/patches/mysql8_my_bool.patch
@@ -0,0 +1,27 @@
+Description: Reintroduce my_bool to fix build with MySQL 8
+Author: Andreas Hasenack <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026
+Forwarded: no
+Last-Update: 2020-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cppserver/database/DataBase.h
++++ b/cppserver/database/DataBase.h
+@@ -49,6 +49,7 @@
+ #include <my_global.h>
+ #endif
+ #include <mysql.h>
++typedef bool my_bool;
+ #include <update_starter.h>
+ 
+ #ifndef LIBMARIADB
+--- a/cppserver/tangoaccesscontrol/TangoAccessControl.h
++++ b/cppserver/tangoaccesscontrol/TangoAccessControl.h
+@@ -47,6 +47,7 @@
+ #include <tango.h>
+ #include <AccessControl.h>
+ #include <mysql.h>
++typedef bool my_bool;
+ 
+ 
+ #define	CONTROL_SYSTEM				"CtrlSystem"
diff --git a/debian/patches/series b/debian/patches/series
index 1cf77ae..85d05a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
 0003-doc-not-install-doc-with-make-install.patch
+mysql8_my_bool.patch