Releasing debian version 3.0.13-1.

diff --git a/VERSION b/VERSION
index 3288121..7bcb2c8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.12-1
+3.0.13-1

diff --git a/debian/changelog b/debian/changelog
index ff5fecf..c24a74b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+live-config (3.0.13-1) unstable; urgency=low
+
+  [ Ben Armstrong ]
+  * Fixing typo in examples/hooks/cat: test for q to quit, thanks to
+    Thanatermesis <thanatermesis@gmail.com>.
+
+  [ Daniel Baumann ]
+  * Allowing to overwrite xorg-driver based on pci-ids automatically via
+    pci-id files in /usr/share/live/config/xserver-xorg.
+  * Fixing roff formating typo in manpage.
+  * Updating manpage for xserver-xorg pci-id based overrides.
+  * Updating German manpage translation.
+  * Correcting unconditional precedence of pci-id based overrides over
+    automatic nvidia configuration in xserver-xorg script.
+
+  [ chals ]
+  * Updating Spanish translation of manpage.
+  * Updating French translation of manpage.
+
+  [ Daniel Baumann ]
+  * Allowing xorg.conf overrides in /usr/share/live/config/xserver-xorg
+    files.
+  * Removing note about apport script being ubuntu only in live-config
+    manpages.
+  * For completeness reasons, also mentioning dpkg-divert in live-config
+    manpage about removing scripts.
+  * Using consistent spelling to match parameter name for the noroot
+    variable.
+  * Assigning internal variables for shortcut options to be reused by
+    local scripts.
+
+  [ chals ]
+  * Updating the Spanish translation of man page.
+  * Updating the French translation of man page.
+
+  [ Daniel Baumann ]
+  * Adding updated Italian manpage translations from skizzhg
+    <skizzhg@gmx.com>.
+  * Updating systemd service file to make it actually work.
+  * Updating systemd service file installation location.
+  * Correcting spelling typo in comment on top-level Makefile on
+    uninstalling backends.
+  * Updating packaging for moved systemd service file location.
+  * Adding dpkg-source local options.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 14:34:45 +0100
+
 live-config (3.0.12-1) unstable; urgency=low
 
   * Allowing to overwrite distribution detection in live-config-update

diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 55aa7c2..e571aa7 100644 (file)
--- 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 25.11.2012 3.0.12\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 30.11.2012 3.0.13\-1 "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 f7672de..b07abc9 100644 (file)
--- 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 2012\-11\-25 3.0.12-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-11\-30 3.0.13-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts

diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 9dd054e..36c8b89 100644 (file)
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 30.11.2012 3.0.13\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-config\fP \- Scripts de configuración del sistema

diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index de9cd6b..4fd1d46 100644 (file)
--- 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 25.11.2012 3.0.12\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 30.11.2012 3.0.13\-1 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système

diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 31abbba..affa343 100644 (file)
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 25.11.2012 3.0.12\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 30.11.2012 3.0.13\-1 "Progetto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Script di configurazione del sistema
@@ -120,10 +120,11 @@ Permette di disabilitare i servizi di sysv tramite update\-rc.d.
 .IP "\fBlive\-config.x\-session\-manager=\fP\fIX_SESSION_MANAGER\fP | \fBx\-session\-manager\fP=\fIX_SESSION_MANAGER\fP" 4
 Permette di impostare x\-session\-manager tramite update\-alternatives.
 .IP "\fBlive\-config.xorg\-driver\fP=\fIDRIVER_XORG\fP | \fBxorg\-driver\fP=\fIDRIVER_XORG\fP" 4
-Allows to set xorg driver instead of autodetecting it. If a PCI ID is
-specified in /usr/share/live/config/xserver\-xorg/\fIDRIVER\fP.ids within the
-live system, \fIDRIVER\fP is enforced for these devices. If both a boot
-parameter and a override is found, the boot parameter takes precedence.
+Permette di impostare il driver per xorg invece di riconoscerlo
+automaticamente. Se un ID PCI viene specificato in
+/usr/share/live/config/xserver\-xorg/\fIDRIVER\fP.ids all'interno del sistema
+live, \fIDRIVER\fP viene applicato a questi device. Se viene trovato sia un
+parametro di boot sia uno imposto, quello di boot ha la precedenza.
 .IP "\fBlive\-config.xorg\-resolution\fP=\fIRISOLUZIONE_XORG\fP | \fBxorg\-resolution\fP=\fIRISOLUZIONE_XORG\fP" 4
 Permette di impostare la risoluzione per xorg invece di riconoscerla
 automaticamente, ad esempio 1024x768.
@@ -266,12 +267,13 @@ richiamati automaticamente durante il boot.
 trovare un esempio in /usr/share/doc/live\-config/examples.
 
 .SS "Rimuovere script config esistenti"
