summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS10
-rw-r--r--README28
-rw-r--r--debian/changelog8
-rw-r--r--debian/compat2
-rw-r--r--debian/control9
-rw-r--r--vmdebootstrap/version.py4
6 files changed, 49 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 068212b..d9fb475 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
NEWS for vmdebootstrap
======================
+Version 1.8+git, not yet released
+-----------------------------------------------------------------------------
+
+* To be filled in later.
+
+Version 1.7-1, released 2016-09-11
+---------------------------------
+
+* NMUs by Steve McIntyre. Bug fixes.
+
Version 1.7, released 2016-09-11
---------------------------------
diff --git a/README b/README
index 5f52e94..8268958 100644
--- a/README
+++ b/README
@@ -1,9 +1,10 @@
README for vmdebootstrap
========================
-`debootstrap` installs a basic Debian system into a directory, for use with
-`chroot`(8). `vmdebootstrap` is a wrapper around it to install Debian into
-a disk image, which can be used with a virtual machine (such as KVM).
+`debootstrap` installs a basic Debian system into a directory, for use
+with `chroot`(8). `vmdebootstrap` is a wrapper around it to install
+Debian into a disk image, which can be used with virtual machines or
+real hardware.
See the manual page and `vmdebootstrap --help` for details on how to
use the program. The manual page has an example.
@@ -168,11 +169,30 @@ To format the test suite document:
make -C yarns
+Making a release
+----------------
+
+Release are best made with the bumper tool (http://liw.fi/bumper/),
+or simulating that by hand:
+
+* Update version number (`vmdebootstrap/version.py`, `NEWS`,
+ `debian/changelog`).
+* Also update `NEWS` to to say version is released (with date).
+* Commit, and tag the commit with `vmdebootstrap-x.y` for version x.y.
+* Update version number and `NEWS` again to say the version is
+ `x.y+git`. This makes it clear when a version is from git and not
+ frmo a release.
+* Commit.
+
+CI will then build and upload packages. CI is currently running on
+Lars's home server.
+
Legalese
--------
-Copyright 2011-2013 Lars Wirzenius
+Copyright 2011-2013,2016 Lars Wirzenius
Copyright 2012 Codethink Limited
+Copyright 2013-2016 Neil Williams
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/changelog b/debian/changelog
index 36859a1..abff3b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vmdebootstrap (1.8+git-1) UNRELEASED; urgency=medium
+
+ * New upstream version.
+ * debian/control: Drop Antonio from Uploaders, by request.
+ * debian/control: Require Python 2.7.
+
+ -- Lars Wirzenius <liw@liw.fi> Sun, 11 Sep 2016 18:07:38 +0300
+
vmdebootstrap (1.7-1+nmu1) unstable; urgency=medium
* Add tweaks used for official debian-live builds. Closes: #861069
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 21dc3b2..4eb72e3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ 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>,
- Antonio Terceiro <terceiro@debian.org>
-Build-Depends: debhelper (>= 8.0.0), dh-python,
+ Iain R. Learmonth <irl@debian.org>
+Build-Depends: debhelper (>= 9), dh-python,
python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
- python | python-all | python-dev | python-all-dev,
+ python-all-dev (>= 2.7),
python-setuptools (>= 3)
Testsuite: autopkgtest
X-Python-Version: 2.7
@@ -18,7 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/vmdebootstrap/vmdebootstrap.git/
Package: vmdebootstrap
Architecture: linux-any
-Depends: debootstrap, qemu-utils, kpartx, parted,
+Depends: debootstrap, qemu-utils, kpartx, parted, python (>= 2.7),
${sphinxdoc:Depends}, ${python:Depends}, ${misc:Depends}
Recommends: dosfstools, grub2-common [!mips !s390x],
extlinux [amd64 i386],
diff --git a/vmdebootstrap/version.py b/vmdebootstrap/version.py
index 2964e61..65f992c 100644
--- a/vmdebootstrap/version.py
+++ b/vmdebootstrap/version.py
@@ -1,2 +1,2 @@
-__version__ = "1.7"
-__version_info__ = (1, 7)
+__version__ = "1.7+git"
+__version_info__ = (1, 7, '+git')