Version bump, build fixes, branding overlay, minor fixes

configure.ac

@@ -1,13 +1,13 @@
 AC_PREREQ([2.69])
-define(_CLIENT_VERSION_MAJOR, 24)
-define(_CLIENT_VERSION_MINOR, 99)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_MAJOR, 0)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_BUILD, 10)
 define(_CLIENT_VERSION_RC, 0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
-define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
-AC_INIT([Bitgesell Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitcoin/bitcoin/issues],[BGL],[https://github.com/BitgesellOfficial/bitgesell/releases/])
+define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[BGL Core]])
+AC_INIT([Bitgesell Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/bitgesellofficial/bitgesell/issues],[BGL],[https://github.com/BitgesellOfficial/bitgesell/releases/])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/BGL-config.h])
 AC_CONFIG_AUX_DIR([build-aux])

debian.minimal/build-in-docker.sh

@@ -20,8 +20,8 @@ docker exec $container useradd user
 docker exec $container mkdir /home/user
 docker exec $container chown user.user /home/user
 docker exec $container sudo -u user mkdir /home/user/build
-docker cp ../bitgesell_0.1.7.dsc $container:/root/repo/
-docker cp ../bitgesell_0.1.7.tar.xz $container:/root/repo/
+docker cp ../bitgesell_0.1.10.dsc $container:/root/repo/
+docker cp ../bitgesell_0.1.10.tar.xz $container:/root/repo/
 # docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
 docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
 docker exec $container sh -c "echo deb-src [trusted=yes] file:/root/repo ./ >> /etc/apt/sources.list"
@@ -30,5 +30,5 @@ docker exec $container apt-get -y build-dep bitgesell
 docker exec $container chmod a+rX /root
 docker exec $container chmod -R a+rX /root/repo
 docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell
-docker exec -w /home/user/build/bitgesell-0.1.7 $container sudo -u user debuild -b
-docker cp $container:/home/user/build/bitgesell_0.1.7_amd64.deb bitgesell_0.1.7_amd64.deb
+docker exec -w /home/user/build/bitgesell-0.1.10 $container sudo -u user debuild -b
+docker cp $container:/home/user/build/bitgesell_0.1.10_amd64.deb bitgesell_0.1.10_amd64.deb

debian.minimal/changelog

@@ -1,3 +1,21 @@
+bitgesell (0.1.10) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 18 Apr 2023 10:30:15 +0000
+
+bitgesell (0.1.9) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 8 Nov 2022 10:00:00 +0000
+
+bitgesell (0.1.8) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Wed, 20 Apr 2022 10:20:00 +0000
+
 bitgesell (0.1.7) UNRELEASED; urgency=low
 
   * Taproot activation rescheduled with relaxed conditions

debian.minimal/files

@@ -1 +1 @@
-bitgesell_0.1.7_source.buildinfo misc optional
+bitgesell_0.1.10_source.buildinfo misc optional

debian.minimal/rules

@@ -76,10 +76,13 @@ override_dh_auto_configure:
 		PKG_CONFIG_PATH="$(builddir)/distrib/tmp/libevent/lib/pkgconfig:$(builddir)/distrib/tmp/miniupnpc/usr/lib/pkgconfig" \
 		LDFLAGS="-Wl,-rpath=/usr/lib/bitgesell" \
 		BOOST_LDFLAGS="-L$(builddir)/distrib/tmp/libboost/lib" \
-		--disable-tests --disable-bench --disable-debug --with-gnu-ld \
+		--disable-tests --disable-bench --disable-debug --disable-fuzz-binary --with-gnu-ld \
 		--with-gui=no \
 		--with-boost="$(builddir)/distrib/tmp/libboost"
 
+override_dh_auto_test:
+	DEB_BUILD_OPTIONS=nocheck dh_auto_test
+
 override_dh_install:
 	dh_install
 	mkdir -p $(destdir)/usr/lib/bitgesell

debian.qt/build-in-docker.sh

@@ -4,25 +4,24 @@ 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:18.04
-container=`docker run -dit ubuntu:18.04`
-trap finish EXIT
+docker pull ubuntu:20.04
+container=`docker run -dit ubuntu:20.04`
+#trap finish EXIT
 
-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 cp ./debian/updateunattended.sh $container:/root/
+docker exec $container /root/updateunattended.sh
 docker exec $container mkdir -p /root/repo
 docker exec $container useradd user
 docker exec $container mkdir /home/user
 docker exec $container chown user.user /home/user
 docker exec $container sudo -u user mkdir /home/user/build
-docker cp ../bitgesell-qt_0.1.7.dsc $container:/root/repo/
-docker cp ../bitgesell-qt_0.1.7.tar.xz $container:/root/repo/
+docker cp ../bitgesell-qt_0.1.10.dsc $container:/root/repo/
+docker cp ../bitgesell-qt_0.1.10.tar.xz $container:/root/repo/
 # docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
 
 docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
@@ -32,5 +31,6 @@ docker exec $container apt-get -y build-dep bitgesell-qt
 docker exec $container chmod a+rX /root
 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.7 $container sudo -u user debuild -b
-docker cp $container:/home/user/build/bitgesell-qt_0.1.7_amd64.deb bitgesell-qt_0.1.7_amd64.deb
+docker exec -w /home/user/build/bitgesell-qt-0.1.10 $container sudo -u user debuild -b
+docker cp $container:/home/user/build/bitgesell-qt_0.1.10_amd64.deb bitgesell-qt_0.1.10_amd64.deb
+docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.10_amd64.deb bitgesell-qt-dbg_0.1.10_amd64.deb

debian.qt/changelog

@@ -1,3 +1,21 @@
+bitgesell-qt (0.1.10) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 18 Apr 2023 10:30:15 +0000
+
+bitgesell-qt (0.1.9) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 8 Nov 2022 10:00:00 +0000
+
+bitgesell-qt (0.1.8) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Wed, 20 Apr 2022 10:20:00 +0000
+
 bitgesell-qt (0.1.7) UNRELEASED; urgency=low
 
   * Taproot activation rescheduled with relaxed conditions

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:

debian.qt/files

@@ -1 +1 @@
-bitgesell-qt_0.1.7_source.buildinfo misc optional
+bitgesell-qt_0.1.10_source.buildinfo misc optional

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,9 +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/

debian.qt/updateunattended.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+export DEBIAN_FRONTEND=noninteractive
+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 install apt-utils devscripts sudo #dpkg-dev
+apt-get -y install libqrencode-dev qt5-default qttools5-dev-tools

debian/README.Debian

@@ -0,0 +1,12 @@
+To create the Debian package installable on multiple systems including
+Ubunutu 18.04, run:
+
+./debian/build-in-docker.sh
+
+Maintainers can run ./debian/test.sh to test if the generated Debian
+package is correct.
+
+TODO: ./debian/build-in-docker.sh and ./debian/test.sh should not need to
+be updated when the version of the package changes.
+
+ -- Victor Porton <[email protected]>  Sat, 03 Oct 2020 06:04:48 +0300

debian/build-in-docker.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+debuild -S
+
+#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
+
+docker cp ./debian/updateunattended.sh $container:/root/
+docker exec $container /root/updateunattended.sh
+docker exec $container mkdir -p /root/repo
+docker exec $container useradd user
+docker exec $container mkdir /home/user
+docker exec $container chown user.user /home/user
+docker exec $container sudo -u user mkdir /home/user/build
+docker cp ../bitgesell-qt_0.1.10.dsc $container:/root/repo/
+docker cp ../bitgesell-qt_0.1.10.tar.xz $container:/root/repo/
+# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
+
+docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
+docker exec $container sh -c "echo deb-src [trusted=yes] file:/root/repo ./ >> /etc/apt/sources.list"
+docker exec $container apt-get -y -o APT::Sandbox::User=root update
+docker exec $container apt-get -y build-dep bitgesell-qt
+docker exec $container chmod a+rX /root
+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.10 $container sudo -u user debuild -b
+docker cp $container:/home/user/build/bitgesell-qt_0.1.10_amd64.deb bitgesell-qt_0.1.10_amd64.deb
+docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.10_amd64.deb bitgesell-qt-dbg_0.1.10_amd64.deb

debian/changelog

@@ -0,0 +1,44 @@
+bitgesell-qt (0.1.10) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 18 Apr 2023 10:30:15 +0000
+
+bitgesell-qt (0.1.9) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Tue, 8 Nov 2022 10:00:00 +0000
+
+bitgesell-qt (0.1.8) UNRELEASED; urgency=low
+
+  * Bitcoin code synced
+
+ -- Mathias van Orton <[email protected]>  Wed, 20 Apr 2022 10:20:00 +0000
+
+bitgesell-qt (0.1.7) UNRELEASED; urgency=low
+
+  * Taproot activation rescheduled with relaxed conditions
+
+ -- Mathias van Orton <[email protected]>  Sun, 4 Jul 2021 14:40:01 +0000
+
+
+bitgesell-qt (0.1.6) UNRELEASED; urgency=low
+
+  * Code synced with BTC up to April 2021, Taproot activation scheduled
+
+ -- Mathias van Orton <[email protected]>  Mon, 24 May 2021 11:24:11 +0000
+
+
+bitgesell-qt (0.1.3) UNRELEASED; urgency=low
+
+  * Updated all builds before testing BTC synced code.
+
+ -- Mathias van Orton <[email protected]>  Thu, 26 Nov 2020 11:02:18 +0000
+
+
+bitgesell-qt (0.1.2) UNRELEASED; urgency=low
+
+  * Initial release.
+
+ -- Victor Porton <[email protected]>  Sat, 03 Oct 2020 06:04:48 +0300

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,29 @@
+Source: bitgesell-qt
+Section: misc
+Priority: optional
+Maintainer: Mathias van Orton <[email protected]>
+Build-Depends: debhelper (>=11~), g++-8, pkg-config, dh-autoreconf, libevent-dev, libssl-dev, fakeroot, wget
+Standards-Version: 4.1.4
+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.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:
+ 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.

debian/files

@@ -0,0 +1 @@
+bitgesell-qt_0.1.10_source.buildinfo misc optional