[SCM] live-config branch, upstream, updated. upstream/2.0_a12-1-gc825976
Daniel Baumann
daniel at debian.org
Thu Jul 15 17:30:10 UTC 2010
The following commit has been merged in the upstream branch:
commit c825976f7a065a92b43e729f28e2ff383839633b
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jul 15 19:26:39 2010 +0200
Adding upstream version 2.0~a13.
diff --git a/Makefile b/Makefile
index 0b87f18..5420f27 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,24 @@ test:
@echo " done."
- @echo -n "Checking for bashisms"
-
- @if [ -x /usr/bin/checkbashisms ]; \
+ @if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
then \
- for SCRIPT in $(SCRIPTS); \
- do \
- checkbashisms -f -x $${SCRIPT}; \
- echo -n "."; \
- done; \
- else \
- echo "WARNING: skipping bashism test - you need to install devscripts."; \
+ echo "W: checkbashisms - command not found"; \
+ echo "I: checkbashisms can be optained from: "; \
+ echo "I: http://git.debian.org/?p=devscripts/devscripts.git"; \
+ echo "I: On Debian systems, checkbashisms can be installed with:"; \
+ echo "I: apt-get install devscripts"; \
+ exit 0; \
fi
+ @echo -n "Checking for bashisms"
+
+ @for SCRIPT in $(SCRIPTS); \
+ do \
+ checkbashisms -f -x $${SCRIPT}; \
+ echo -n "."; \
+ done
+
@echo " done."
build:
diff --git a/VERSION b/VERSION
index 41bc97f..eddafe4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a12
+2.0~a13
diff --git a/bin/update-live-config.sh b/bin/update-live-config.sh
index 75a4ee6..78766ad 100755
--- a/bin/update-live-config.sh
+++ b/bin/update-live-config.sh
@@ -33,7 +33,7 @@ case "${DISTRIBUTION}" in
# Removing lenny legacy scripts
rm -f "${DIRECTORY}"/*-console-common
rm -f "${DIRECTORY}"/*-console-setup
- rm -f "${DIRECTORY}"/*-gdm
+ #rm -f "${DIRECTORY}"/*-gdm
rm -f "${DIRECTORY}"/*-kpersonalizer
;;
esac
diff --git a/manpages/Makefile b/manpages/Makefile
index d8ec81a..68b5e31 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -23,18 +23,19 @@ build: po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
- echo "I: On Debian systems, po4a can be installed with 'apt-get install po4a'."; \
+ echo "I: po4a can be optained from:"; \
+ echo "I: http://po4a.alioth.debian.org/"; \
+ echo "I: On Debian systems, po4a can be installed with:"; \
+ echo "I: apt-get install po4a"; \
exit 1; \
fi
po4a --keep 0 --no-backups --package-name live-config po4a.cfg
clean:
- rm -f po/*/*.po~
+ rm -rf $(LANGUAGES)
distclean: clean
rm -f po4a.cfg
- rm -rf $(LANGUAGES)
rebuild: distclean update build
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 19bc543..7d3e193 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 07.07.2010 2.0~a12 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 15.07.2010 2.0~a13 "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 77707ba..0a9ad27 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\-07\-07 2.0~a12 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-07\-15 2.0~a13 "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 ab05fae..374ae2e 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 2010\-07\-07 2.0~a12 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 2010\-07\-15 2.0~a13 "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 10ad0ae..af35a90 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~a12\n"
-"POT-Creation-Date: 2010-07-07 20:19+0300\n"
+"Project-Id-Version: live-config 2.0~a13\n"
+"POT-Creation-Date: 2010-07-15 19:24+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-07-07"
-msgstr "07.07.2010"
+msgid "2010-07-15"
+msgstr "15.07.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a12"
-msgstr "2.0~a12"
+msgid "2.0~a13"
+msgstr "2.0~a13"
#. 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 32e432a..28339ad 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0~a11\n"
-"POT-Creation-Date: 2010-07-07 20:19+0300\n"
+"POT-Creation-Date: 2010-07-15 19:24+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"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#: en/live-config.7:9
#, fuzzy, no-wrap
#| msgid "2010-06-20"
-msgid "2010-07-07"
+msgid "2010-07-15"
msgstr "20.06.2010"
#. type: TH
#: en/live-config.7:9
#, fuzzy, no-wrap
#| msgid "2.0~a11"
-msgid "2.0~a12"
+msgid "2.0~a13"
msgstr "2.0~a11"
#. type: TH
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index f33999d..3fce14e 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-07-07 20:19+0300\n"
+"POT-Creation-Date: 2010-07-15 19:24+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"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-07-07"
+msgid "2010-07-15"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0~a12"
+msgid "2.0~a13"
msgstr ""
#. type: TH
--
live-config
More information about the debian-live-changes
mailing list