summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-26 12:38:38 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:19:23 +0100
commitc5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a (patch)
tree44a6d3a12cd11067aea2a4d43eb9133cc25bad2f /functions
parent941a47be0ca3061f54a237583092357d1ff80f7c (diff)
downloadvyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.tar.gz
vyos-live-build-c5c3f6133a0fb62ba9c2c3b839e6ea5774f9c76a.zip
Adding debian version 3.0~a1-1.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/aliases.sh2
-rwxr-xr-xfunctions/architecture.sh2
-rwxr-xr-xfunctions/arguments.sh2
-rwxr-xr-xfunctions/breakpoints.sh2
-rwxr-xr-xfunctions/cache.sh2
-rwxr-xr-xfunctions/chroot.sh2
-rwxr-xr-xfunctions/color.sh2
-rwxr-xr-xfunctions/common.sh6
-rwxr-xr-xfunctions/conffile.sh8
-rwxr-xr-xfunctions/cursor.sh2
-rwxr-xr-xfunctions/defaults.sh48
-rwxr-xr-xfunctions/echo.sh65
-rwxr-xr-xfunctions/exit.sh4
-rwxr-xr-xfunctions/help.sh2
-rwxr-xr-xfunctions/l10n.sh27
-rwxr-xr-xfunctions/lockfile.sh2
-rwxr-xr-xfunctions/losetup.sh2
-rwxr-xr-xfunctions/man.sh4
-rwxr-xr-xfunctions/packages.sh2
-rwxr-xr-xfunctions/packageslists.sh2
-rwxr-xr-xfunctions/releases.sh3
-rwxr-xr-xfunctions/stagefile.sh2
-rwxr-xr-xfunctions/templates.sh2
-rwxr-xr-xfunctions/usage.sh2
-rwxr-xr-xfunctions/version.sh4
-rwxr-xr-xfunctions/wrapper.sh2
26 files changed, 147 insertions, 56 deletions
diff --git a/functions/aliases.sh b/functions/aliases.sh
index 9c7972983..8e1dddad4 100755
--- a/functions/aliases.sh
+++ b/functions/aliases.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/architecture.sh b/functions/architecture.sh
index c3361a785..b49729348 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 9a675e6a6..0db3c13d0 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh
index 025628517..29ab8610c 100755
--- a/functions/breakpoints.sh
+++ b/functions/breakpoints.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/cache.sh b/functions/cache.sh
index c2978318e..bae606dd2 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/chroot.sh b/functions/chroot.sh
index dff13d062..589200add 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/color.sh b/functions/color.sh
index 78e37e0a1..9bdd8371d 100755
--- a/functions/color.sh
+++ b/functions/color.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/common.sh b/functions/common.sh
index 75f4ae784..98c8cfaee 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -1,15 +1,15 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
-PROGRAM="live-build"
-VERSION="2.0.12-1"
+PACKAGE="live-build"
+VERSION="3.0~a1-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/auto/scripts:${PATH}"
diff --git a/functions/conffile.sh b/functions/conffile.sh
index 05fd7e8ef..02730dfd8 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -17,9 +17,9 @@ Get_conffiles ()
for FILE in ${@}
do
FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
- FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||')"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${ARCHITECTURE}"
+ FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lh_||').${DISTRIBUTION}"
done
fi
diff --git a/functions/cursor.sh b/functions/cursor.sh
index f01300943..6ea1d9a9e 100755
--- a/functions/cursor.sh
+++ b/functions/cursor.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/defaults.sh b/functions/defaults.sh
index bd6c67953..57cf37c20 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -57,7 +57,7 @@ Set_defaults ()
then
LB_APT_HTTP_PROXY="${http_proxy}"
else
- if [ -n "${LB_APT_HTTP_PROXY}" ] && [ "${LB_APT_HTTP_PROXY}" != "${http_proxy}" ]
+ if [ -n "${LB_APT_HTTP_PROXY}" ] && [ "${LB_APT_HTT_PROXY}" != "${http_proxy}" ]
then
http_proxy="${LB_APT_HTTP_PROXY}"
fi
@@ -348,10 +348,6 @@ Set_defaults ()
lenny)
LB_MIRROR_CHROOT_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
-
- squeeze)
- LB_MIRROR_CHROOT_VOLATILE="${LB_MIRROR_CHROOT}"
- ;;
esac
;;
@@ -448,9 +444,6 @@ Set_defaults ()
lenny)
LB_MIRROR_BINARY_VOLATILE="http://volatile.debian.org/debian-volatile/"
;;
-
- squeeze)
- LB_MIRROR_BINARY_VOLATILE="${LB_MIRROR_BINARY}"
esac
;;
@@ -728,7 +721,6 @@ Set_defaults ()
*)
LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
esac
;;
@@ -743,7 +735,6 @@ Set_defaults ()
*)
LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
esac
;;
@@ -757,7 +748,6 @@ Set_defaults ()
*)
LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
esac
;;
@@ -772,7 +762,6 @@ Set_defaults ()
*)
LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
- LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
;;
esac
;;
@@ -877,7 +866,28 @@ Set_defaults ()
# Setting debian-installer-gui
case "${LB_MODE}" in
debian)
- LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
+ case "${LB_DISTRIBUTION}" in
+ squeeze|sid)
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-false}"
+ ;;
+
+ *)
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
+ ;;
+ esac
+ ;;
+
+ ubuntu)
+ case "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" in
+ karmic)
+ # Not available for Karmic currently.
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-false}"
+ ;;
+
+ *)
+ LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
+ ;;
+ esac
;;
*)
@@ -931,6 +941,16 @@ Set_defaults ()
esac
fi
+ case "${LB_BINARY_IMAGES}" in
+ iso-hybrid|usb*)
+ # Try USB block devices for install media
+ if ! echo "${LB_BOOTAPPEND_INSTALL}" | grep -q try-usb
+ then
+ LB_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LB_BOOTAPPEND_INSTALL}"
+ fi
+ ;;
+ esac
+
if [ -n ${_LB_BOOTAPPEND_PRESEED} ]
then
LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL} ${_LB_BOOTAPPEND_PRESEED}"
diff --git a/functions/echo.sh b/functions/echo.sh
index 7dbfac4d7..555bc42bb 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -13,7 +13,12 @@ Echo ()
STRING="${1}"
shift
- printf "${STRING}\n" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf "${STRING}\n" "${@}"
+ else
+ printf "$(eval_gettext "${STRING}")" "${@}"; echo;
+ fi
}
Echo_debug ()
@@ -23,7 +28,12 @@ Echo_debug ()
STRING="${1}"
shift
- printf "D: ${STRING}\n" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf "D: ${STRING}\n" "${@}"
+ else
+ printf "D: $(eval_gettext "${STRING}")" "${@}"; echo;
+ fi
fi
}
@@ -34,7 +44,12 @@ Echo_debug_running ()
STRING="${1}"
shift
- printf "D: ${STRING}" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf "D: ${STRING}" "${@}"
+ else
+ printf "D: $(eval_gettext "${STRING}")" "${@}"
+ fi
if [ "${_COLOR}" = "false" ]
then
@@ -57,7 +72,12 @@ Echo_error ()
printf "${RED}E${NO_COLOR}:"
fi
- printf " ${STRING}\n" "${@}" >&2
+ if [ "${_L10N}" = "false" ]
+ then
+ printf " ${STRING}\n" "${@}" >&2
+ else
+ (printf " $(eval_gettext "${STRING}")" "${@}"; echo;) >&2
+ fi
}
Echo_message ()
@@ -74,7 +94,12 @@ Echo_message ()
printf "${WHITE}P${NO_COLOR}:"
fi
- printf " ${STRING}\n" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf " ${STRING}\n" "${@}"
+ else
+ printf " $(eval_gettext "${STRING}")" "${@}"; echo;
+ fi
fi
}
@@ -92,7 +117,12 @@ Echo_message_running ()
printf "${WHITE}P${NO_COLOR}:"
fi
- printf " ${STRING}" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf " ${STRING}" "${@}"
+ else
+ printf " $(eval_gettext "${STRING}")" "${@}";
+ fi
if [ "${_COLOR}" = "false" ]
then
@@ -110,7 +140,12 @@ Echo_verbose ()
STRING="${1}"
shift
- printf "I: ${STRING}\n" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf "I: ${STRING}\n" "${@}"
+ else
+ printf "I: $(eval_gettext "${STRING}")" "${@}"; echo;
+ fi
fi
}
@@ -121,7 +156,12 @@ Echo_verbose_running ()
STRING="${1}"
shift
- printf "I: ${STRING}" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf "I: ${STRING}" "${@}"
+ else
+ printf "I: $(eval_gettext "${STRING}")" "${@}";
+ fi
if [ "${_COLOR}" = "false" ]
then
@@ -144,7 +184,12 @@ Echo_warning ()
printf "${YELLOW}W${NO_COLOR}:"
fi
- printf " ${STRING}\n" "${@}"
+ if [ "${_L10N}" = "false" ]
+ then
+ printf " ${STRING}\n" "${@}"
+ else
+ printf " $(eval_gettext "${STRING}")" "${@}"; echo;
+ fi
}
Echo_status ()
diff --git a/functions/exit.sh b/functions/exit.sh
index b6f2e2bfe..5fa1fa86f 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -15,7 +15,7 @@ Exit ()
if [ "${_DEBUG}" = "true" ]
then
# Dump variables
- set | grep -e ^LB
+ set | grep -e ^LH
fi
# Always exit true in case we are not able to unmount
diff --git a/functions/help.sh b/functions/help.sh
index f5a56df9a..86f7782ac 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/l10n.sh b/functions/l10n.sh
new file mode 100755
index 000000000..d32106b69
--- /dev/null
+++ b/functions/l10n.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+if [ -x "$(which gettext.sh 2>/dev/null)" ] && Find_files /usr/share/locale/*/LC_MESSAGES/${PACKAGE}.mo
+then
+ _L10N="true"
+
+ # gettext domain (.mo file name)
+ TEXTDOMAIN="${PACKAGE}"
+ export TEXTDOMAIN
+
+ # locale dir for gettext codes
+ TEXTDOMAINDIR="/usr/share/locale"
+ export TEXTDOMAINDIR
+
+ # load gettext functions
+ . gettext.sh
+else
+ _L10N="false"
+fi
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index b3a0ab640..ea551743f 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/losetup.sh b/functions/losetup.sh
index df7e2d27f..fa6cd8373 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/man.sh b/functions/man.sh
index 1551ab266..672ed7bc3 100755
--- a/functions/man.sh
+++ b/functions/man.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -12,7 +12,7 @@ Man ()
{
if [ -x "$(which man 2>/dev/null)" ]
then
- man $(basename ${0})
+ man lh_$(basename ${0})
exit 0
fi
}
diff --git a/functions/packages.sh b/functions/packages.sh
index 5df87cc91..20d53df61 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/packageslists.sh b/functions/packageslists.sh
index 1d6c68142..94f016fbf 100755
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/releases.sh b/functions/releases.sh
index 07894f487..cb5fca77f 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -22,4 +22,3 @@ RELEASE_jaunty="9.04"
RELEASE_karmic="9.10"
RELEASE_lucid="10.04" # LTS
RELEASE_maverick="10.10"
-RELEASE_natty="11.04"
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index b3b4dd9d6..504b6234a 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/templates.sh b/functions/templates.sh
index 65125c09e..d365ccda2 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/usage.sh b/functions/usage.sh
index bc9b2544d..ef82babee 100755
--- a/functions/usage.sh
+++ b/functions/usage.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
diff --git a/functions/version.sh b/functions/version.sh
index 581ac5631..9c1fcbf18 100755
--- a/functions/version.sh
+++ b/functions/version.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
@@ -13,7 +13,7 @@ Version ()
Echo "%s, version %s" "${PROGRAM}" "${VERSION}"
Echo "This program is a part of %s" "${PACKAGE}"
echo
- Echo "Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>"
+ Echo "Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>"
echo
Echo "This program is free software: you can redistribute it and/or modify"
Echo "it under the terms of the GNU General Public License as published by"
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index dbcba8256..3b8a67232 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -1,7 +1,7 @@
#!/bin/sh
## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
##
## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it