Hi, The old patch didn't apply to the new release. Attached is a new patch, this time including the Depends: netpbm (no other new changes are introduced).
Thanks, Bas -- I encourage people to send encrypted e-mail (see http://www.gnupg.org). If you have problems reading my e-mail, use a better reader. Please send the central message of e-mails as plain text in the message body, not as HTML and definitely not as MS Word. Please do not use the MS Word format for attachments either. For more information, see http://pcbcn10.phys.rug.nl/e-mail.html
diff -ur orig/debian/control live-package-0.99.10/debian/control
--- orig/debian/control 2006-10-21 17:29:26.000000000 +0200
+++ live-package-0.99.10/debian/control 2006-10-21 17:33:23.000000000 +0200
@@ -8,7 +8,7 @@
Package: live-package
Architecture: all
-Depends: cdebootstrap (>= 0.3.10), genext2fs, mkisofs, squashfs-tools
+Depends: cdebootstrap (>= 0.3.10), genext2fs, mkisofs, netpbm, squashfs-tools
Provides: make-live
Description: utility to build Debian Live systems
make-live is a utility to build Debian Live systems. It takes a Debian mirror
diff -ur orig/src/main.sh live-package-0.99.10/src/main.sh
--- orig/src/main.sh 2006-10-13 15:08:48.000000000 +0200
+++ live-package-0.99.10/src/main.sh 2006-10-21 17:30:53.000000000 +0200
@@ -41,7 +41,7 @@
. "${SCRIPT}"
done
-USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend
KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY]
[-d|--distribution DISTRIBUTION] [--disable-generic-indices]
[--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour
BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot
FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR]
[--manifest PACKAGE] [-m|--mirror URL] [--mirror-security URL] [--packages
PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL]
[--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section
SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY]
[--templates DIRECTORY] [-t|--type TYPE]"
+USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend
KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY]
[-d|--distribution DISTRIBUTION] [--disable-generic-indices]
[--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour
BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot
FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR]
[--manifest PACKAGE] [-m|--mirror URL] [--mirror-security URL] [--packages
PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL]
[--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section
SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY]
[--templates DIRECTORY] [-t|--type TYPE] [--splash IMAGE_FILE]"
Help ()
{
@@ -90,6 +90,7 @@
echo " --server-path: specifies the netboot server path for chroot."
echo " --templates: specifies location of the templates."
echo " -t, --type: specifies live system type."
+ echo " --splash: specifies the splash image to use during boot."
echo
echo "Environment:"
echo " All settings can be also specified trough environment
variables. Please see make-live.conf(8) for more information."
@@ -159,7 +160,7 @@
Main ()
{
- ARGUMENTS="`getopt --longoptions
root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version
--name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "[EMAIL
PROTECTED]"`"
+ ARGUMENTS="`getopt --longoptions
root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,repositories:,section:,server-address:,server-path:,splash,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version
--name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "[EMAIL
PROTECTED]"`"
if [ "${?}" != "0" ]
then
@@ -303,6 +304,10 @@
Version; shift
;;
+ --splash)
+ LIVE_SPLASH="${2}"; shift
+ ;;
+
--)
shift; break
;;
diff -ur orig/src/scripts/21image.sh live-package-0.99.10/src/scripts/21image.sh
--- orig/src/scripts/21image.sh 2006-10-13 15:08:48.000000000 +0200
+++ live-package-0.99.10/src/scripts/21image.sh 2006-10-21 17:31:29.000000000
+0200
@@ -196,6 +196,17 @@
;;
esac
+ if [ -r "${LIVE_SPLASH}" ]
+ then
+ map="`mktemp`"
+ pnm="`mktemp`"
+ anytopnm < "${LIVE_SPLASH}" > "${pnm}"
+ pnmcolormap 15 < "${pnm}" > "${map}"
+ pnmremap -map="${map}" "${pnm}" | ppmtolss16
'#ffffff=7' > "${LIVE_ROOT}"/binary/isolinux/splash.rle
+ rm "${pnm}"
+ rm "${map}"
+ fi
+
# Remove syslinux
Chroot_exec "apt-get remove --purge --yes syslinux"
Patch_network deapply
signature.asc
Description: Digital signature
_______________________________________________ Debian-live-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
