diff options
| author | Lars Wirzenius <liw@liw.fi> | 2017-09-17 16:46:00 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2017-09-17 16:46:00 +0300 |
| commit | d034826dff4d3e2ffe21be8fac49aea1722cfb7f (patch) | |
| tree | 52729bbb382eb3431d8a0fd90ba0dc3b03792de6 | |
| parent | 9abdc87e39962322ad9e4dc5dfa9140b578bb61b (diff) | |
| download | vmdebootstrap-d034826dff4d3e2ffe21be8fac49aea1722cfb7f.tar.gz | |
Add: nmu2 changes from Steve
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | vmdebootstrap/codenames.py | 7 |
4 files changed, 15 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index abff3b8..19ae91a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -vmdebootstrap (1.8+git-1) UNRELEASED; urgency=medium +vmdebootstrap (1.7-1+nmu2) unstable; urgency=medium - * New upstream version. - * debian/control: Drop Antonio from Uploaders, by request. - * debian/control: Require Python 2.7. + * Don't try to use linux-image-586 on modern i386 systems. + Closes: #869714. - -- Lars Wirzenius <liw@liw.fi> Sun, 11 Sep 2016 18:07:38 +0300 + -- Steve McIntyre <93sam@debian.org> Fri, 15 Sep 2017 17:48:44 +0100 vmdebootstrap (1.7-1+nmu1) unstable; urgency=medium diff --git a/debian/compat b/debian/compat index ec63514..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +8 diff --git a/debian/control b/debian/control index 4eb72e3..21dc3b2 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: admin Priority: extra Maintainer: VMDebootstrap List <vmdebootstrap-devel@lists.alioth.debian.org> Uploaders: Lars Wirzenius <liw@liw.fi>, - Iain R. Learmonth <irl@debian.org> -Build-Depends: debhelper (>= 9), dh-python, + Iain R. Learmonth <irl@debian.org>, + Antonio Terceiro <terceiro@debian.org> +Build-Depends: debhelper (>= 8.0.0), dh-python, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, - python-all-dev (>= 2.7), + python | python-all | python-dev | python-all-dev, python-setuptools (>= 3) Testsuite: autopkgtest X-Python-Version: 2.7 @@ -17,7 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/vmdebootstrap/vmdebootstrap.git/ Package: vmdebootstrap Architecture: linux-any -Depends: debootstrap, qemu-utils, kpartx, parted, python (>= 2.7), +Depends: debootstrap, qemu-utils, kpartx, parted, ${sphinxdoc:Depends}, ${python:Depends}, ${misc:Depends} Recommends: dosfstools, grub2-common [!mips !s390x], extlinux [amd64 i386], diff --git a/vmdebootstrap/codenames.py b/vmdebootstrap/codenames.py index 27bdded..4441036 100644 --- a/vmdebootstrap/codenames.py +++ b/vmdebootstrap/codenames.py @@ -65,11 +65,14 @@ class Codenames(Base): if self.settings['no-kernel'] or self.settings['kernel-package']: return packages if self.settings['arch'] == 'i386': - # wheezy (which became oldstable on 04/25/2015) used '486' + # wheezy (which became oldstable on 2015-04-25) used '486' if self.was_oldstable(datetime.date(2015, 4, 26)): kernel_arch = '486' - else: + # jessie (which became oldstable on 2017-06-17) used '586' + elif self.was_oldstable(datetime.date(2017, 6, 18)): kernel_arch = '586' + else: + kernel_arch = '686' elif self.settings['arch'] == 'armhf': kernel_arch = 'armmp' elif self.settings['arch'] == 'ppc64el': |