Adding debian version 4.0~a1-1.debian/4.0_a1-1

7 files changed, 25 insertions, 38 deletions

diff --git a/examples/auto/build b/examples/auto/build
index f8d834623..6d559e8cf 100755
--- a/examples/auto/build
+++ b/examples/auto/build
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-set -e
-
 lb build noauto "${@}" 2>&1 | tee build.log
diff --git a/examples/auto/clean b/examples/auto/clean
index 69874ee68..3e2403257 100755
--- a/examples/auto/clean
+++ b/examples/auto/clean
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 lb clean noauto "${@}"
 
 rm -f config/binary config/bootstrap config/chroot config/common config/source
diff --git a/examples/auto/config b/examples/auto/config
index c6d68c649..f64db292d 100755
--- a/examples/auto/config
+++ b/examples/auto/config
@@ -1,6 +1,4 @@
 #!/bin/sh
 
-set -e
-
 lb config noauto \
 	"${@}"
diff --git a/examples/gitignore b/examples/gitignore
deleted file mode 100644
index dbf1c2392..000000000
--- a/examples/gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-binary/
-binary*.iso
-binary*.img
-binary*.tar*
-binary*.contents
-binary*.packages
-binary*.zsync
-
-.build/
-build.log
-
-cache/
-
-chroot/
-chroot.packages.*
-
-config/binary
-config/bootstrap
-config/chroot
-config/common
-config/source
-
-source/
-source*.iso
-source*.img
-source*.tar*
-source*.contents
-source*.packages
-source*.zsync
diff --git a/examples/hooks/minimal.chroot b/examples/hooks/minimal.chroot
index 5a9a8d648..70af0dd40 100755
--- a/examples/hooks/minimal.chroot
+++ b/examples/hooks/minimal.chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/examples/hooks/stripped.chroot b/examples/hooks/stripped.chroot
index 9ebe5bc12..fe3f6cacb 100755
--- a/examples/hooks/stripped.chroot
+++ b/examples/hooks/stripped.chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -31,7 +31,7 @@ done
 apt-get autoremove --yes || true
 
 # Removing unused files
-find . -name *~ -print0 | xargs -0 rm -f
+find . -name *~ | xargs rm -f
 
 rm -rf /usr/include/*
 #rm -rf /usr/share/groff/*
diff --git a/examples/hooks/symlinks.chroot b/examples/hooks/symlinks.chroot
new file mode 100755
index 000000000..b0f2eea47
--- /dev/null
+++ b/examples/hooks/symlinks.chroot
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This is a hook for live-build(7) to install localepurge.
+# To enable it, copy or symlink this hook into your config/chroot_local-hooks
+# directory.
+#
+
+_PURGE=""
+
+if [ ! -x "$(which symlinks 2>/dev/null)" ]
+then
+	_PURGE="true"
+
+	apt-get install symlinks
+fi
+
+symlinks -c -r -s /
+
+if [ "${_PURGE}" = "true" ]
+then
+	apt-get remove --purge symlinks
+fi