Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul

1 files changed, 25 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index fe7abc48..4216db05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,5 @@
-propellor (5.0.0) UNRELEASED; urgency=medium
+propellor (5.1.0) UNRELEASED; urgency=medium
 
-  [ Joey Hess ]
-  * Debootstrap.built now supports bootstrapping chroots for foreign
-    OS's, using qemu-user-static.
-  * Machine: New module collecting machine-specific properties for 
-    building bootable images for ARM boards.
-    Tested working boards: Olimex Lime, CubieTruck, Banana Pi, SheevaPlug.
-  * Chroot.noServices moved to Service.noServices and its type changed.
-    (API change)
-  * Service: Avoid starting services when noServices is used.
-  * Add Typeable instance to OriginUrl, fixing build with old versions
-    of ghc.
-  * Added Propellor.Property.impossible
-  * Fail2Ban: Added several additional properties.
-    Thanks, Félix Sipma.
-  * Fail2Ban: Renamed jail.d conf file to use .local.
-    Thanks, Félix Sipma.
-
-  [ Sean Whitton ]
   * File.isSymlinkedTo now revertable.
   * Sbuild module changes:
     - Type of Sbuild.built changed to accept additional properties to be ensured
@@ -34,7 +16,30 @@ propellor (5.0.0) UNRELEASED; urgency=medium
       schroots.
     - Update documentation.
 
- -- Joey Hess <id@joeyh.name>  Thu, 02 Nov 2017 10:28:44 -0400
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 19 Nov 2017 18:18:43 -0700
+
+propellor (5.0.0) unstable; urgency=medium
+
+  * Debootstrap.built now supports bootstrapping chroots for foreign
+    OS's, using qemu-user-static.
+  * Machine: New module collecting machine-specific properties for 
+    building bootable images for ARM boards.
+    Tested working boards: Olimex Lime, CubieTruck, Banana Pi, SheevaPlug.
+  * Diskimage.imageBuiltFor: New property to build a disk image for a Host,
+    using partition table information configured via the new properties
+    hasPartitionTableType, hasPartition and adjustPartition.
+  * Chroot.noServices moved to Service.noServices and its type changed.
+    (API change)
+  * Service: Avoid starting services when noServices is used.
+  * Add Typeable instance to OriginUrl, fixing build with old versions
+    of ghc.
+  * Added Propellor.Property.impossible
+  * Fail2Ban: Added several additional properties.
+    Thanks, Félix Sipma.
+  * Fail2Ban: Renamed jail.d conf file to use .local.
+    Thanks, Félix Sipma.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 19 Nov 2017 15:42:44 -0400
 
 propellor (4.9.0) unstable; urgency=medium