* debian/schroot.NEWS: Document conffile changes.

* debian/schroot.preinst: Call rm_conffile, not rm_prep_conffile.

3 files changed, 21 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 61eeb77d..733ea743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,9 @@ schroot (1.1.6-1) unstable; urgency=low
     /etc/schroot/setup.d/20network and /etc/schroot/setup.d/30passwd for
     versions prior to this.  These are replaced by
     /etc/schroot/setup.d/20copyfiles.
+  * debian/schroot.NEWS: Document conffile changes.
 
- -- Roger Leigh <rleigh@debian.org>  Sat, 19 Jan 2008 14:23:57 +0000
+ -- Roger Leigh <rleigh@debian.org>  Sat, 19 Jan 2008 18:21:25 +0000
 
 schroot (1.1.5-1.1) unstable; urgency=low
 
diff --git a/debian/schroot.NEWS b/debian/schroot.NEWS
index 3c2149e5..3d2bfd7b 100644
--- a/debian/schroot.NEWS
+++ b/debian/schroot.NEWS
@@ -1,3 +1,20 @@
+schroot (1.1.6-1) unstable; urgency=low
+
+  * Per-chroot custom mountpoints are now possible through the use of an
+    fstab file.  This may be used to mount or bind mount any filesystem
+    within the chroot with the assistance of a helper utility,
+    schroot-mount.  Set FSTAB=fstab in the script-config file to specify
+    which file to use.
+
+  * Per-chroot custom file copying is now supported.  Set COPYFILES=file
+    in the script-config file to specify a file containing a list of files
+    to copy from the host system into the chroot.  This change merged the
+    20network and 30passwd setup scripts into a single script,
+    20copyfiles.  If you previously customised either of these scripts,
+    the changes will need to be copied over to the new files.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 19 Jan 2008 16:47:35 +0000
+
 schroot (0.99.0-1) unstable; urgency=low
 
   * The dchroot program has been moved into a separate dchroot package.
diff --git a/debian/schroot.preinst b/debian/schroot.preinst
index 251ba235..2d36c8b5 100644
--- a/debian/schroot.preinst
+++ b/debian/schroot.preinst
@@ -54,8 +54,8 @@ install|upgrade)
          prep_mv_conffile "schroot" "/etc/schroot/run.d/00check"
     fi
     if dpkg --compare-versions "$2" le "1.1.6-1"; then
-         prep_rm_conffile "schroot" "/etc/schroot/setup.d/20network"
-         prep_rm_conffile "schroot" "/etc/schroot/setup.d/30passwd"
+         rm_conffile "schroot" "/etc/schroot/setup.d/20network"
+         rm_conffile "schroot" "/etc/schroot/setup.d/30passwd"
     fi
 esac