Commit f578442a authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge tag 'debian/1.11-2' into pureos/amber

Debian release 1.11-2
parents 3f06672b fbe19e85
vmdebootstrap (1.11-2) unstable; urgency=medium
* Replacs Lars as maintainer
* Tweak the doc build - add .decode() to fix byte/string TypeError
-- Steve McIntyre <93sam@debian.org> Sun, 31 Mar 2019 16:57:20 +0700
vmdebootstrap (1.11-1pureos1) amber; urgency=medium vmdebootstrap (1.11-1pureos1) amber; urgency=medium
* Upload to amber-updates * Upload to amber-updates
......
Source: vmdebootstrap Source: vmdebootstrap
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Lars Wirzenius <liw@liw.fi> Maintainer: Steve McIntyre <93sam@debian.org>
Uploaders: Iain R. Learmonth <irl@debian.org>, Uploaders: Iain R. Learmonth <irl@debian.org>
Steve McIntyre <93sam@debian.org>
Build-Depends: debhelper (>= 8.0.0), dh-python, Build-Depends: debhelper (>= 8.0.0), dh-python,
python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
python | python-all | python-dev | python-all-dev, python | python-all | python-dev | python-all-dev,
......
Description: Fix sphinx encoding problem during doc build
--- vmdebootstrap-1.11.orig/doc/conf.py
+++ vmdebootstrap-1.11/doc/conf.py
@@ -55,7 +55,7 @@ copyright = '2015 Neil Williams'
# built documents.
#
# The short X.Y version.
-version = subprocess.Popen(['python', 'setup.py', '-V'], cwd=r'..', stdout=subprocess.PIPE).stdout.read().rstrip()
+version = subprocess.Popen(['python', 'setup.py', '-V'], cwd=r'..', stdout=subprocess.PIPE).stdout.read().rstrip().decode()
# The full version, including alpha/beta/rc tags.
release = version
Don-t-enforce-U-EFI-on-arm64.patch Don-t-enforce-U-EFI-on-arm64.patch
Don-t-pass-any-filesystem-flags-for-f2fs.patch Don-t-pass-any-filesystem-flags-for-f2fs.patch
doc-encoding.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment