work on Debian packages

7 files changed, 39 insertions, 12 deletions

diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
index 60b1b02..c5cda33 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -34,6 +34,10 @@ COPY gnunet-build.sh /root/
 RUN chmod +x /root/gnunet-build.sh
 RUN /root/gnunet-build.sh master
 
+COPY gnunet-gtk-build.sh /root/
+RUN chmod +x /root/gnunet-gtk-build.sh
+RUN /root/gnunet-gtk-build.sh master
+
 COPY libeufin-build.sh /root/
 RUN chmod +x /root/libeufin-build.sh
 RUN /root/libeufin-build.sh master
@@ -46,10 +50,6 @@ COPY merchant-build.sh /root/
 RUN chmod +x /root/merchant-build.sh
 RUN /root/merchant-build.sh master
 
-COPY mdb-build.sh /root/
-RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh master
-
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
 RUN /root/sync-build.sh master
diff --git a/packaging/debian-docker/exchange-build.sh b/packaging/debian-docker/exchange-build.sh
index 36b9ede..b4a0115 100644
--- a/packaging/debian-docker/exchange-build.sh
+++ b/packaging/debian-docker/exchange-build.sh
@@ -10,7 +10,7 @@ cd /build/taler
 # Fetch source
 rm -rf *
 
-pip3 install htmlark
+pip3 install --break-system-packages htmlark
 
 git clone git://git.taler.net/exchange
 cd exchange
diff --git a/packaging/debian-docker/gnunet-build.sh b/packaging/debian-docker/gnunet-build.sh
index dd89abd..72f07ba 100644
--- a/packaging/debian-docker/gnunet-build.sh
+++ b/packaging/debian-docker/gnunet-build.sh
@@ -11,7 +11,9 @@ cd /build/gnunet
 # Fetch source
 rm -rf *
 
-for n in gnunet gnunet-gtk
+pip3 install --break-system-packages sphinx-book-theme
+
+for n in gnunet
 do
     git clone git://git.gnunet.org/$n
     cd $n
diff --git a/packaging/debian-docker/gnunet-gtk-build.sh b/packaging/debian-docker/gnunet-gtk-build.sh
new file mode 100644
index 0000000..f480c3c
--- /dev/null
+++ b/packaging/debian-docker/gnunet-gtk-build.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+
+set -eu
+unset LD_LIBRARY_PATH
+
+mkdir -p /build/gnunet
+cd /build/gnunet
+
+# Fetch source
+rm -rf *
+
+for n in gnunet-gtk
+do
+    git clone git://git.gnunet.org/$n
+    cd $n
+    git checkout $1
+    ./bootstrap
+    dpkg-buildpackage -rfakeroot -b -uc -us
+    cd ..
+    dpkg -i *.deb
+done
+
+tar cvf ../packages.tgz *.deb
+
+cd ..
diff --git a/packaging/debian-docker/merchant-build.sh b/packaging/debian-docker/merchant-build.sh
index 5625198..32b68f1 100644
--- a/packaging/debian-docker/merchant-build.sh
+++ b/packaging/debian-docker/merchant-build.sh
@@ -10,7 +10,7 @@ cd /build/taler
 # Fetch source
 rm -rf *
 
-pip3 install htmlark
+pip3 install --break-system-packages htmlark
 
 git clone git://git.taler.net/merchant
 cd merchant
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index 881dbf8..1fd719f 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -49,10 +49,6 @@ COPY merchant-build.sh /root/
 RUN chmod +x /root/merchant-build.sh
 RUN /root/merchant-build.sh master
 
-COPY mdb-build.sh /root/
-RUN chmod +x /root/sync-build.sh
-RUN /root/sync-build.sh master
-
 COPY sync-build.sh /root/
 RUN chmod +x /root/sync-build.sh
 RUN /root/sync-build.sh master
diff --git a/packaging/ubuntu-docker/gnunet-build.sh b/packaging/ubuntu-docker/gnunet-build.sh
index dd89abd..896bdcf 100644
--- a/packaging/ubuntu-docker/gnunet-build.sh
+++ b/packaging/ubuntu-docker/gnunet-build.sh
@@ -11,7 +11,9 @@ cd /build/gnunet
 # Fetch source
 rm -rf *
 
-for n in gnunet gnunet-gtk
+pip3 install sphinx-book-theme
+
+for n in gnunet
 do
     git clone git://git.gnunet.org/$n
     cd $n