From a7f6a4bee644caee42780f55a9ee262c22bc3e11 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 13 May 2020 18:09:48 +0200
Subject: [PATCH] Update PPA scripts.

---
 scripts/deps-ppa/static_z3.sh | 14 +++++---------
 scripts/release_ppa.sh        |  6 +++---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 7eb461821..c5f6d6ea4 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -25,11 +25,9 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=libz3-static-dev
-# On the next version the git cherry-pick below should be removed and the patch suffix removed from the version string.
-version=4.8.7
-version_patchsuffix=-1
+version=4.8.8
 
-DISTRIBUTIONS="bionic disco eoan focal"
+DISTRIBUTIONS="bionic eoan focal"
 
 for distribution in $DISTRIBUTIONS
 do
@@ -44,10 +42,8 @@ ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
 # Fetch source
 git clone --branch z3-${version} https://github.com/Z3Prover/z3.git
 cd z3
-# Patch build failure.
-git cherry-pick e212159f4e
 
-debversion="${version}${version_patchsuffix}"
+debversion="${version}"
 
 CMAKE_OPTIONS="-DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
 
@@ -181,7 +177,7 @@ This program is free software: you can redistribute it and/or modify
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 EOF
 cat <<EOF > debian/changelog
-libz3-static-dev (0.0.1-2ubuntu0) saucy; urgency=low
+libz3-static-dev (0.0.1-1ubuntu0) saucy; urgency=low
 
   * Initial release.
 
@@ -191,7 +187,7 @@ mkdir debian/source
 echo "3.0 (quilt)" > debian/source/format
 chmod +x debian/rules
 
-versionsuffix=2ubuntu0~${distribution}
+versionsuffix=1ubuntu0~${distribution}
 EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}"
 
 # build source package
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index d84b3fd36..6d50e0066 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -55,9 +55,9 @@ keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=solc
 
-static_build_distribution=disco
+static_build_distribution=focal
 
-DISTRIBUTIONS="bionic disco eoan focal"
+DISTRIBUTIONS="bionic eoan focal"
 
 if is_release
 then
@@ -85,7 +85,7 @@ else
     fi
     if [ $distribution = focal ]
     then
-        SMTDEPENDENCY="libz3-dev,
+        SMTDEPENDENCY="libz3-static-dev,
             libcvc4-dev,
             "
     elif [ $distribution = disco ]