[SCM] live-config branch, upstream, updated. upstream/2.0.4-1-g1205992

Daniel Baumann daniel at debian.org
Mon Sep 6 13:08:45 UTC 2010 

The following commit has been merged in the upstream branch:
commit 1205992dca42f99c75903209bdf7c087d5beb5be
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 15:06:09 2010 +0200

    Adding upstream version 2.0.5.

diff --git a/Makefile b/Makefile
index c54be4e..a67c638 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = de fr pt_BR
 
-SCRIPTS = bin/* scripts/*.sh scripts/config/*
+SCRIPTS = bin/* scripts/*.sh scripts/*/*
 
 all: test build
 
@@ -69,11 +69,18 @@ uninstall:
 	# Uninstalling scripts
 	rm -rf $(DESTDIR)/lib/live/config.sh $(DESTDIR)/lib/live/config
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib/live || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/lib || true
+
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live/config || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib/live || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var/lib || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/var || true
 
 	# Uninstalling docs
 	rm -rf $(DESTDIR)/usr/share/doc/live-config
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
 
 	# Uninstalling manpages
 	for MANPAGE in manpages/en/*; \
@@ -91,8 +98,22 @@ uninstall:
 		done; \
 	done
 
+	for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
+	do \
+		rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
+		rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} || true; \
+	done
+
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+
+	rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
+
 clean:
+	@echo "Nothing to clean."
 
-distclean:
+distclean: clean
+	@echo "Nothing to distclean."
 
 reinstall: uninstall install
diff --git a/VERSION b/VERSION
index 2165f8f..e010258 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.4
+2.0.5
diff --git a/examples/live-config-foobar/debian/control b/examples/live-config-foobar/debian/control
index e1a05be..93899cd 100644
--- a/examples/live-config-foobar/debian/control
+++ b/examples/live-config-foobar/debian/control
@@ -3,7 +3,7 @@ Section: misc
 Priority: optional
 Maintainer: John Doe <john at example.org>
 Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.example.org/foobar/
 Vcs-Browser: http://git.example.org/?p=live-config-foobar.git
 Vcs-Git: git://git.example.org/git/live-config-foobar.git
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index d9e523c..5e25d7b 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.09.2010 2.0.4 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 06.09.2010 2.0.5 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 03197d2..e6216f0 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-CONFIG 7 2010\-09\-02 2.0.4 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-09\-06 2.0.5 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index 98cf1b9..04e659b 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 02.09.2010 2.0.4 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 06.09.2010 2.0.5 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index acde056..c058644 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0.4\n"
-"POT-Creation-Date: 2010-09-02 22:33+0300\n"
+"Project-Id-Version: live-config 2.0.5\n"
+"POT-Creation-Date: 2010-09-06 15:04+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-02"
-msgstr "02.09.2010"
+msgid "2010-09-06"
+msgstr "06.09.2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.4"
-msgstr "2.0.4"
+msgid "2.0.5"
+msgstr "2.0.5"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index ceea9f4..84577e6 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0.4\n"
-"POT-Creation-Date: 2010-09-02 22:33+0300\n"
+"Project-Id-Version: live-config 2.0.5\n"
+"POT-Creation-Date: 2010-09-06 15:04+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-02"
-msgstr "02.09.2010"
+msgid "2010-09-06"
+msgstr "06.09.2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.4"
-msgstr "2.0.4"
+msgid "2.0.5"
+msgstr "2.0.5"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 5364a1e..0580f48 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 2.0.4\n"
-"POT-Creation-Date: 2010-09-02 22:33+0300\n"
+"Project-Id-Version: live-config 2.0.5\n"
+"POT-Creation-Date: 2010-09-06 15:04+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-02"
-msgstr "02-09-2010"
+msgid "2010-09-06"
+msgstr "06-09-2010"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.4"
-msgstr "2.0.4"
+msgid "2.0.5"
+msgstr "2.0.5"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 705a049..3fc3295 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-09-02 22:33+0300\n"
+"POT-Creation-Date: 2010-09-06 15:04+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2010-09-02"
+msgid "2010-09-06"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2.0.4"
+msgid "2.0.5"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 3e57d6b..697feb2 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 02\-09\-2010 2.0.4 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 06\-09\-2010 2.0.5 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/001-hostname b/scripts/config/001-hostname
index 80f41cb..872f6a3 100755
--- a/scripts/config/001-hostname
+++ b/scripts/config/001-hostname
@@ -37,16 +37,12 @@ Configure_hostname ()
 	then
 
 cat > /etc/hosts << EOF
-127.0.0.1 localhost
-127.0.1.1 ${LIVE_HOSTNAME}
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
+127.0.0.1       localhost ${LIVE_HOSTNAME}
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
 EOF
 
 	fi
diff --git a/scripts/config/106-kaboom b/scripts/config/106-kaboom
index 4ddde63..6c011d3 100755
--- a/scripts/config/106-kaboom
+++ b/scripts/config/106-kaboom
@@ -24,8 +24,7 @@ Kaboom ()
 
 Configure_kaboom ()
 {
-	mkdir -p /home/${LIVE_USERNAME}/.local
-	touch /home/${LIVE_USERNAME}/.local/kaboom
+	sudo -u "${LIVE_USERNAME}" sh -c "mkdir -p /home/${LIVE_USERNAME}/.local && touch /home/${LIVE_USERNAME}/.local/kaboom"
 
 	# Creating state file
 	touch /var/lib/live/config/kaboom
diff --git a/scripts/config/117-xserver-xorg b/scripts/config/117-xserver-xorg
index 8493925..ffdc789 100755
--- a/scripts/config/117-xserver-xorg
+++ b/scripts/config/117-xserver-xorg
@@ -75,7 +75,7 @@ Configure_xserver_xorg ()
 		debconf-set-selections < /tmp/debconf.live
 		rm -f /tmp/debconf.live
 
-		dpkg-reconfigure -f non-interactive -p critical \
+		dpkg-reconfigure -f noninteractive -p critical \
 			xserver-xorg 2>&1 \
 			| grep -v "overwriting possibly-customised configuration" \
 			| grep -v "file; backup in /etc/X11/xorg.conf" || true

-- 
live-config

More information about the debian-live-changes mailing list