summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@debian.org>2020-06-03 13:23:49 +0200
committerGianfranco Costamagna <costamagnagianfranco@yahoo.it>2020-06-03 13:24:17 +0200
commit55f449b221ce215f7037507822cbd4f4b67af7b4 (patch)
tree9215e84dfe7cd4d53f3df8121eaaed65e86f5df6
parentb3a8980b781bc9a370e42714a605cd4191bb6c0b (diff)
downloadca-certificates-55f449b221ce215f7037507822cbd4f4b67af7b4.tar.gz
Grab Ubuntu patch to make the package compatible and building with Python3
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rw-r--r--mozilla/Makefile2
-rw-r--r--mozilla/certdata2pem.py2
4 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index fa04f1a..3d28026 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ca-certificates (20200602) UNRELEASED; urgency=medium
+
+ * debian/{rules,control}:
+ - grab Ubuntu patch from Matthias Klose to use Python3 during build (Closes: #942915)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 03 Jun 2020 13:21:32 +0200
+
ca-certificates (20200601) unstable; urgency=medium
* debian/control:
diff --git a/debian/control b/debian/control
index 88129e1..4f7c8eb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Michael Shuler <michael@pbandjelly.org>
Uploaders: Raphael Geissert <geissert@debian.org>,
Thijs Kinkhorst <thijs@debian.org>
Build-Depends: debhelper-compat (= 13), po-debconf
-Build-Depends-Indep: python, openssl
+Build-Depends-Indep: python3, openssl
Standards-Version: 4.5.0.2
Vcs-Git: https://salsa.debian.org/debian/ca-certificates.git
Vcs-Browser: https://salsa.debian.org/debian/ca-certificates
diff --git a/mozilla/Makefile b/mozilla/Makefile
index 6f46118..f98877c 100644
--- a/mozilla/Makefile
+++ b/mozilla/Makefile
@@ -3,7 +3,7 @@
#
all:
- python certdata2pem.py
+ python3 certdata2pem.py
clean:
-rm -f *.crt
diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py
index 0b02b2a..7d796f1 100644
--- a/mozilla/certdata2pem.py
+++ b/mozilla/certdata2pem.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# vim:set et sw=4:
#
# certdata2pem.py - splits certdata.txt into multiple files