From 0636833ba327a01cb22239b2ffbdfffd02e784a6 Mon Sep 17 00:00:00 2001
From: Gunther Laure <gunther.laure@dewetron.com>
Date: Mon, 20 Sep 2021 10:27:26 +0200
Subject: [PATCH] tortoisehg 5.9.1

Test Release
---
 README.md                             | 10 ++++++----
 bootstrap.sh                          |  5 +++--
 build.sh                              |  2 +-
 packaging/Ubuntu2004/debian/changelog |  8 +++++++-
 packaging/Ubuntu2004/debian/control   |  5 +++--
 packaging/Ubuntu2004/debian/preinst   |  3 ++-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 280b031..4cee78d 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
 # tortoisehg4ubuntu
-Script to use tortoisehg on ubuntu 20.04 or higher
+Script to use tortoisehg on ubuntu 20.04.
 
 Ubuntu packages to test are available in the "Releases" section.
 
-The latest 5.8.1 package is self-contained and does not need additional steps.
+The latest 5.9.1 package is self-contained and does not need additional steps.
 
 ```
-sudo apt install ./tortoisehg_5.8.1-glaure_amd64.deb
+sudo apt install ./tortoisehg_5.9.1-glaure_amd64.deb
 ```
 
 Note:
 You may have to remove a current mercurial installation. This package only works with 
-mercurial 5.8.1. The dependency is automatically resolved by pypi/pip during the installation.
+mercurial 5.9.1. The dependency is automatically resolved by pypi/pip during the installation.
 
 # Downloads
 [![Github All Releases](https://img.shields.io/github/downloads/glaure/tortoisehg4ubuntu/total)]()
@@ -20,6 +20,8 @@ mercurial 5.8.1. The dependency is automatically resolved by pypi/pip during the
 https://askubuntu.com/questions/1232173/how-to-install-the-tortoisehg-in-ubuntu20-04
 
 
+# Previous Information
+
 ## Instructions
 
 Install all necessary build prerequisites
diff --git a/bootstrap.sh b/bootstrap.sh
index 8b4293e..117ba95 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,8 +18,9 @@ apt install --yes python3-pip build-essential
 # Install PyQt5
 pip3 install pyqt5
 
-# Install Mercurial
-pip3 install mercurial==5.8.1
+# Install Mercurial3
+pip3 uninstall mercurial
+pip3 install mercurial==5.9.1
 
 # Install Qscintilla.
 pip3 install qscintilla
diff --git a/build.sh b/build.sh
index e248e84..a411aea 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@
 set -e
 
 # HG TAG
-HG_TAG=5.8.1
+HG_TAG=5.9.1
 
 # Clone tortoisehg repository.
 if [ ! -e thg ]; then
diff --git a/packaging/Ubuntu2004/debian/changelog b/packaging/Ubuntu2004/debian/changelog
index 32e1447..bea7fd8 100644
--- a/packaging/Ubuntu2004/debian/changelog
+++ b/packaging/Ubuntu2004/debian/changelog
@@ -1,4 +1,10 @@
-tortoisehg (5.8.1-glaure) focal; urgency=medium
+tortoisehg (5.9.1-glaure) focal; urgency=medium
+
+  * New package for 5.9.1 release
+
+ -- Gunther Laure <gunther.laure@gmail.com>  Tue, 20 Sep 2021 10:08:00 +0000
+ 
+ tortoisehg (5.8.1-glaure) focal; urgency=medium
 
   * Initial package for Ubuntu
 
diff --git a/packaging/Ubuntu2004/debian/control b/packaging/Ubuntu2004/debian/control
index eaeb05d..270951d 100644
--- a/packaging/Ubuntu2004/debian/control
+++ b/packaging/Ubuntu2004/debian/control
@@ -18,8 +18,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, 
                 python3-pyqt5.qsci,
                 python-is-python3,
-                python3-iniparse
-Conflicts: mercurial (<5.8.1)
+                python3-iniparse,
+                python3-pip
+Conflicts: mercurial
 Description: Graphical tool for working with mercurial
  TortoiseHg provides a graphical tool for interacting with the distributed
  revision control system Mercurial.  GUI support is provided for over a
diff --git a/packaging/Ubuntu2004/debian/preinst b/packaging/Ubuntu2004/debian/preinst
index bc8375f..11ad051 100755
--- a/packaging/Ubuntu2004/debian/preinst
+++ b/packaging/Ubuntu2004/debian/preinst
@@ -5,7 +5,8 @@ case "$1" in
     install)
         # Install Pypi package dependencies
         pip3 install pyqt5
-        pip3 install mercurial==5.8.1
+        pip3 uninstall -y mercurial
+        pip3 install mercurial==5.9.1
         pip3 install qscintilla
         ;;