Changeset 62d375b

Timestamp:

2020-09-01T11:24:35Z (4 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

75222ab

Parents:

c81b412 (diff), f18209a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge PR 149 (Use python3 when python is not available)

Files:

• configure (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)

configure

@@ -776 +776 @@
 
 if [ -z "$PYTHON" ]; then
-        PYTHON=python
+        for pp in python python3 python2; do
+                if which $pp > /dev/null; then
+                        PYTHON=$pp
+                        break
+                fi
+        done
 fi
 
@@ -980 +985 @@
 fi
 
+echo '  Using python: '$PYTHON
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl

debian/changelog

@@ -22 +22 @@
   * Use canonical URL in Vcs-Git.
   * Add missing debian/rules target build-indep.
+  * Use python3 since python2 is being removed. Closes: #942954
 
  -- Debian Janitor <janitor@jelmer.uk>  Thu, 21 Mar 2019 00:10:27 +0000

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Standards-Version: 3.9.8
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 9), python
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 9), python3
 Homepage: https://www.bitlbee.org/
 Vcs-Git: https://github.com/bitlbee/bitlbee.git