Adding upstream version 2.0.0.

diff --git a/Makefile b/Makefile
index 915f864..d38a949 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ install:
        cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
        mkdir -p $(DESTDIR)/usr/share/live-boot
-       cp bin/live-preseed bin/live-reconfigure contrib/languagelist $(DESTDIR)/usr/share/live-boot
+       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
 
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools
        cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
@@ -56,7 +56,7 @@ install:
        cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
 
        mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
-       cp -r conf/* $(DESTDIR)/usr/share/doc/live-boot/examples
+       cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
        # (FIXME)
 
        # Installing manpages

diff --git a/VERSION b/VERSION
index 9e45139..227cea2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a16
+2.0.0

diff --git a/docs/AUTHORS b/docs/AUTHORS
deleted file mode 100644 (file)
index 79bc320..0000000
--- a/docs/AUTHORS
+++ /dev/null
@@ -1,16 +0,0 @@
-Main Authors:
-
-  * Daniel Baumann <daniel@debian.org>
-
-Main Contributors:
-
-  * Chris Lamb <chris@chris-lamb.co.uk>
-  * Marco Amadori <marco.amadori@gmail.com>
-
-Original Authors:
-
-  live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>.
-  casper was originally written by Tollef Fog Heen <tfheen@canonical.com>
-  and Matt Zimmerman <mdz@canonical.com>.
-
-  See the casper changelog for casper contributors.

diff --git a/docs/CREDITS b/docs/old/CREDITS
similarity index 100%
rename from docs/CREDITS
rename to docs/old/CREDITS

diff --git a/docs/parameters.txt b/docs/old/parameters.txt
similarity index 100%
rename from docs/parameters.txt
rename to docs/old/parameters.txt

diff --git a/conf/live-persistence.binds b/etc/live-persistence.binds
similarity index 100%
rename from conf/live-persistence.binds
rename to etc/live-persistence.binds

diff --git a/conf/live-snapshot.exclude_list b/etc/live-snapshot.exclude_list
similarity index 100%
rename from conf/live-snapshot.exclude_list
rename to etc/live-snapshot.exclude_list

diff --git a/conf/live-snapshot.list b/etc/live-snapshot.list
similarity index 100%
rename from conf/live-snapshot.list
rename to etc/live-snapshot.list

diff --git a/contrib/languagelist b/local/languagelist
similarity index 91%
rename from contrib/languagelist
rename to local/languagelist
index bf15b46..cd973ed 100644 (file)
--- a/contrib/languagelist
+++ b/local/languagelist
@@ -50,6 +50,7 @@ ja;Japanese;日本語;3;JP;ja_JP.UTF-8;;
 #X ks;Kashmiri;कोशुर;4;IN;ks_IN;;
 kk;Kazakh;Қазақ;2;KZ;kk_KZ.UTF-8;;console-setup
 km;Khmer;ខ្មែរ;4;KH;km_KH;;
+kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;;
 ko;Korean;한국어;3;KR;ko_KR.UTF-8;;
 ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;console-setup
 #X ky;Kirghiz;Кыргызча;2;KG;ky_KG;;console-setup
@@ -58,7 +59,7 @@ lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;console-setup
 lt;Lithuanian;Lietuviškai;2;LT;lt_LT.UTF-8;;console-setup
 #X mg;Malagasy;Malagasy;1;MG;mg_MG.UTF-8;mg_MG:fr_FR:fr:en;console-setup
 #X ms;Malay;Bahasa Malaysia;1;MY;ms_MY.UTF-8;;console-setup
-ml;Malayalam;മലയാളഠ;4;IN;ml_IN;;
+ml;Malayalam;മലയാളà´\82;4;IN;ml_IN;;
 mr;Marathi;मराठी;4;IN;mr_IN;;
 mk;Macedonian;Македонски;2;MK;mk_MK.UTF-8;;console-setup
 ne;Nepali;नेपाली ;4;NP;ne_NP;;
@@ -68,7 +69,7 @@ ne;Nepali;नेपाली ;4;NP;ne_NP;;
 se_NO;Northern Sami;Sámegillii;1;NO;se_NO.UTF-8;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
 nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
 nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en;console-setup
-#X fa;Persian;فارسی;3;IR;fa_IR;;console-setup
+fa;Persian;فارسی;3;IR;fa_IR;;console-setup
 pl;Polish;Polski;2;PL;pl_PL.UTF-8;;console-setup
 pt;Portuguese;Português;1;PT;pt_PT.UTF-8;pt:pt_BR:en;console-setup
 pt_BR;Portuguese (Brazil);Português do Brasil;1;BR;pt_BR.UTF-8;pt_BR:pt:en;console-setup
@@ -77,20 +78,21 @@ ro;Romanian;Română;2;RO;ro_RO.UTF-8;;console-setup
 ru;Russian;Русский;2;RU;ru_RU.UTF-8;;console-setup
 #X sa;Sanskrit;संस्कृत;4;IN;sa_IN;;
 #X si;Sinhala;සිංහල;4;IN;si_IN;;
-sr;Serbian;Српски;2;RS;sr_RS;;console-setup
+sr;Serbian (Cyrillic);Српски;2;RS;sr_RS;;console-setup
+sr@latin;Serbian (Latin);Srpski;2;RS;sr_RS@latin;;console-setup
 sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;console-setup
 sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;console-setup
 es;Spanish;Español;1;ES;es_ES.UTF-8;;console-setup
 sv;Swedish;Svenska;1;SE;sv_SE.UTF-8;;console-setup
 tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;console-setup
 ta;Tamil;தமிழ்;4;IN;ta_IN;;
-#X te;Telugu;తెలుగు;4;IN;te_IN;;
-th;Thai;ภาษาไทย;4;TH;th_TH.UTF-8;;console-setup
+te;Telugu;తెలుగు;4;IN;te_IN;;
+th;Thai;ภาษาไทย;3;TH;th_TH.UTF-8;;console-setup
 tr;Turkish;Türkçe;2;TR;tr_TR.UTF-8;;console-setup
 uk;Ukrainian;Українська;2;UA;uk_UA.UTF-8;;console-setup
 #X ur;Urdu;اردو;3;PK;ur_PK.UTF-8;;console-setup
 #X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;ca_ES.UTF-8@valencia;;console-setup
 vi;Vietnamese;Tiếng Việt;3;VN;vi_VN;;console-setup
-cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;console-setup
-wo;Wolof;Wolof;2;SN;wo_SN;wo:fr:en;
+#X cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;console-setup
+#X wo;Wolof;Wolof;2;SN;wo_SN;wo:fr:en;
 #X xh;Xhosa;Xhosa;2;ZA;xh_ZA.UTF-8;;console-setup

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index bc9f3ed..ad87ec1 100644 (file)
--- 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 28.07.2010 2.0~a16 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 10.08.2010 2.0.0 "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 26fcf91..c71c530 100644 (file)
--- 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 28.07.2010 2.0~a16 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 10.08.2010 2.0.0 "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 78418e3..b1a31c5 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-07\-28 2.0~a16 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-08\-10 2.0.0 "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 497dd5d..c5a47b3 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-07\-28 2.0~a16 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-08\-10 2.0.0 "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 9828577..eeb82af 100644 (file)
--- 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 2.0~a16\n"
-"POT-Creation-Date: 2010-07-28 20:17+0300\n"
+"Project-Id-Version: live-boot 2.0.0\n"
+"POT-Creation-Date: 2010-08-10 01:48+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\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 "2010-07-28"
-msgstr "28.07.2010"
+msgid "2010-08-10"
+msgstr "10.08.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a16"
-msgstr "2.0~a16"
+msgid "2.0.0"
+msgstr "2.0.0"
 
 #. 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 a8e4bb0..fdf2222 100644 (file)
--- 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 2.0~a16\n"
-"POT-Creation-Date: 2010-07-28 20:17+0300\n"
+"Project-Id-Version: live-boot 2.0.0\n"
+"POT-Creation-Date: 2010-08-10 01:48+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\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 "2010-07-28"
-msgstr "28.07.2010"
+msgid "2010-08-10"
+msgstr "10.08.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a16"
-msgstr "2.0~a16"
+msgid "2.0.0"
+msgstr "2.0.0"
 
 #. 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 e21b522..659b6ac 100644 (file)
--- 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: 2010-07-28 20:17+0300\n"
+"POT-Creation-Date: 2010-08-10 01:48+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-07-28"
+msgid "2010-08-10"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a16"
+msgid "2.0.0"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 3ac93d7..b48810c 100644 (file)
--- 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: 2010-07-28 20:17+0300\n"
+"POT-Creation-Date: 2010-08-10 01:48+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-07-28"
+msgid "2010-08-10"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a16"
+msgid "2.0.0"
 msgstr ""
 
 #. type: TH