[SCM] live-helper branch, debian, updated. debian/2.0_a12-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cfea3f6f43fe0e09fc861314c7afc0ba4c1c9557
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon May 10 08:44:31 2010 +0200

    Updating win32-loader pathes for squeeze (Closes: #580952).

diff --git a/helpers/binary_win32-loader b/helpers/binary_win32-loader
index e0a7bc7..bf4eb6c 100755
--- a/helpers/binary_win32-loader
+++ b/helpers/binary_win32-loader
@@ -44,10 +44,20 @@ Create_lockfile .lock
 
 case "${LH_ARCHITECTURE}" in
 	amd64|i386)
+		case "${LH_DISTRIBUTION}" in
+			lenny)
+				WIN32_LOADER="/usr/lib/win32-loader"
+				;;
+
+			*)
+				WIN32_LOADER="/usr/share/win32-loader"
+				;;
+		esac
+
 		if [ "${LH_CHROOT_BUILD}" = "true" ]
 		then
 			# Checking depends
-			Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
+			Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
 
 			# Restoring cache
 			Restore_cache cache/packages_binary
@@ -56,13 +66,18 @@ case "${LH_ARCHITECTURE}" in
 			Install_package
 
 			# Copying win32-loader
-			cp chroot/usr/lib/win32-loader/* binary
+			cp chroot/${WIN32_LOADER}/* binary
 		else
-			cp /usr/lib/win32-loader/* binary
+			cp ${WIN32_LOADER}/* binary
 		fi
 
 		mv binary/win32-loader.exe binary/setup.exe
 
+		if [ -e binary/win32-loader-standalone.exe ]
+		then
+			mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
+		fi
+
 		if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
 		then
 

-- 
live-helper