[SCM] Debian Live build scripts branch, master, updated. 1.0.2-4-18-gcfe027e

[Daniel Baumann]

The following commit has been merged in the master branch:
commit cfe027eecb402f6990ed4fd9bd75d84d29944623
Author: Cyril Brulebois <cyril.brulebois at kerlabs.com>
Date:   Fri Jan 23 13:00:21 2009 +0100

    Get rid of MIRROR_BOOTSTRAP_SECURITY in documentation.
    
    Both --mirror-bootstrap-security and MIRROR_BOOTSTRAP_SECURITY are long
    gone, see: c6fa0ca0421a5353348ed8a16c56e3481ae12129.

diff --git a/debian/cron.daily b/debian/cron.daily
index ddee567..a146f09 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -52,7 +52,7 @@ do
 				echo "Begin: $(date -R)" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				lh_config -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
+				lh_config -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS}
 				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: $(date -R)" >> "${TEMPDIR}"/debian-live/log.txt
@@ -93,7 +93,7 @@ do
 				echo "Begin: $(date -R)" > "${TEMPDIR}"/debian-live/log.txt
 
 				# Generating images
-				lh_config -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
+				lh_config -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS}
 				lh_build >> "${TEMPDIR}"/debian-live/log.txt 2>&1
 
 				echo "End: $(date -R)" >> "${TEMPDIR}"/debian-live/log.txt
diff --git a/debian/default b/debian/default
index 8b17d5a..b2ed78f 100644
--- a/debian/default
+++ b/debian/default
@@ -11,7 +11,6 @@ OPTIONS="--binary-indices disabled"
 ARCHITECTURES="$(dpkg --print-architecture)"
 DISTRIBUTIONS="sid"
 MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
 MIRROR_BINARY="http://ftp.debian.org/debian/"
 MIRROR_BINARY_SECURITY="http://security.debian.org/"
 PACKAGES_LISTS="standard rescue gnome-desktop kde-desktop xfce-desktop"
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index 22d1fd4..085bbfa 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -122,8 +122,6 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-mirror\-binary\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-bootstrap\-security\fR \fIURL\fR]
-.br
 	[\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
 .br
 	[\fB\-\-mirror\-chroot\fR \fIURL\fR]
diff --git a/manpages/po4a/de/lh_config.en.1.po b/manpages/po4a/de/lh_config.en.1.po
index 7fe48b1..aa7d7d6 100644
--- a/manpages/po4a/de/lh_config.en.1.po
+++ b/manpages/po4a/de/lh_config.en.1.po
@@ -428,11 +428,6 @@ msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 # type: Plain text
-#: lh_config.en.1:118
-msgid "  [B<--mirror-bootstrap-security> I<URL>]"
-msgstr ""
-
-# type: Plain text
 #: lh_config.en.1:120
 msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
 msgstr ""
@@ -898,12 +893,6 @@ msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 # type: IP
-#: lh_config.en.1:235
-#, no-wrap
-msgid "B<--mirror-bootstrap-security> I<URL>"
-msgstr ""
-
-# type: IP
 #: lh_config.en.1:236
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"
diff --git a/manpages/po4a/fr/lh_config.en.1.po b/manpages/po4a/fr/lh_config.en.1.po
index f6e822c..5318182 100644
--- a/manpages/po4a/fr/lh_config.en.1.po
+++ b/manpages/po4a/fr/lh_config.en.1.po
@@ -437,11 +437,6 @@ msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 # type: Plain text
-#: lh_config.en.1:118
-msgid "  [B<--mirror-bootstrap-security> I<URL>]"
-msgstr ""
-
-# type: Plain text
 #: lh_config.en.1:120
 msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
 msgstr ""
@@ -907,12 +902,6 @@ msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 # type: IP
-#: lh_config.en.1:235
-#, no-wrap
-msgid "B<--mirror-bootstrap-security> I<URL>"
-msgstr ""
-
-# type: IP
 #: lh_config.en.1:236
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"
diff --git a/manpages/po4a/pot/lh_config.en.1.pot b/manpages/po4a/pot/lh_config.en.1.pot
index e65ebf9..a819e09 100644
--- a/manpages/po4a/pot/lh_config.en.1.pot
+++ b/manpages/po4a/pot/lh_config.en.1.pot
@@ -428,11 +428,6 @@ msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 # type: Plain text
-#: lh_config.en.1:118
-msgid "  [B<--mirror-bootstrap-security> I<URL>]"
-msgstr ""
-
-# type: Plain text
 #: lh_config.en.1:120
 msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
 msgstr ""
@@ -898,12 +893,6 @@ msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 # type: IP
-#: lh_config.en.1:235
-#, no-wrap
-msgid "B<--mirror-bootstrap-security> I<URL>"
-msgstr ""
-
-# type: IP
 #: lh_config.en.1:236
 #, no-wrap
 msgid "B<--mirror-bootstrap> I<URL>"

-- 
Debian Live build scripts