-It is not really possible to remove scripts itself in a sane way yet without
-requiring either to ship a locally modified \fBlive\-config\fP package or using
-dpkg\-divert. However, the same can be achieved by disabling the respective
-scripts through the live\-noconfig mechanism, see above. To avoid to always
-need specifing disabled scripts through the boot parameter, a configuration
-file should be used, see above.
+Non è ancora realmente possibile rimuovere gli script in un modo sensato che
+non richieda di fornire un pacchetto di \fBlive\-config\fP modificato localmente
+o l'uso di dpkg\-divert. Tuttavia la stessa cosa si può ottenere
+disabilitando i rispettivi script tramite il meccanismo di live\-noconfig,
+come spiegato prima. Per evitare di dover specificare ogni volta con
+parametri di boot gli script da disabilitare, usare un file di
+configurazione come mostrato in precedenza.
 .PP
 È consigliato mettere i file di configurazione per il sistema live in un
 pacchetto debian dedicato. Si può trovare un esempio in

diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 2a1a80c..89a80b0 100644 (file)
--- 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 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:22+0100\n"
+"Project-Id-Version: live-config 3.0.13-1\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
-msgstr "25.11.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
-msgstr "3.0.12-1"
+msgid "3.0.13-1"
+msgstr "3.0.13-1"
 
 #. type: TH
 #: en/live-config.7:9

diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index f9c2fa2..4a3ed74 100644 (file)
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:22+0100\n"
+"Project-Id-Version: live-config 3.0.13-1\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\n"
 "PO-Revision-Date: 2012-11-25 12:20+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
-msgstr "25.11.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
-msgstr "3.0.12-1"
+msgid "3.0.13-1"
+msgstr "3.0.13-1"
 
 #. 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 a3bdad1..568df90 100644 (file)
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:22+0100\n"
+"Project-Id-Version: live-config 3.0.13-1\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\n"
 "PO-Revision-Date: 2012-11-25 12:45+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
-msgstr "25.11.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
-msgstr "3.0.12-1"
+msgid "3.0.13-1"
+msgstr "3.0.13-1"
 
 #. type: TH
 #: en/live-config.7:9

diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index 679b99d..f9bdb60 100644 (file)
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:22+0100\n"
+"Project-Id-Version: live-config 3.0.13-1\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\n"
 "PO-Revision-Date: 2012-08-03 17:13+0200\n"
 "Last-Translator: skizzhg <skizzhg@gmx.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
-msgstr "25.11.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
-msgstr "3.0.12-1"
+msgid "3.0.13-1"
+msgstr "3.0.13-1"
 
 #. type: TH
 #: en/live-config.7:9
@@ -454,10 +454,10 @@ msgid ""
 "parameter and a override is found, the boot parameter takes precedence."
 msgstr ""
 "Permette di impostare il driver per xorg invece di riconoscerlo "
-"automaticamente. Se un ID PCI viene specificato in /usr/share/live/"
-"config/xserver-xorg/I<DRIVER>.ids all'interno del sistema live, I<DRIVER> "
-"viene applicato a questi device. Se viene trovato sia un parametro di boot "
-"sia uno imposto, quello di boot ha la precedenza."
+"automaticamente. Se un ID PCI viene specificato in /usr/share/live/config/"
+"xserver-xorg/I<DRIVER>.ids all'interno del sistema live, I<DRIVER> viene "
+"applicato a questi device. Se viene trovato sia un parametro di boot sia uno "
+"imposto, quello di boot ha la precedenza."
 
 #. type: IP
 #: en/live-config.7:75
@@ -1006,11 +1006,11 @@ msgid ""
 msgstr ""
 "Non è ancora realmente possibile rimuovere gli script in un modo sensato che "
 "non richieda di fornire un pacchetto di B<live-config> modificato localmente "
-"o l'uso di dpkg-divert. Tuttavia la stessa cosa si può ottenere disabilitando "
-"i rispettivi script tramite il meccanismo di live-noconfig, come spiegato "
-"prima. Per evitare di dover specificare ogni volta con parametri di boot gli "
-"script da disabilitare, usare un file di configurazione come mostrato in "
-"precedenza."
+"o l'uso di dpkg-divert. Tuttavia la stessa cosa si può ottenere "
+"disabilitando i rispettivi script tramite il meccanismo di live-noconfig, "
+"come spiegato prima. Per evitare di dover specificare ogni volta con "
+"parametri di boot gli script da disabilitare, usare un file di "
+"configurazione come mostrato in precedenza."
 
 #. type: Plain text
 #: en/live-config.7:164

diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index 0edf91e..1881f71 100644 (file)
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.12-1\n"
-"POT-Creation-Date: 2012-11-25 09:22+0100\n"
+"Project-Id-Version: live-config 3.0.13-1\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\n"
 "PO-Revision-Date: 2012-07-28 11:38-0400\n"
 "Last-Translator: Tiago Bortoletto Vaz <tiago@debian.org>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
-msgstr "25-11-2012"
+msgid "2012-11-30"
+msgstr "30-11-2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
-msgstr "3.0.12-1"
+msgid "3.0.13-1"
+msgstr "3.0.13-1"
 
 #. type: TH
 #: en/live-config.7:9

diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 54c5dc1..9ea94e6 100644 (file)
--- 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: 2012-11-25 09:22+0100\n"
+"POT-Creation-Date: 2012-11-30 14:35+0100\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"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-11-25"
+msgid "2012-11-30"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.12-1"
+msgid "3.0.13-1"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index e6a75e1..44bbe77 100644 (file)
--- 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 25\-11\-2012 3.0.12\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 30\-11\-2012 3.0.13\-1 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema