[SCM] debian-live/live-helper branch, master, updated. 1.0_a36-1-2-ge743c23

Daniel Baumann daniel at debian.org
Tue Nov 13 12:50:04 UTC 2007


The branch, master has been updated
       via  e743c23cd7bf429ebab595c338f689e6e0a75275 (commit)
       via  034a067667ad1881f6d286fafcec9ebd5ba105bd (commit)
      from  5dcc43149eceff39c2cecbd69db625a9c9858809 (commit)


- Shortlog ------------------------------------------------------------
e743c23 Fixing some coding style issues.
034a067 Preparing live-helper 1.0~a37-1.

Summary of changes:
 Makefile                                |    6 +-
 debian/changelog                        |    6 +
 functions/common.sh                     |    2 +-
 helpers/lh_binary_syslinux              |  271 +++++++++++++++++--------------
 manpages/lh_binary.de.1                 |    2 +-
 manpages/lh_binary.en.1                 |    2 +-
 manpages/lh_bootstrap.de.1              |    2 +-
 manpages/lh_bootstrap.en.1              |    2 +-
 manpages/lh_bootstrap_cdebootstrap.de.1 |    2 +-
 manpages/lh_bootstrap_cdebootstrap.en.1 |    2 +-
 manpages/lh_bootstrap_debootstrap.de.1  |    2 +-
 manpages/lh_bootstrap_debootstrap.en.1  |    2 +-
 manpages/lh_build.de.1                  |    2 +-
 manpages/lh_build.en.1                  |    2 +-
 manpages/lh_chroot.de.1                 |    2 +-
 manpages/lh_chroot.en.1                 |    2 +-
 manpages/lh_clean.de.1                  |    2 +-
 manpages/lh_clean.en.1                  |    2 +-
 manpages/lh_config.de.1                 |    2 +-
 manpages/lh_config.en.1                 |    2 +-
 manpages/lh_source.de.1                 |    2 +-
 manpages/lh_source.en.1                 |    2 +-
 manpages/lh_testroot.de.1               |    2 +-
 manpages/lh_testroot.en.1               |    2 +-
 manpages/live-helper.de.7               |    2 +-
 manpages/live-helper.en.7               |    2 +-
 26 files changed, 177 insertions(+), 152 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit e743c23cd7bf429ebab595c338f689e6e0a75275
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 13 13:49:41 2007 +0100

    Fixing some coding style issues.

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 9887247..eff8d83 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -83,6 +83,7 @@ Syslinux_memtest_entry ()
 	KERNEL="${3}"
 
 	MEMTEST="${MEMTEST}\nLABEL ${LABEL}\n"
+
 	# Write the menu label if the syslinux menu is being use
 	MEMTEST="${MEMTEST}\tMENU LABEL ${MENULABEL}\n"
 	MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
@@ -98,26 +99,30 @@ Syslinux_live_entry ()
 	INITRD="${4}"
 	APPEND="${5}"
 
-   if [ ${LH_BINARY_IMAGES} = "iso" ] || [ ${LH_BINARY_IMAGES} = "usb-hdd" ]
-   then
-      num=$(ls -1 ${KERNEL_PATH}|grep 'vmlinuz[0-9]\+$'|wc -l)
-      num=$(($num +1))
-      # Note: ISOLINUX will not find the kernel if the name ends in ".img".
-      mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${num}
-      mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${num}.img
-      KERNEL=vmlinuz${num}
-      INITRD=initrd${num}.img
-   fi
-
-   # Regular kernel
+	if [ ${LH_BINARY_IMAGES} = "iso" ] || [ ${LH_BINARY_IMAGES} = "usb-hdd" ]
+	then
+		NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
+		NUMBER="$((${NUMBER} +1))"
+
+		# Note: ISOLINUX will not find the kernel if the name ends in ".img".
+		mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
+		mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img
+
+		KERNEL=vmlinuz${NUMBER}
+		INITRD=initrd${NUMBER}.img
+	fi
+
+	# Regular kernel
 	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
+
 	# Write the menu label if the syslinux menu is being use
 	LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
 	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
 
