From 0df914e0188d588a3630a715de93c4c74e13021d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 13 Jul 2011 10:30:37 +0200 Subject: [PATCH] Adding upstream version 3.0~a19. --- Makefile | 22 +++++++++++----------- VERSION | 2 +- bin/live-snapshot | 6 +++--- manpages/Makefile | 2 +- manpages/de/live-boot.de.7 | 2 +- manpages/de/live-snapshot.de.1 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/live-snapshot.1 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++++------ manpages/po/de/live-snapshot.1.po | 12 ++++++------ manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/live-snapshot.1.pot | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 138886c..a2ab1b9 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ test: 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: On Debian based systems, checkbashisms can be installed with:"; \ echo "I: apt-get install devscripts"; \ fi @@ -78,7 +78,7 @@ install: uninstall: # Uninstalling executables rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile - rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin + rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin || true rm -rf $(DESTDIR)/usr/share/live-boot @@ -86,18 +86,18 @@ uninstall: rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live* rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share - rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true # Uninstalling docs rm -rf $(DESTDIR)/usr/share/doc/live-boot - 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 + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true + rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true # Uninstalling manpages for MANPAGE in manpages/en/*; \ diff --git a/VERSION b/VERSION index 2b538e2..9ae56c3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a18 +3.0~a19 diff --git a/bin/live-snapshot b/bin/live-snapshot index eccabbc..82addab 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -23,7 +23,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# On Debian systems, the complete text of the GNU General Public License +# The complete text of the GNU General Public License # can be found in /usr/share/common-licenses/GPL-3 file. # declare here two vars from /etc/live.conf because of "set -u" @@ -142,10 +142,10 @@ Version () echo "along with this program; if not, write to the Free Software" echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" echo - echo "On Debian systems, the complete text of the GNU General Public License" + echo "The complete text of the GNU General Public License" echo "can be found in /usr/share/common-licenses/GPL-3 file." echo - echo "Homepage: " + echo "Homepage: " exit 0 } diff --git a/manpages/Makefile b/manpages/Makefile index 444468a..00370bc 100644 --- a/manpages/Makefile +++ b/manpages/Makefile @@ -25,7 +25,7 @@ build: po4a.cfg echo "E: po4a - command not found"; \ 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: On Debian based systems, po4a can be installed with:"; \ echo "I: apt-get install po4a"; \ exit 1; \ fi diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index a73d1ea..e8ec318 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 11.06.2011 3.0~a18 "Debian Live Projekt" +.TH LIVE\-BOOT 7 13.07.2011 3.0~a19 "Debian Live Projekt" .SH NAME \fBlive\-boot\fP \- System Boot Skripte diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1 index b89e20f..2752275 100644 --- a/manpages/de/live-snapshot.de.1 +++ b/manpages/de/live-snapshot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 1 11.06.2011 3.0~a18 "Debian Live Projekt" +.TH LIVE\-BOOT 1 13.07.2011 3.0~a19 "Debian Live Projekt" .SH NAME \fBlive\-snapshot\fP \- simple script to ease persistence usage diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index f331372..4fd5b09 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2011\-06\-11 3.0~a18 "Debian Live Project" +.TH LIVE\-BOOT 7 2011\-07\-13 3.0~a19 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1 index 67cb4e1..953c383 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2011\-06\-11 3.0~a18 "Debian Live Project" +.TH LIVE\-BOOT 1 2011\-07\-13 3.0~a19 "Debian Live Project" .SH NAME \fBlive\-snapshot\fR \- simple script to ease persistence usage diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 7e9fabc..2d6e827 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a18\n" -"POT-Creation-Date: 2011-06-11 11:22+0300\n" +"Project-Id-Version: live-boot 3.0~a19\n" +"POT-Creation-Date: 2011-07-13 10:28+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-06-11" -msgstr "11.06.2011" +msgid "2011-07-13" +msgstr "13.07.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a18" -msgstr "3.0~a18" +msgid "3.0~a19" +msgstr "3.0~a19" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po index d60661b..909a46a 100644 --- a/manpages/po/de/live-snapshot.1.po +++ b/manpages/po/de/live-snapshot.1.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a18\n" -"POT-Creation-Date: 2011-06-11 11:22+0300\n" +"Project-Id-Version: live-boot 3.0~a19\n" +"POT-Creation-Date: 2011-07-13 10:28+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-06-11" -msgstr "11.06.2011" +msgid "2011-07-13" +msgstr "13.07.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a18" -msgstr "3.0~a18" +msgid "3.0~a19" +msgstr "3.0~a19" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 79ff793..f5177bb 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2011-06-11 11:22+0300\n" +"POT-Creation-Date: 2011-07-13 10:28+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-06-11" +msgid "2011-07-13" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a18" +msgid "3.0~a19" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index 3a19931..96ea0b6 100644 --- a/manpages/pot/live-snapshot.1.pot +++ b/manpages/pot/live-snapshot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2011-06-11 11:22+0300\n" +"POT-Creation-Date: 2011-07-13 10:28+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-06-11" +msgid "2011-07-13" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a18" +msgid "3.0~a19" msgstr "" #. type: TH -- 2.1.4