diff -Nru lupin-0.16/casper/scripts/casper-premount/20iso_scan lupin-0.19/casper/scripts/casper-premount/20iso_scan
--- lupin-0.16/casper/scripts/casper-premount/20iso_scan	2008-03-06 03:35:04.000000000 -0500
+++ lupin-0.19/casper/scripts/casper-premount/20iso_scan	2008-05-27 12:13:42.000000000 -0400
@@ -28,6 +28,18 @@
 if [ "$iso_path" ]; then
     if find_path "${iso_path}" /isodevice rw; then
         echo "LIVEMEDIA=${FOUNDPATH}" >> /conf/param.conf
-        echo "LIVEMEDIA_OFFSET=0" >> /conf/param.conf
+        if [ -f "${iso_path}" ]; then
+            echo "LIVEMEDIA_OFFSET=0" >> /conf/param.conf
+        fi
+    else
+        panic "
+Could not find the ISO $iso_path
+This could also happen if the file system is not clean because of an operating
+system crash, an interrupted boot process, an improper shutdown, or unplugging
+of a removable device without first unmounting or ejecting it.  To fix this,
+simply reboot into Windows, let it fully start, log in, run 'chkdsk /r', then
+gracefully shut down and reboot back into Windows. After this you should be
+able to reboot again and resume the installation.
+"
     fi
 fi
diff -Nru lupin-0.16/casper/scripts/casper-premount/30custom_installation lupin-0.19/casper/scripts/casper-premount/30custom_installation
--- lupin-0.16/casper/scripts/casper-premount/30custom_installation	2008-03-06 03:36:21.000000000 -0500
+++ lupin-0.19/casper/scripts/casper-premount/30custom_installation	2008-05-27 12:13:43.000000000 -0400
@@ -84,8 +84,18 @@
         if [ -e /custom-installation/preseed.cfg ]; then
             cp /custom-installation/preseed.cfg /
             #fix parameters that cannot be set from a non-linux OS
-            fix_preseed /preseed.cfg "$custom_installation_dev"    
+            fix_preseed /preseed.cfg "$custom_installation_dev"
         fi
+    else
+        panic "
+Could not find the installation files $custom_installation_path
+This could also happen if the file system is not clean because of an operating
+system crash, an interrupted boot process, an improper shutdown, or unplugging
+of a removable device without first unmounting or ejecting it.  To fix this,
+simply reboot into Windows, let it fully start, log in, run 'chkdsk /r', then
+gracefully shut down and reboot back into Windows. After this you should be
+able to reboot again and resume the installation.
+"
     fi
     find_path_cleanup
 fi
