[SCM] debian-live/live-helper branch, master, updated. 1.0_a35-1-2-ge2e653c
Daniel Baumann
daniel at debian.org
Sun Nov 11 09:16:22 UTC 2007
The branch, master has been updated
via e2e653c198c762fb68974095f247158f4b46157e (commit)
via f65b8300169d85a4a83c8ea66423837ccc434183 (commit)
from 0a0d546e94c1b07d45c50a7e312168bfb3f87a22 (commit)
- Shortlog ------------------------------------------------------------
e2e653c Fixing trap call as suggested by Justin Pryzby <jpryzby at quoininc.com> (Closes: #431160, #449087).
f65b830 Preparing live-helper 1.0~a36-1.
Summary of changes:
Makefile | 6 +++---
debian/changelog | 6 ++++++
functions/common.sh | 2 +-
functions/lockfile.sh | 2 +-
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, 33 insertions(+), 27 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit e2e653c198c762fb68974095f247158f4b46157e
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Nov 11 10:15:51 2007 +0100
Fixing trap call as suggested by Justin Pryzby <jpryzby at quoininc.com> (Closes: #431160, #449087).
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index 1850308..189d0c2 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -30,7 +30,7 @@ Create_lockfile ()
mkdir -p "${DIRECTORY}"
# Creating lock trap
- trap "test -f ${FILE} && rm -f ${FILE}; exit 0" 0 1 2 3 9 15
+ trap 'ret=${?}; '"rm -f \"${FILE}\";"' exit ${ret}' EXIT
# Creating lock file
touch "${FILE}"
commit f65b8300169d85a4a83c8ea66423837ccc434183
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Nov 11 10:11:57 2007 +0100
Preparing live-helper 1.0~a36-1.
diff --git a/Makefile b/Makefile
index d4f63aa..b65bc96 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,9 @@ uninstall:
update:
set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \
do \
- sed -i -e 's/2007\\-11\\-05/2007\\-11\\-12/' \
- -e 's/05.11.2007/12.11.2007/' \
- -e 's/1.0~a35/1.0~a36/' \
+ 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/' \
$$FILE; \
done
diff --git a/debian/changelog b/debian/changelog
index f757742..b15947b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a36-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 12 Nov 2007 00:00:00 +0200
+
live-helper (1.0~a35-1) unstable; urgency=medium
[ Daniel Baumann ]
diff --git a/functions/common.sh b/functions/common.sh
index 623c882..1b80202 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="$(basename ${0})"
-VERSION="1.0~a35"
+VERSION="1.0~a36"
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index b6078f3..f566894 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_BINARY 1 "12.11.2007" "1.0~a36" "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 2c44c02..d1896d1 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_BINARY 1 "2007\-11\-12" "1.0~a36" "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 c94d040..b57dc67 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP 1 "12.11.2007" "1.0~a36" "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 d21c43c..55c606e 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "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 e94b1e7..9a027f3 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "12.11.2007" "1.0~a36" "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 8ef8222..c0b6da8 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\-05" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "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 abbd70a..b1188f4 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "12.11.2007" "1.0~a36" "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 b298a00..5aa0a42 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\-05" "1.0~a35" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-11\-12" "1.0~a36" "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 7085606..57d4a7b 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_BUILD 1 "12.11.2007" "1.0~a36" "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 bf5e4da..59cb2e3 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_BUILD 1 "2007\-11\-12" "1.0~a36" "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 9ff55a0..7af5f75 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_CHROOT 1 "12.11.2007" "1.0~a36" "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 1e13c93..1ecde7b 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_CHROOT 1 "2007\-11\-12" "1.0~a36" "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 39d59d4..741764a 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_CLEAN 1 "12.11.2007" "1.0~a36" "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 a771c13..eae459b 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_CLEAN 1 "2007\-11\-12" "1.0~a36" "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 242d743..a623326 100644
--- a/manpages/lh_config.de.1
+++ b/manpages/lh_config.de.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_CONFIG 1 "12.11.2007" "1.0~a36" "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 a4b163a..9b9b9fd 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_CONFIG 1 "2007\-11\-12" "1.0~a36" "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 d4e9430..2a981d8 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_SOURCE 1 "12.11.2007" "1.0~a36" "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 44d75fa..911043b 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_SOURCE 1 "2007\-11\-12" "1.0~a36" "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 703ae32..07d95e2 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LH_TESTROOT 1 "12.11.2007" "1.0~a36" "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 6a3a2d7..13fc223 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-11\-12" "1.0~a36" "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 05814fd..a4e01d9 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "05.11.2007" "1.0~a35" "live\-helper"
+.TH LIVE\-HELPER 7 "12.11.2007" "1.0~a36" "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 0af5959..eefe542 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-11\-05" "1.0~a35" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-11\-12" "1.0~a36" "live\-helper"
.SH NAME
live\-helper \- Debian Live helper programs
--
debian-live/live-helper
More information about the debian-live-changes
mailing list