-   # Failsafe kernel
+	# Failsafe kernel
 	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}failsafe\n"
+
 	# Write the menu label if the syslinux menu is being use
 	LINUX_LIVE="${LINUX_LIVE}\tMENU LABEL ${MENULABEL} Failsafe\n"
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
@@ -137,148 +142,158 @@ Syslinux_install_entry ()
 		APPEND="${APPEND} quiet"
 	fi
 
-   for TYPE in Install Expert Rescue Auto
-   do
+	for TYPE in Install Expert Rescue Auto
+	do
 		case "${TYPE}" in
 			Install)
-				TAPPEND="${APPEND}" 
+				TAPPEND="${APPEND}"
 				;;
+
 			Expert)
-				TAPPEND="priority=low ${APPEND}" 
+				TAPPEND="priority=low ${APPEND}"
 				;;
+
 			Rescue)
-				TAPPEND="rescue/enable=true ${APPEND}" 
+				TAPPEND="rescue/enable=true ${APPEND}"
 				;;
+
 			Auto)
-				TAPPEND="rescue/enable=true ${APPEND}" 
+				TAPPEND="rescue/enable=true ${APPEND}"
 				;;
 		esac
 
-	   LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}${TYPE}\n"
-	   LINUX_INSTALL="${LINUX_INSTALL}\tMENU LABEL Start ${LABEL} ${TYPE}\n"
-	   LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
-	   LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
-   done
+		LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}${TYPE}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tMENU LABEL Start ${LABEL} ${TYPE}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
+	done
 }
 
 Copy_syslinux_templates ()
 {
-		cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
+	cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
+
+	if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
+	then
+		cp "${TEMPLATES}"/normal/*.cfg ${SCREEN_PATH}
+		cp "${TEMPLATES}"/normal/data/* ${DATA_PATH}
+	else
+		cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH}
+		cp "${TEMPLATES}"/menu/data/* ${DATA_PATH}
 
-		if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
-		then
-			cp "${TEMPLATES}"/normal/*.cfg ${SCREEN_PATH}
-			cp "${TEMPLATES}"/normal/data/* ${DATA_PATH}
-		else
-			cp "${TEMPLATES}"/menu/*.cfg ${SCREEN_PATH}
-			cp "${TEMPLATES}"/menu/data/* ${DATA_PATH}
          # Grab menu binary from chroot
          MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed 's,default\s*.*/\(.*menu.c32\)$,\1,g')
-			cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
-		fi
+		cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
+	fi
 
-		if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
-		then
-			cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
-		else
-			cp -r "${TEMPLATES}"/en/* ${SCREEN_PATH}
-		fi
+	if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
+	then
+		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
+	else
+		cp -r "${TEMPLATES}"/en/* ${SCREEN_PATH}
+	fi
 
-		for FILE in ${SCREEN_PATH}/*.live
+	for FILE in ${SCREEN_PATH}/*.live
+	do
+		mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
+	done
+
+	if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+	then
+		for FILE in ${SCREEN_PATH}/*.install
 		do
-			mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
+			mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
 		done
 
-		if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+		if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
 		then
-			for FILE in ${SCREEN_PATH}/*.install
+			for FILE in ${SCREEN_PATH}/*.install.g-i
 			do
-				mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+				mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
 			done
-
-			if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
-			then
-				for FILE in ${SCREEN_PATH}/*.install.g-i
-				do
-					mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
-				done
-			else
-				rm -f ${SCREEN_PATH}/*.install.g-i
-			fi
 		else
-			rm -f ${SCREEN_PATH}/*.install*
+			rm -f ${SCREEN_PATH}/*.install.g-i
 		fi
+	else
+		rm -f ${SCREEN_PATH}/*.install*
+	fi
 
-		# Copying custom splash screen
-		if [ "${LH_SYSLINUX_SPLASH}" = "none" ] 
+	# Copying custom splash screen
+	if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
+	then
+		# no splash screen
+		SPLASH=""
+		rm -f ${SCREEN_PATH}/splash.rle
+		rm -f ${DATA_PATH}/splash.png
+	else
+		if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
 		then
-			# no splash screen
-			SPLASH=""
-			rm -f ${SCREEN_PATH}/splash.rle
-			rm -f ${DATA_PATH}/splash.png
+		    SPLASH="${LIVE_DATA_PATH}/splash.rle"
 		else
-			if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
-			then
-			    SPLASH="${LIVE_DATA_PATH}/splash.rle"
-			else
-			    SPLASH="${LIVE_DATA_PATH}/splash.png"
-            fi
+		    SPLASH="${LIVE_DATA_PATH}/splash.png"
+		fi
 
-			if [ -n "${LH_SYSLINUX_SPLASH}" ]
+		if [ -n "${LH_SYSLINUX_SPLASH}" ]
+		then
+			if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
 			then
-				if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
-				then
-					Echo_error "${LH_SYSLINUX_SPLASH} doen't exist"
-					exit 1
-				else
-					rm -f ${SCREEN_PATH}/splash.rle
-					rm -f ${DATA_PATH}/splash.png
-					cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
-				fi
+				Echo_error "${LH_SYSLINUX_SPLASH} doen't exist"
+				exit 1
+			else
+				rm -f ${SCREEN_PATH}/splash.rle
+				rm -f ${DATA_PATH}/splash.png
+				cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
 			fi
 		fi
+	fi
 }
 
 Configure_syslinux_templates ()
 {
-   templates=$(find ${SYSLINUX_PATH} -type f -name '*.cfg' -o -name '*.txt')
-   for template_file in ${templates}; do
+	templates="$(find ${SYSLINUX_PATH} -type f -name '*.cfg' -o -name '*.txt')"
+
+	for template_file in ${templates}
+	do
 		sed -i -e "s@{\$LINUX_LIVE}@${LINUX_LIVE}@" \
-             -e "s@{\$LINUX_INSTALL}@${LINUX_INSTALL}@" \
-             -e "s@{\$MEMTEST}@${MEMTEST}@" \
-             -e "s@{\$LIVE_SCREEN_PATH}@${LIVE_SCREEN_PATH}@" \
-             -e "s@{\$LIVE_DATA_PATH}@${LIVE_DATA_PATH}@" \
-             -e "s@{\$LIVE_KERNEL_PATH}@${LIVE_KERNEL_PATH}@" \
-             -e "s@{\$SPLASH}@${SPLASH}@" \
-             -e "s/{\$LH_DISTRIBUTION}/${LH_DISTRIBUTION}/" \
-             -e "s/{\$LH_DATE}/$(date +%Y%m%d)/" \
-             -e "s/{\$LH_MEDIA}/${MEDIA}/" \
+		       -e "s@{\$LINUX_INSTALL}@${LINUX_INSTALL}@" \
+		       -e "s@{\$MEMTEST}@${MEMTEST}@" \
+		       -e "s@{\$LIVE_SCREEN_PATH}@${LIVE_SCREEN_PATH}@" \
+		       -e "s@{\$LIVE_DATA_PATH}@${LIVE_DATA_PATH}@" \
+		       -e "s@{\$LIVE_KERNEL_PATH}@${LIVE_KERNEL_PATH}@" \
+		       -e "s@{\$SPLASH}@${SPLASH}@" \
+		       -e "s/{\$LH_DISTRIBUTION}/${LH_DISTRIBUTION}/" \
+		       -e "s/{\$LH_DATE}/$(date +%Y%m%d)/" \
+		       -e "s/{\$LH_MEDIA}/${MEDIA}/" \
 		       -e "s/{\$LH_VERSION}/${VERSION}/" \
 		       -e "s/{\$LH_SYSLINUX_TIMEOUT}/${LH_SYSLINUX_TIMEOUT}0/" \
 		       -e 's/\ $//g' \
-             $template_file
-   done
+		$template_file
+	done
 
 	# Syslinux v3.31 in etch does not support include statements
 	if [ "${LH_DISTRIBUTION}" = "etch" ]
 	then
 		while grep -q ^include ${SCREEN_PATH}/syslinux.cfg
-	   do
+		do
 			INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg |awk '{print $2}')
+
 			for FILE_PATH in ${INCLUDES}
 			do
-			   FILE_NAME=$(basename ${FILE_PATH})
-			   sed -i -e '\@include '${FILE_PATH}'@ {
-				r '${SCREEN_PATH}/${FILE_NAME}'
-				d  
+				FILE_NAME=$(basename ${FILE_PATH})
+
+				sed -i -e '\@include '${FILE_PATH}'@ {
+					r '${SCREEN_PATH}/${FILE_NAME}'
+					d
 				}' ${SCREEN_PATH}/syslinux.cfg
-            # remove the files, which were included
+
+				#  remove the files, which were included
 				if [ -e ${SCREEN_PATH}/${FILE_NAME} ]
-            then
-					rm ${SCREEN_PATH}/${FILE_NAME}
-            fi
+				then
+					rm -f ${SCREEN_PATH}/${FILE_NAME}
+				fi
 			done
-      done
+		done
+
 		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
 		# when using FAT hard drive images, remove leading /'s
 		if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
@@ -306,37 +321,38 @@ esac
 case "${LH_BINARY_IMAGES}" in
 	iso)
 		SYSLINUX_PATH="binary/isolinux"
-      KERNEL_PATH="binary/${INITFS}"
-      SCREEN_PATH="${SYSLINUX_PATH}"
-      DATA_PATH="${SCREEN_PATH}/data"
-      LIVE_KERNEL_PATH="/${INITFS}"
-      LIVE_INSTALL_KERNEL_PATH="/install"
-      LIVE_SCREEN_PATH="/isolinux"
-      LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
-      MEDIA="CD-ROM"
+		KERNEL_PATH="binary/${INITFS}"
+		SCREEN_PATH="${SYSLINUX_PATH}"
+		DATA_PATH="${SCREEN_PATH}/data"
+		LIVE_KERNEL_PATH="/${INITFS}"
+		LIVE_INSTALL_KERNEL_PATH="/install"
+		LIVE_SCREEN_PATH="/isolinux"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		MEDIA="CD-ROM"
 		;;
 
 	net)
 		SYSLINUX_PATH="tftpboot"
-      KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
-      SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
-      DATA_PATH="${SCREEN_PATH}/data"
-      LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
-      LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
-      LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
-      LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
-      MEDIA="netboot"
+		KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
+		SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
+		DATA_PATH="${SCREEN_PATH}/data"
+		LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
+		LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
+		LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		MEDIA="netboot"
 		;;
 
 	tar|usb-hdd)
 		SYSLINUX_PATH="binary/syslinux"
-      KERNEL_PATH="binary/${INITFS}"
-      SCREEN_PATH="${SYSLINUX_PATH}"
-      DATA_PATH="${SCREEN_PATH}/data"
-      LIVE_KERNEL_PATH="/${INITFS}"
-      LIVE_INSTALL_KERNEL_PATH="/install"
-      LIVE_SCREEN_PATH="/syslinux"
-      LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+		KERNEL_PATH="binary/${INITFS}"
+		SCREEN_PATH="${SYSLINUX_PATH}"
+		DATA_PATH="${SCREEN_PATH}/data"
+		LIVE_KERNEL_PATH="/${INITFS}"
+		LIVE_INSTALL_KERNEL_PATH="/install"
+		LIVE_SCREEN_PATH="/syslinux"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}/data"
+
 		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
 		# when using FAT hard drive images
 		if [ "${LH_DISTRIBUTION}" = "etch" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
@@ -350,6 +366,7 @@ case "${LH_BINARY_IMAGES}" in
 			LIVE_SCREEN_PATH=""
 			LIVE_DATA_PATH=""
 		fi
+
 		MEDIA="hd-media"
 		;;
 esac
@@ -531,6 +548,7 @@ case "${LH_BINARY_IMAGES}" in
 			cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/isolinux.cfg
 		fi
 		;;
+
 	net)
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
@@ -542,8 +560,8 @@ case "${LH_BINARY_IMAGES}" in
 		esac
 
 		mkdir -p ${KERNEL_PATH}/pxelinux.cfg
-      ln -s ${LIVE_KERNEL_PATH}/pxelinux.cfg ${SYSLINUX_PATH}/pxelinux.cfg
-      ln -s ${LIVE_KERNEL_PATH}/pxelinux.0 ${SYSLINUX_PATH}/pxelinux.0
+		ln -s ${LIVE_KERNEL_PATH}/pxelinux.cfg ${SYSLINUX_PATH}/pxelinux.cfg
+		ln -s ${LIVE_KERNEL_PATH}/pxelinux.0 ${SYSLINUX_PATH}/pxelinux.0
 
 		mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
 
@@ -553,6 +571,7 @@ case "${LH_BINARY_IMAGES}" in
 			cp "${LH_SYSLINUX_CFG}" ${KERNEL_PATH}/pxelinux.cfg/default
 		fi
 		;;
+
 	tar|usb-hdd)
 		case "${LH_CHROOT_BUILD}" in
 			enabled)

commit 034a067667ad1881f6d286fafcec9ebd5ba105bd
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 13 13:49:18 2007 +0100

    Preparing live-helper 1.0~a37-1.

diff --git a/Makefile b/Makefile
index afb5ce8..a70fdcc 100644
--- a/Makefile
+++ b/Makefile
@@ -100,9 +100,9 @@ uninstall:
 update:
 	set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-11\\-12/2007\\-11\\-19/' \
-			-e 's/12.11.2007/19.11.2007/' \
-			-e 's/1.0~a36/1.0~a37/' \
+		sed -i	-e 's/2007\\-11\\-19/2007\\-11\\-26/' \
+			-e 's/19.11.2007/26.11.2007/' \
+			-e 's/1.0~a37/1.0~a38/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 7151816..e292b84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a37-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 19 Nov 2007 00:00:00 +0100
+
 live-helper (1.0~a36-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/functions/common.sh b/functions/common.sh
index 1b80202..01ed6eb 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="$(basename ${0})"
-VERSION="1.0~a36"
+VERSION="1.0~a37"
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index f566894..d612139 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_BINARY 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index d1896d1..e0ed149 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_BINARY 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_binary \- meta\-helper for lh_binary_*
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index b57dc67..46706cd 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index 55c606e..ea6afed 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- meta\-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index 9a027f3..76591c7 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index c0b6da8..37bbcb4 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index b1188f4..9e511a7 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index 5aa0a42..56111bf 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index 57d4a7b..a100b57 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_BUILD 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_build \- erstellen eines Live-Systemes
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index 59cb2e3..96d1e4d 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_BUILD 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_build \- building a live system
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index 7af5f75..3d97b45 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_CHROOT 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index 1ecde7b..2260122 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_CHROOT 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_chroot \- meta\-helper for lh_chroot_*
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index 741764a..328896e 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_CLEAN 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_clean \- r\[:a]umt das Build-Verzeichnis auf
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index eae459b..9609070 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_CLEAN 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_clean \- clean up system build directories
diff --git a/manpages/lh_config.de.1 b/manpages/lh_config.de.1
index a623326..4bb6cd1 100644
--- a/manpages/lh_config.de.1
+++ b/manpages/lh_config.de.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_CONFIG 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_config \- erstellt live-helper(7) Konfiguration
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 9b9b9fd..71e5a02 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_CONFIG 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_config \- create configuration for live-helper(7)
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index 2a981d8..647c3d7 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_SOURCE 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_source \- Meta\-Helper f\[:u]r lh_source_*
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index 911043b..bc4748c 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_SOURCE 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_source \- meta\-helper for lh_source_*
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index 07d95e2..612d547 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LH_TESTROOT 1 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_testroot \- stellt sicher dass das System als root gebaut wird
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index 13fc223..57c2893 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index a4e01d9..459efdf 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "12.11.2007" "1.0~a36" "live\-helper"
+.TH LIVE\-HELPER 7 "19.11.2007" "1.0~a37" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live Helper-Programme
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index eefe542..113509c 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-11\-12" "1.0~a36" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-11\-19" "1.0~a37" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live helper programs

-- 
debian-live/live-helper



More information about the debian-live-changes mailing list