Merge branch 'master' into joeyconfig

2 files changed, 41 insertions, 0 deletions

diff --git a/doc/news/version_5.0.0.mdwn b/doc/news/version_5.0.0.mdwn
new file mode 100644
index 00000000..dbf678cc
--- /dev/null
+++ b/doc/news/version_5.0.0.mdwn
@@ -0,0 +1,20 @@
+propellor 5.0.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * 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."""]]
\ No newline at end of file
diff --git a/doc/todo/merge_request:_sbuild_overhaul.mdwn b/doc/todo/merge_request:_sbuild_overhaul.mdwn
new file mode 100644
index 00000000..9c4b60a5
--- /dev/null
+++ b/doc/todo/merge_request:_sbuild_overhaul.mdwn
@@ -0,0 +1,21 @@
+Please consider merging the `sbuild-overhaul` branch of repo `https://git.spwhitton.name/propellor`.
+
+    * File.isSymlinkedTo now revertable. (minor API change)
+    * Sbuild module changes:
+      - Type of Sbuild.built changed to accept additional properties to be ensured
+        inside schroots. (API change)
+        See the suggested usage in module's documentation for new syntax.
+      - Drop Sbuild.installed, Sbuild.builtFor, Sbuild.updated,
+        Sbuild.updatedFor. (API change)
+        Use Sbuild.built instead.  See suggested usage in module's documentation.
+      - Propellor no longer sets up apt proxies in chroots automatically.
+        Instead, pass the new Sbuild.useHostProxy to Sbuild.built to have Propellor
+        propagate the host's Apt proxy configuration into the chroot.  See suggested
+        usage in module's documentation.
+      - Internally, Propellor no longer invokes sbuild-createchroot(1) to build
+        schroots.
+      - Update documentation.
+
+--spwhitton
+
+> [[merged|done]] --[[Joey]]