diffstat for live-build-3.0.5 live-build-3.0.5

 changelog      |   13 +++++++++
 patches/lihuen |   78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series |    1 
 3 files changed, 92 insertions(+)

diff -Nru live-build-3.0.5/debian/changelog live-build-3.0.5/debian/changelog
--- live-build-3.0.5/debian/changelog	2013-04-30 08:27:32.000000000 +0000
+++ live-build-3.0.5/debian/changelog	2013-06-13 16:30:29.000000000 +0000
@@ -1,3 +1,16 @@
+live-build (3.0.5-1lihuen1.2) UNRELEASED; urgency=low
+
+  [ Soporte Lihuen ]
+  * Exprimiendo espacio
+  * Deshabilitado el script que borra .pyc porque crea más problemas de
+  los que soluciona.
+
+  [ root ]
+  * Parche de Atilio para evitar el problema con el uid 1000 en el /
+  * Vuelve lilo, no hacía falta exprimir tanto
+
+ -- root <root@wheezy-local-pc>  Thu, 13 Jun 2013 13:30:00 -0300
+
 live-build (3.0.5-1) unstable; urgency=low
 
   * Skipping loadlin inclusion on netboot images.
diff -Nru live-build-3.0.5/debian/patches/lihuen live-build-3.0.5/debian/patches/lihuen
--- live-build-3.0.5/debian/patches/lihuen	1970-01-01 00:00:00.000000000 +0000
+++ live-build-3.0.5/debian/patches/lihuen	2013-06-13 16:51:03.000000000 +0000
@@ -0,0 +1,78 @@
+diff -u live-build-3.0.5/scripts/build/binary_debian-installer live-build-3.0.5/scripts/build/binary_debian-installer
+--- live-build-3.0.5/scripts/build/binary_debian-installer
++++ live-build-3.0.5/scripts/build/binary_debian-installer
+@@ -339,7 +339,7 @@
+ 
+ 	case "${LB_ARCHITECTURES}" in
+ 		amd64)
+-			DI_REQ_PACKAGES="lilo grub-pc"
++			DI_REQ_PACKAGES="lilo grub2"
+ 
+ 			case "${LB_DISTRIBUTION}" in
+ 				squeeze)
+@@ -359,7 +359,7 @@
+ 			;;
+ 
+ 		i386)
+-			DI_REQ_PACKAGES="elilo lilo grub-pc"
++			DI_REQ_PACKAGES="lilo grub2"
+ 
+ 			case "${LB_DISTRIBUTION}" in
+ 				squeeze)
+@@ -381,7 +381,7 @@
+ 					;;
+ 
+ 				*)
+-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
++					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-686"
+ 					;;
+ 			esac
+ 			;;
+@@ -512,7 +512,7 @@
+ 	fi
+ 
+ 	# Set apt command prefix
+-	_LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
++	_LB_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false -o APT::Install-Suggests=false --download-only"
+ 
+ 	if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
+ 	then
+@@ -529,6 +529,10 @@
+ 		# Drop the packages already installed that d-i doesn't explicitely need
+ 		_REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')"
+ 		_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v \"^${_REMAINING_PACKAGES}$\")"
++		if [ ! -f chroot/var/lib/dpkg/status.tmp ]; then
++			echo NO EXISTE chroot/var/lib/dpkg/status.tmp
++			_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status | grep -E -v \"^${_REMAINING_PACKAGES}$\")"
++		fi
+ 
+ 		for _PACKAGE in ${_REMAINING_PACKAGES}
+ 		do
+unchanged:
+--- live-build-3.0.5.orig/share/hooks/0170-remove-python-py.chroot
++++ live-build-3.0.5/share/hooks/0170-remove-python-py.chroot
+@@ -6,4 +6,12 @@ set -e
+ #
+ # This removes byte-compiled Python modules to save some space.
+ 
++# FIXME:
++echo "===================================="
++echo "$0: DESHABILITADO PORQUE CAUSA PROBLEMAS"
++echo "===================================="
++exit 0
++# END FIXME
++
++
+ find /usr -name "*.pyc" -print0 | xargs -0r rm -f
+only in patch2:
+unchanged:
+--- live-build-3.0.5.orig/scripts/build/binary_rootfs
++++ live-build-3.0.5/scripts/build/binary_rootfs
+@@ -371,6 +371,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
+ 					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef /excludes"
+ 				fi
+ 
++				Chroot chroot "chown root:root chroot" 
+ 				# Create image
+ 				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+ 
diff -Nru live-build-3.0.5/debian/patches/series live-build-3.0.5/debian/patches/series
--- live-build-3.0.5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ live-build-3.0.5/debian/patches/series	2013-05-29 19:53:47.000000000 +0000
@@ -0,0 +1 @@
+lihuen