[vdr] 03/03: Default video directory is now /var/lib/video because multiple video directories are not supported anymore
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sun Feb 22 10:47:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr.
commit 588ff1c80001c56dc7c270da4337ad2a04d0fe8c
Author: etobi <git at e-tobi.net>
Date: Sun Feb 22 10:44:00 2015 +0100
Default video directory is now /var/lib/video because multiple video directories are not supported anymore
---
debian/README.Debian | 2 +-
debian/changelog | 2 ++
debian/config-loader.sh | 2 +-
debian/po/cs.po | 8 ++++----
debian/po/da.po | 8 ++++----
debian/po/de.po | 8 ++++----
debian/po/es.po | 8 ++++----
debian/po/fr.po | 8 ++++----
debian/po/gl.po | 8 ++++----
debian/po/it.po | 8 ++++----
debian/po/ja.po | 8 ++++----
debian/po/nl.po | 8 ++++----
debian/po/pt.po | 8 ++++----
debian/po/ru.po | 8 ++++----
debian/po/sv.po | 8 ++++----
debian/po/templates.pot | 4 ++--
debian/vdr.NEWS | 13 +++++++++++++
debian/vdr.config | 4 ++--
debian/vdr.postinst | 35 ++++++++++++++++++-----------------
debian/vdr.templates | 4 ++--
20 files changed, 89 insertions(+), 73 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 17eadf3..2cb7906 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -124,7 +124,7 @@ VFAT=<0|1>
VIDEO_DIR="<VIDEODIR>"
- Default: "/var/lib/video.00"
+ Default: "/var/lib/video"
The video directory where vdr recordings will be stored.
diff --git a/debian/changelog b/debian/changelog
index c85533d..f84f5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ vdr (2.2.0-1) UNRELEASED; urgency=medium
* New upstream release
* Dropped upgrade code for pre-Squeeze releases
+ * Default video directory is now /var/lib/video because multiple video
+ directories are not supported anymore
-- Tobias Grimm <etobi at debian.org> Thu, 19 Feb 2015 12:18:30 +0100
diff --git a/debian/config-loader.sh b/debian/config-loader.sh
index 8565db6..3d3b301 100644
--- a/debian/config-loader.sh
+++ b/debian/config-loader.sh
@@ -49,7 +49,7 @@ ENABLE_CORE_DUMPS=0
ENABLE_SHUTDOWN=0
# Video-Directory
-VIDEO_DIR="/var/lib/video.00"
+VIDEO_DIR="/var/lib/video"
# Set this to load only startable plugins (check with "vdr -V -P plugin")
PLUGIN_CHECK_STARTABLE="yes"
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8c9cd07..9f33c25 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -62,17 +62,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Vytvo�it /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Vytvo�it /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Implicitn� je VDR nastaveno pro ukl�d�n� nahr�vek do /var/lib/video.00. "
+"Implicitn� je VDR nastaveno pro ukl�d�n� nahr�vek do /var/lib/video. "
"Tento adres�� se nyn� m��e vytvo�it automaticky. Jeho um�st�n� m��ete "
"pozd�ji upravit zm�nou prom�nn� VIDEO_DIR v souboru /etc/default/vdr."
diff --git a/debian/po/da.po b/debian/po/da.po
index d4cf7ca..888729d 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -54,18 +54,18 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Opret /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Opret /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Som standard er VDR konfigureret til at bruge /var/lib/video.00 til at gemme "
+"Som standard er VDR konfigureret til at bruge /var/lib/video til at gemme "
"optagelser. Du kan enten oprette denne mappe nu, eller ændre denne opførsel "
"senere ved at ændre variablen VIDEO_DIR i /etc/default/vdr."
diff --git a/debian/po/de.po b/debian/po/de.po
index d0054a8..98c28fd 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -65,18 +65,18 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Soll /var/lib/video.00 erstellt werden?"
+msgid "Create /var/lib/video?"
+msgstr "Soll /var/lib/video erstellt werden?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Standardmäßig ist VDR so konfiguriert, dass Aufnahmen in /var/lib/video.00 "
+"Standardmäßig ist VDR so konfiguriert, dass Aufnahmen in /var/lib/video "
"gespeichert werden. Sie können dieses Verzeichnis entweder jetzt erstellen, "
"oder diese Konfiguration später ändern, indem Sie die Variable VIDEO_DIR in /"
"etc/default/vdr anpassen."
diff --git a/debian/po/es.po b/debian/po/es.po
index e209c58..0796f86 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -82,17 +82,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "¿Desea crear «/var/lib/video.00»?"
+msgid "Create /var/lib/video?"
+msgstr "¿Desea crear «/var/lib/video»?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"VDR se configura por omisión para utilizar «/var/lib/video.00» para almacenar "
+"VDR se configura por omisión para utilizar «/var/lib/video» para almacenar "
"las grabaciones. Puede crear ahora este directorio, o cambiar más tarde este "
"comportamiento modificando la variable VIDEO_DIR en «/etc/default/vdr»."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 03ae2b3..9b97333 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -65,18 +65,18 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Cr�er le r�pertoire /var/lib/video.00�?"
+msgid "Create /var/lib/video?"
+msgstr "Cr�er le r�pertoire /var/lib/video�?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
"Par d�faut, VDR sauvegarde les enregistrements dans le r�pertoire /var/lib/"
-"video.00. Vous pouvez changer ce r�pertoire en modifiant la variable "
+"video. Vous pouvez changer ce r�pertoire en modifiant la variable "
"VIDEO_DIR dans le fichier /etc/default/vdr, ou cr�er ce r�pertoire "
"maintenant."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 7d764f3..f0384b4 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -54,18 +54,18 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "¿Crear /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "¿Crear /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Por defecto, VDR está configurado para empregar /var/lib/video.00 para "
+"Por defecto, VDR está configurado para empregar /var/lib/video para "
"armacenar as gravacións. Pode crear este directorio agora, ou cambiar este "
"comportamento máis adiante modificando a variable VIDEO_DIR en /etc/default/"
"vdr."
diff --git a/debian/po/it.po b/debian/po/it.po
index 2e7c173..3ccaeb9 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -55,17 +55,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Creare /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Creare /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Con la configurazione predefinita, VDR usa /var/lib/video.00 per memorizzare "
+"Con la configurazione predefinita, VDR usa /var/lib/video per memorizzare "
"le registrazioni. È possibile creare questa directory adesso oppure cambiare "
"questo comportamento modificando la variabile VIDEO_DIR in /etc/default/vdr."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 69c8796..66a99d2 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -53,17 +53,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "/var/lib/video.00 を作成しますか?"
+msgid "Create /var/lib/video?"
+msgstr "/var/lib/video を作成しますか?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"デフォルトでは VDR は録画を保存するのに /var/lib/video.00 を使うように設定さ"
+"デフォルトでは VDR は録画を保存するのに /var/lib/video を使うように設定さ"
"れています。このディレクトリをすぐに作成する、あるいは後ほど /etc/default/"
"vdr 内の VIDEO_DIR 変数の設定にて、保存するディレクトリの指定を変更できます。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index dfc1421..3e94804 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -61,17 +61,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "/var/lib/video.00 aanmaken?"
+msgid "Create /var/lib/video?"
+msgstr "/var/lib/video aanmaken?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Standaard is VDR geconfigureerd om /var/lib/video.00 te gebruiken om opnames "
+"Standaard is VDR geconfigureerd om /var/lib/video te gebruiken om opnames "
"te bewaren. U kunt deze map nu aanmaken of dit gedrag later wijzigen door de "
"VIDEO_DIR-variabele aan te passen in /etc/default/vdr."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index f14c632..a545370 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -55,18 +55,18 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Criar /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Criar /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Por omissão o VDR é configurado para usar o /var/lib/video.00 para guardar "
+"Por omissão o VDR é configurado para usar o /var/lib/video para guardar "
"as gravações. Poderá tanto criar agora este directório, ou modificar este "
"comportamento mais tarde modificando a variável VIDEO_DIR em /etc/default/"
"vdr."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 2321c28..e259405 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -57,17 +57,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Создать /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Создать /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"По умолчанию для хранения записей VDR использует /var/lib/video.00. Вы "
+"По умолчанию для хранения записей VDR использует /var/lib/video. Вы "
"можете создать этот каталог сейчас, или изменить эту настройку позже, "
"отредактировав значение переменной VIDEO_DIR в /etc/default/vdr."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index ae91772..87becda 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -61,17 +61,17 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
-msgstr "Skapa /var/lib/video.00?"
+msgid "Create /var/lib/video?"
+msgstr "Skapa /var/lib/video?"
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
-"Som standard �r VDR konfigurerad att anv�nda /var/lib/video.00 f�r att lagra "
+"Som standard �r VDR konfigurerad att anv�nda /var/lib/video f�r att lagra "
"inspelningar. Du kan antingen skapa denna mapp nu eller �ndra detta senare "
"genom att modifiera variabeln VIDEO_DIR i /etc/default/vdr."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4cf6d04..bc76b34 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -52,14 +52,14 @@ msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
-msgid "Create /var/lib/video.00?"
+msgid "Create /var/lib/video?"
msgstr ""
#. Type: boolean
#. Description
#: ../vdr.templates:2001
msgid ""
-"By default VDR is configured to use /var/lib/video.00 to store recordings. "
+"By default VDR is configured to use /var/lib/video to store recordings. "
"You can either create this directory now, or change this behavior later by "
"modifying the VIDEO_DIR variable in /etc/default/vdr."
msgstr ""
diff --git a/debian/vdr.NEWS b/debian/vdr.NEWS
index 7d868d1..7ea518b 100644
--- a/debian/vdr.NEWS
+++ b/debian/vdr.NEWS
@@ -1,3 +1,16 @@
+vdr (2.2.0-1) unstable; urgency=low
+
+ * Support for multiple video directories dropped
+
+ The code for distributing recordings over several video directories has been
+ removed. VDR now by default assumes that the video directory is one big disk.
+ It is recommended to use e.g. mhddfs or LVM to combine multiple volumes.
+
+ The default video directory for VDR now is /var/lib/video. This can be changed
+ by modifying the VIDEO_DIR variable in /etc/default/vdr.
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 19 Feb 2015 12:18:30 +0100
+
vdr (1.7.17-1) unstable; urgency=low
* Changed Full Featured DVB card support
diff --git a/debian/vdr.config b/debian/vdr.config
index 1e00131..882eb85 100644
--- a/debian/vdr.config
+++ b/debian/vdr.config
@@ -5,8 +5,8 @@ set -e
# source debconf lib
. /usr/share/debconf/confmodule
-# ask about creating /var/lib/video.00
-if [ ! -e /var/lib/video.00 ]; then
+# ask about creating /var/lib/video
+if [ ! -e /var/lib/video -a ! -L /var/lib/video ]; then
db_input high vdr/create_video_dir || true
db_go
fi
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index ac72c94..8a4961c 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -26,6 +26,23 @@ set -e
# source debconf lib
#. /usr/share/debconf/confmodule
+
+#
+# Create /var/lib/video if /var/lib/video does not exist.
+# If /var/lib/video.00 exists, /var/lib/video will become a symlink
+#
+TryCreateVideoDir() {
+ if [ ! -e /var/lib/video -a ! -L /var/lib/video ]; then
+ if [ -e /var/lib/video.00 ]; then
+ # No /var/lib/video but /var/lib/video.00 -> Make video a symlink pointing to video.00
+ ln -s video.00 /var/lib/video
+ else
+ # create /var/lib/video
+ mkdir /var/lib/video
+ fi
+ fi
+}
+
case "$1" in
configure)
@@ -53,23 +70,7 @@ case "$1" in
db_get vdr/create_video_dir
if $RET; then
- # check if an old directory /var/lib/video exists, and
- # symlink it to /var/lib/video.00
- if [ -d /var/lib/video ] && [ ! -e /var/lib/video.00 ]; then
- ln -s video /var/lib/video.00
- fi
-
- # create /var/lib/video.00 if it does not exist
- if [ ! -e /var/lib/video.00 ]; then
- mkdir /var/lib/video.00
- fi
-
- # check if /var/lib/video.00 exists and /var/lib/video is
- # missing, then create the symlink /var/lib/video which
- # points to /var/lib/video.00
- if [ ! -e /var/lib/video ] && [ -e /var/lib/video.00 ]; then
- ln -s video.00 /var/lib/video
- fi
+ TryCreateVideoDir
fi
# ensure that user and group 'vdr' exist
diff --git a/debian/vdr.templates b/debian/vdr.templates
index 31e5195..a3ada3c 100644
--- a/debian/vdr.templates
+++ b/debian/vdr.templates
@@ -10,7 +10,7 @@ _Description: DVB card type:
Template: vdr/create_video_dir
Type: boolean
Default: false
-_Description: Create /var/lib/video.00?
- By default VDR is configured to use /var/lib/video.00 to store recordings.
+_Description: Create /var/lib/video?
+ By default VDR is configured to use /var/lib/video to store recordings.
You can either create this directory now, or change this behavior later
by modifying the VIDEO_DIR variable in /etc/default/vdr.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list