diff -Nru lupin-0.16/debian/changelog lupin-0.19/debian/changelog
--- lupin-0.16/debian/changelog	2008-04-22 10:57:28.000000000 -0400
+++ lupin-0.19/debian/changelog	2008-05-29 10:53:24.000000000 -0400
@@ -1,3 +1,24 @@
+lupin (0.19) hardy-proposed; urgency=low
+
+  [ Agostino Russo ]
+  * Fixed typos (thanks Steve Langasek and JP Vossen)
+  * Do not set LIVEMEDIA_OFFSET if the target is not an (ISO) file. This
+    is a useful check per se', but it is also required to allow using
+    iso_scan to look for iso content such as squashfs which in turn
+    would help with LP: #207137
+  * Provide a clearer error when required installation files cannot be
+    found (LP: #226622)
+
+  [ Evan Dandrea ]
+  * Note that you need to reboot twice when using chkdsk.
+
+  [ Tormod Volden ]
+  * Add locale support to ntfs host filesystems, to keep files and
+    directories with non-C characters (utf) from disappearing.
+    (LP: #136682)
+
+ -- Evan Dandrea <evand@ubuntu.com>  Thu, 29 May 2008 10:53:15 -0400
+
 lupin (0.16) hardy; urgency=low
 
   * Tighten /proc/mounts test to avoid e.g. /dev/sda10 matching a search for
diff -Nru lupin-0.16/debian/lupin-support.install lupin-0.19/debian/lupin-support.install
--- lupin-0.16/debian/lupin-support.install	2008-03-06 03:34:35.000000000 -0500
+++ lupin-0.19/debian/lupin-support.install	2008-05-09 12:10:26.000000000 -0400
@@ -0,0 +1,2 @@
+locale/hooks usr/share/initramfs-tools
+locale/scripts usr/share/initramfs-tools
diff -Nru lupin-0.16/debian/lupin-support.postinst lupin-0.19/debian/lupin-support.postinst
--- lupin-0.16/debian/lupin-support.postinst	1969-12-31 19:00:00.000000000 -0500
+++ lupin-0.19/debian/lupin-support.postinst	2008-05-09 12:10:26.000000000 -0400
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+	update-initramfs -u
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+	update-initramfs -u
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru lupin-0.16/debian/lupin-support.postrm lupin-0.19/debian/lupin-support.postrm
--- lupin-0.16/debian/lupin-support.postrm	1969-12-31 19:00:00.000000000 -0500
+++ lupin-0.19/debian/lupin-support.postrm	2008-05-09 12:10:26.000000000 -0400
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	update-initramfs -u
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff -Nru lupin-0.16/locale/hooks/root_locale lupin-0.19/locale/hooks/root_locale
--- lupin-0.16/locale/hooks/root_locale	1969-12-31 19:00:00.000000000 -0500
+++ lupin-0.19/locale/hooks/root_locale	2008-05-09 12:10:26.000000000 -0400
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+
+# Adds support for the system default locale to the initramfs
+# and stores the locale name in the initramfs /conf/conf.d/root_locale
+# so that the premount script can pick it up through $ROOT_LOCALE
+
+PREREQ=""
+
+prereqs () {
+	echo "$PREREQ"
+}
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+CONF="$DESTDIR/conf/conf.d/root_locale"
+
+# Accept overrides but will rewrite the initramfs conf file anyway
+[ -r $CONF ] && . $CONF
+rm -f $CONF
+
+# Base the locale on the system default LANG and mangle it as
+# needed to match the /usr/lib/locale naming.
+
+[ -r /etc/default/locale ] && . /etc/default/locale
+
+[ -z "$ROOT_LOCALE" ] && ROOT_LOCALE=`echo $LANG | sed -e 's/UTF/utf/' -e 's/utf-8/utf8/'`
+
+if [ -n "$ROOT_LOCALE" ] && [ -d /usr/lib/locale/$ROOT_LOCALE ]; then
+	[ "${verbose}" = "y" ] && echo "Adding locale: $ROOT_LOCALE"
+	mkdir -p "$DESTDIR/usr/lib/locale"
+	cp -r /usr/lib/locale/$ROOT_LOCALE "$DESTDIR/usr/lib/locale"
+	echo "ROOT_LOCALE=$ROOT_LOCALE" > $CONF
+	echo "export ROOT_LOCALE" >> $CONF
+	echo "export FSTYPE" >> $CONF
+else
+	echo "Warning: No support for locale: $ROOT_LOCALE" >&2
+fi
+
+exit 0
diff -Nru lupin-0.16/locale/scripts/local-premount/root_locale lupin-0.19/locale/scripts/local-premount/root_locale
--- lupin-0.16/locale/scripts/local-premount/root_locale	1969-12-31 19:00:00.000000000 -0500
+++ lupin-0.19/locale/scripts/local-premount/root_locale	2008-05-09 12:10:26.000000000 -0400
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+case $1 in
+prereqs)
+	exit 0
+	;;
+esac
+
+if [ "$FSTYPE" = "ntfs" ] && [ -n "$ROOT_LOCALE" ]; then
+   if [ -z "${ROOTFLAGS}" ]; then
+     ROOTFLAGS="-o "
+   else
+     ROOTFLAGS="${ROOTFLAGS},"
+   fi
+   echo ROOTFLAGS=\"${ROOTFLAGS}locale=$ROOT_LOCALE\" >> /conf/param.conf
+fi
+
+exit 0