r8323 - in /vdr/vdr/trunk/debian: .vdr-patches changelog patches/00list patches/00list.multipatch patches/99_dvb-header-fixes.dpatch patches/99_vdr-workaround-broken-sys-capability.dpatch po/ja.po

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Thu Jan 14 23:13:26 2010
New Revision: 8323

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8323
Log:
* Removed 99_dvb-header-fixes.dpatch
* Added 99_vdr-workaround-broken-sys-capability.dpatch
* Added Japanese debconf translation (Closes: #555546)

Added:
    vdr/vdr/trunk/debian/patches/99_vdr-workaround-broken-sys-capability.dpatch
    vdr/vdr/trunk/debian/po/ja.po
Removed:
    vdr/vdr/trunk/debian/patches/99_dvb-header-fixes.dpatch
Modified:
    vdr/vdr/trunk/debian/.vdr-patches
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/patches/00list
    vdr/vdr/trunk/debian/patches/00list.multipatch

Modified: vdr/vdr/trunk/debian/.vdr-patches
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/.vdr-patches?rev=8323&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/.vdr-patches (original)
+++ vdr/vdr/trunk/debian/.vdr-patches Thu Jan 14 23:13:26 2010
@@ -4,7 +4,7 @@
 debian/patches/20_gcc44_ftbfs.dpatch:310f84b8c27541f3ecec0ce416c21a73
 debian/patches/10_dd-record-option.dpatch:58c3a3dbcd9a3ec4b0ee1814f71d1e88
 debian/patches/11_sortrecordings.dpatch:9ed4cd1e144ee59dab34d4df4aa9af51
-debian/patches/99_dvb-header-fixes.dpatch:ef5dae99f9ce2566d72a393c84e66741
+debian/patches/99_vdr-workaround-broken-sys-capability.dpatch:19d9edf94b745d972761cbcec9f442f2
 debian/patches/19_dvb-api-v5.dpatch:6714266c10537521d2440cfa4d50b3f0
 debian/patches/04_newplugin.dpatch:e99f8d21734a19b3eb93d9e3f11b680a
 debian/patches/14_cap-memsize.dpatch:7beb9bcecb1bdce4a03c1729acfbbdb3

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=8323&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Thu Jan 14 23:13:26 2010
@@ -1,3 +1,14 @@
+vdr (1.6.0-14) unstable; urgency=low
+
+  [ Thomas Günther ]
+  * Removed 99_dvb-header-fixes.dpatch
+  * Added 99_vdr-workaround-broken-sys-capability.dpatch
+
+  [ Tobias Grimm ]
+  * Added Japanese debconf translation (Closes: #555546)
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 15 Jan 2010 00:13:07 +0100
+
 vdr (1.6.0-13) unstable; urgency=low
 
   * New upstream homepage http://www.tvdr.de/

Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=8323&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Thu Jan 14 23:13:26 2010
@@ -16,8 +16,8 @@
 81_Make_config
 82_valgrind
 
-99_dvb-header-fixes
 99_ncursesw-include
+99_vdr-workaround-broken-sys-capability
 
 # Patch collection (replaces enAIO).
 # opt-20_liemikuutio

Modified: vdr/vdr/trunk/debian/patches/00list.multipatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list.multipatch?rev=8323&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list.multipatch (original)
+++ vdr/vdr/trunk/debian/patches/00list.multipatch Thu Jan 14 23:13:26 2010
@@ -16,8 +16,8 @@
 81_Make_config
 82_valgrind
 
-99_dvb-header-fixes
 99_ncursesw-include
+99_vdr-workaround-broken-sys-capability
 
 # Patch collection (replaces enAIO).
 opt-20_liemikuutio

Added: vdr/vdr/trunk/debian/patches/99_vdr-workaround-broken-sys-capability.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/99_vdr-workaround-broken-sys-capability.dpatch?rev=8323&op=file
==============================================================================
--- vdr/vdr/trunk/debian/patches/99_vdr-workaround-broken-sys-capability.dpatch (added)
+++ vdr/vdr/trunk/debian/patches/99_vdr-workaround-broken-sys-capability.dpatch Thu Jan 14 23:13:26 2010
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run 
+## 99_vdr-workaround-broken-sys-capability.dpatch by Anssi Hannula <anssi.hannula at gmail.com>
+## http://www.linuxtv.org/pipermail/vdr/2009-August/021196.html
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This is a workaround for some trouble with the kernel headers
+## DP: in Linux 2.6.29.
+## DP: See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523424
+
+ at DPATCH@
+Index: vdr-1.7.9/vdr.c
+===================================================================
+--- vdr-1.7.9/vdr.c
++++ vdr-1.7.9/vdr.c	2009-08-23 23:26:15.935332431 +0300
+@@ -32,7 +32,6 @@
+ #include <pwd.h>
+ #include <signal.h>
+ #include <stdlib.h>
+-#include <sys/capability.h>
+ #include <sys/prctl.h>
+ #include <termios.h>
+ #include <unistd.h>
+@@ -64,6 +63,9 @@
+ #include "tools.h"
+ #include "transfer.h"
+ #include "videodir.h"
++// include this one last due to some versions of it being buggy:
++// http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
++#include <sys/capability.h>
+ 
+ #define MINCHANNELWAIT        10 // seconds to wait between failed channel switchings
+ #define ACTIVITYTIMEOUT       60 // seconds before starting housekeeping

Added: vdr/vdr/trunk/debian/po/ja.po
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/po/ja.po?rev=8323&op=file
==============================================================================
--- vdr/vdr/trunk/debian/po/ja.po (added)
+++ vdr/vdr/trunk/debian/po/ja.po Thu Jan 14 23:13:26 2010
@@ -1,0 +1,58 @@
+# Japanese translation of vdr debconf templates.
+# Copyright (C) 2009 Hideki Yamane <henrich at debian.or.jp>
+# This file is distributed under the same license as vdr package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0-12\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2009-04-02 14:42+0200\n"
+"PO-Revision-Date: 2009-10-29 06:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite, Terrestrial, Cable"
+msgstr "衛星放送, 地上デジタル放送, ケーブル放送"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB カードの種類:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr.  You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR は正常に動作するために DVB カードの種類を知っているå¿
要があります。"
+"ここでの選択をå
ƒã«ã—て、/var/lib/vdr に channels.conf ファイルがインストール"
+"されます。設定によってはこのファイルを変更するå¿
要があるかもしれません。"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video.00?"
+msgstr "/var/lib/video.00 を作成しますか?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video.00 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 を使うように設定さ"
+"れています。このディレクトリをすぐに作成する、あるいは後ほど /etc/default/vdr "
+"å†
の VIDEO_DIR 変数の設定にて、保存するディレクトリの指定を変更できます。"
+