From f9901cbf18a47438d1dabf7c1e3f1579d1a57c6b Mon Sep 17 00:00:00 2001
From: VanOrton <>
Date: Mon, 19 Dec 2022 18:16:56 +0100
Subject: [PATCH] fix Debian Qt build (now requiring Ubuntu 20 for Qt > 5.11)

---
 debian.qt/build-in-docker.sh  | 14 ++++++--------
 debian.qt/control             | 15 +++++++++++++--
 debian.qt/rules               | 15 +++++++++++++--
 debian.qt/updateunattended.sh |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/debian.qt/build-in-docker.sh b/debian.qt/build-in-docker.sh
index ed79324b49..6d51a80654 100755
--- a/debian.qt/build-in-docker.sh
+++ b/debian.qt/build-in-docker.sh
@@ -4,20 +4,17 @@ set -e
 
 debuild -S
 
-finish() {
-    docker stop $container >/dev/null
-    docker container rm $container >/dev/null
-}
+#finish() {
+#    docker stop $container >/dev/null
+#    docker container rm $container >/dev/null
+#}
 
 docker pull ubuntu:20.04
 container=`docker run -dit ubuntu:20.04`
-trap finish EXIT
+#trap finish EXIT
 
 docker cp ./debian/updateunattended.sh $container:/root/
 docker exec $container /root/updateunattended.sh
-#docker exec $container apt-get -y update
-#docker exec $container apt-get -y install apt-utils devscripts sudo #dpkg-dev
-#docker exec $container apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools
 docker exec $container mkdir -p /root/repo
 docker exec $container useradd user
 docker exec $container mkdir /home/user
@@ -36,3 +33,4 @@ docker exec $container chmod -R a+rX /root/repo
 docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell-qt
 docker exec -w /home/user/build/bitgesell-qt-0.1.9 $container sudo -u user debuild -b
 docker cp $container:/home/user/build/bitgesell-qt_0.1.9_amd64.deb bitgesell-qt_0.1.9_amd64.deb
+docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.9_amd64.deb bitgesell-qt-dbg_0.1.9_amd64.deb
diff --git a/debian.qt/control b/debian.qt/control
index 78c5db272d..54c2843337 100644
--- a/debian.qt/control
+++ b/debian.qt/control
@@ -9,8 +9,19 @@ Homepage: https://github.com/wu-emma/bitgesell
 Package: bitgesell-qt
 Architecture: any
 Depends: libc6 (>= 2.27), libstdc++6 (>= 8.4.0), libbz2-1.0 (>= 1.0.6), liblzma5 (>= 5.2.2), zlib1g (>= 1:1.1.4),
- libqt5core5a (>= 5.1.1), libqt5dbus5 (>= 5.1.1), libqt5network5 (>= 5.1.1), libqt5gui5 (>= 5.1.1),
- openssl, perl-modules-5.26 | perl-modules-5.28 | perl-modules-5.30, ${misc:Depends}
+ libqt5core5a (>= 5.11.0), libqt5dbus5 (>= 5.11.0), libqt5network5 (>= 5.11.0), libqt5gui5 (>= 5.11.0),
+ openssl, ${misc:Depends}
+Description: BGL is an experimental digital currency that enables instant payments to anyone, anywhere in the world
+ BGL is an experimental digital currency that enables instant payments to anyone,
+ anywhere in the world. BGL uses peer-to-peer technology to operate with no central authority:
+ managing transactions and issuing money are carried out collectively by the network.
+ BGL Core is the name of open source software which enables the use of this currency.
+
+Package: bitgesell-qt-dbg
+Architecture: any
+Depends: libc6 (>= 2.27), libstdc++6 (>= 8.4.0), libbz2-1.0 (>= 1.0.6), liblzma5 (>= 5.2.2), zlib1g (>= 1:1.1.4),
+ libqt5core5a (>= 5.11.0), libqt5dbus5 (>= 5.11.0), libqt5network5 (>= 5.11.0), libqt5gui5 (>= 5.11.0),
+ openssl, ${misc:Depends}
 Description: BGL is an experimental digital currency that enables instant payments to anyone, anywhere in the world
  BGL is an experimental digital currency that enables instant payments to anyone,
  anywhere in the world. BGL uses peer-to-peer technology to operate with no central authority:
diff --git a/debian.qt/rules b/debian.qt/rules
index c4499afc52..36620c7511 100755
--- a/debian.qt/rules
+++ b/debian.qt/rules
@@ -3,8 +3,8 @@
 builddir = $(shell pwd)
 destdir = $(builddir)/debian/bitgesell-qt
 
-CC  = gcc-8
-CXX = g++-8
+CC  = gcc-9
+CXX = g++-9
 
 .PHONY: distrib download-distrib unpack-distrib berkeleydb libevent miniupnpc
 
@@ -80,12 +80,20 @@ override_dh_auto_configure:
 		--with-gui=yes \
 		--with-boost="$(builddir)/distrib/tmp/libboost"
 
+#override dh_auto_install:
+#	make -j1 install DESTDIR=$(destdir) AM_UPDATE_INFO_DIR=no
+
 override_dh_auto_test:
 	DEB_BUILD_OPTIONS=nocheck dh_auto_test
 
 override_dh_install:
 	dh_install
+# In compat 15 or later, dh_auto_install will use debian/tmp as the
+# default --destdir and should be moved from there to the
+# appropriate package build directory using dh_install(1) or
+# similar tools/
 	mkdir -p $(destdir)/usr/lib/bitgesell-qt
+	cp -r $(builddir)/debian/tmp/usr $(destdir)
 	cp -a distrib/tmp/libboost/lib/* $(destdir)/usr/lib/bitgesell-qt/
 	cp -a distrib/tmp/libdb/lib/* $(destdir)/usr/lib/bitgesell-qt/
 	cp -a distrib/tmp/libevent/lib/* $(destdir)/usr/lib/bitgesell-qt/
@@ -93,3 +101,6 @@ override_dh_install:
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib/bitgesell-qt
+
+override_dh_strip:
+	dh_strip --dbg-package=bitgesell-qt-dbg
diff --git a/debian.qt/updateunattended.sh b/debian.qt/updateunattended.sh
index 7978f41d10..0078ab3d7b 100755
--- a/debian.qt/updateunattended.sh
+++ b/debian.qt/updateunattended.sh
@@ -4,6 +4,6 @@ export TZ=Etc/UTC
 apt-get update && apt-get install -y tzdata
 ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
 dpkg-reconfigure --frontend noninteractive tzdata
-apt-get -y update
+#apt-get -y update
 apt-get -y install apt-utils devscripts sudo #dpkg-dev
 apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools