[SCM] live-build branch, debian, updated. debian/3.0_a60-1

Daniel Baumann daniel at debian.org
Sat Sep 29 12:09:06 UTC 2012


The following commit has been merged in the debian branch:
commit 6b12a3fb7d2c3066b95180ea2bed5364986a4400
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 29 13:08:14 2012 +0200

    Updating win32-loader inclusion handling.

diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index f865035..4789398 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -69,6 +69,12 @@ case "${LB_ARCHITECTURES}" in
 			mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
 		fi
 
+		if ls binary/win32-loader/g2ldr* > /dev/null 2>&1
+		then
+			mv binary/win32-loader/g2ldr* binary
+			rmdir binary/win32-loader > /dev/null 2>&1 || true
+		fi
+
 		if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
 		then
 

-- 
live-build



More information about the debian-live-changes mailing list