summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2016-10-20 06:39:55 (GMT)
committerJulien Cristau <jcristau@debian.org>2016-10-20 06:39:55 (GMT)
commit5cf331b568827a9bce557db72c2713d8d7468bff (patch)
tree76794a930ebaf4014f6bf74c731e4048adc9e01a /debian
parentcb32574a472d4645ecdf176bef9e671c977c4d1f (diff)
parent6b4019d0d4911cdb337ad8204891223c9f323829 (diff)
downloaddebootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.zip
debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.gz
debootstrap-5cf331b568827a9bce557db72c2713d8d7468bff.tar.bz2
Merge branch 'master' of https://github.com/aburch/debootstrap
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rw-r--r--debian/control2
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 334bba5..c04bb03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,21 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium
[ Colin Watson ]
* Add (Ubuntu) zesty as a symlink to gutsy.
+ [ Ansgar Burchardt ]
+ * Add jessie-kfreebsd to merged-/usr blacklist.
+ * No longer Build-Depend on makedev. The code using it was already
+ removed in debootstrap 1.0.82.
+ * Do not use `tar -k` for older releases which might have file
+ conflicts between the packages to be installed. (Closes: #838388)
+ * Error out when seeing short options. (Closes: #548880)
+ * Add oldoldstable -> sid script symlink. (Closes: #792734)
+ * Add buster -> sid and bullseye -> sid script symlinks.
+ * Only unpack and configure the base system when there are actually
+ packages to install. (Closes: #825034)
+
+ [ Marco d'Itri ]
+ * Enable merged-/usr by default. (Closes: #839046, #839162)
+
-- Julien Cristau <jcristau@debian.org> Fri, 02 Sep 2016 20:26:38 +0200
debootstrap (1.0.84) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 6f9fbb8..23371e9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
-Build-Depends: debhelper (>= 9), makedev (>= 2.3.1-69) [linux-any]
+Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/d-i/debootstrap.git
Vcs-Git: https://anonscm.debian.org/git/d-i/debootstrap.git