* debian/control: Use ${binary:Version}.

* debian/schroot.preinst: In prep_mv_conffile(), use dpkg-query in
  place of reading /var/lib/dpkg/status directly.

4 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 51ffc152..0738aa04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-07-08  Roger Leigh  <rleigh@debian.org>
 
+	* debian/control: Use ${binary:Version}.
+
+	* debian/schroot.preinst: In prep_mv_conffile(), use dpkg-query in
+	place of reading /var/lib/dpkg/status directly.
+
+2007-07-08  Roger Leigh  <rleigh@debian.org>
+
 	* bin/schroot/schroot.1.in: Add carriage returns on user input
 	lines.
 
diff --git a/debian/changelog b/debian/changelog
index a7abecd3..7859e59f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 schroot (1.1.5-1) UNRELEASED; urgency=low
 
   * New upstream development release.
+  * debian/control: Use ${binary:Version}.
+  * debian/schroot.preinst: In prep_mv_conffile(), use dpkg-query in
+    place of reading /var/lib/dpkg/status directly.
   * bin/schroot/setup/10mount: Use --bind rather than --rbind for
     directory chroots.  This allows filesystem mounting to succeed when
     sub-mounts are already mounted on top of the original directory
diff --git a/debian/control b/debian/control
index 77a466b1..46b2fc13 100644
--- a/debian/control
+++ b/debian/control
@@ -95,7 +95,7 @@ Description: Execute commands in a chroot environment
 Package: dchroot
 Architecture: any
 Suggests: debootstrap
-Depends: schroot (= ${Source-Version}), ${shlibs:Depends}, schroot-common (=${source:Version})
+Depends: schroot (= ${binary:Version}), ${shlibs:Depends}, schroot-common (=${source:Version})
 Description: Execute commands in a chroot environment
  dchroot allows users to execute commands or interactive shells in
  different chroots.  A typical installation might provide 'stable',
@@ -118,7 +118,7 @@ Description: Execute commands in a chroot environment
 Package: dchroot-dsa
 Architecture: any
 Suggests: debootstrap
-Depends: schroot (= ${Source-Version}), ${shlibs:Depends}, schroot-common (=${source:Version})
+Depends: schroot (= ${binary:Version}), ${shlibs:Depends}, schroot-common (=${source:Version})
 Description: Execute commands in a chroot environment
  dchroot allows users to execute commands or interactive shells in
  different chroots.  A typical installation might provide 'stable',
diff --git a/debian/schroot.preinst b/debian/schroot.preinst
index 13504d30..cddd0e94 100644
--- a/debian/schroot.preinst
+++ b/debian/schroot.preinst
@@ -13,11 +13,12 @@ set -e
 
 # Prepare to move a conffile without triggering a dpkg question
 prep_mv_conffile() {
-    CONFFILE="$1"
+    PACKAGE="$1"
+    CONFFILE="$2"
 
     if [ -e "$CONFFILE" ]; then
         md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PACKAGE | sed -n -e \"\\\\' $CONFFILE'{s/.* //;p}\"`"
         if [ "$md5sum" = "$old_md5sum" ]; then
             rm -f "$CONFFILE"
         fi
@@ -27,11 +28,11 @@ prep_mv_conffile() {
 case "$1" in
 install|upgrade)
     if dpkg --compare-versions "$2" le "0.1.4-1"; then
-        prep_mv_conffile "/etc/schroot.conf"
+        prep_mv_conffile "schroot" "/etc/schroot.conf"
     fi
     if dpkg --compare-versions "$2" le "0.2.6-1"; then
-         prep_mv_conffile "/etc/schroot/run.d/50sbuild"
-         prep_mv_conffile "/etc/schroot/run.d/00check"
+         prep_mv_conffile "schroot" "/etc/schroot/run.d/50sbuild"
+         prep_mv_conffile "schroot" "/etc/schroot/run.d/00check"
     fi
 esac