r13 - in vdr/vdr-xxv/trunk/debian: . patches
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 20 Feb 2005 19:19:28 +0100
Author: tiber-guest
Date: 2005-02-20 19:19:27 +0100 (Sun, 20 Feb 2005)
New Revision: 13
Removed:
vdr/vdr-xxv/trunk/debian/manpage.sgml
vdr/vdr-xxv/trunk/debian/patches/02_opt-mplayer.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/init
vdr/vdr-xxv/trunk/debian/install
vdr/vdr-xxv/trunk/debian/patches/00list
vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch
Log:
new upstream release
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-02-20 18:19:27 UTC (rev 13)
@@ -1,7 +1,15 @@
+vdr-xxv (0.17f-1) unstable; urgency=low
+
+ * (NOT RELEASED YET)
+
+ * New upstream release
+ * Removed 01_opt-mplayer (fixed in upstream)
+ * New binary is now xxvd, not xxvd.pl (fixed in upstream)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 20 Feb 2005 15:40:33 +0100
+
vdr-xxv (0.17e-1) unstable; urgency=low
- !!! Unreleased !!!
-
* Tobias Grimm <tg@e-tobi.net>
- New upstream release
- Renamed package to vdr-xxv
Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/init 2005-02-20 18:19:27 UTC (rev 13)
@@ -17,7 +17,7 @@
# xxvd binary and description:
#
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/xxvd.pl
+DAEMON=/usr/bin/xxvd
NAME=xxv
DESC="XXV - Xtreme eXtension for VDR"
Modified: vdr/vdr-xxv/trunk/debian/install
===================================================================
--- vdr/vdr-xxv/trunk/debian/install 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/install 2005-02-20 18:19:27 UTC (rev 13)
@@ -1,6 +1,6 @@
debian/debconf/ usr/share/vdr-xxv/
-bin/xxvd.pl usr/bin/
+bin/xxvd usr/bin/
html/* usr/share/vdr-xxv/html/default
lib/Tools.pm usr/share/perl5/vdr-xxv/
Deleted: vdr/vdr-xxv/trunk/debian/manpage.sgml
===================================================================
--- vdr/vdr-xxv/trunk/debian/manpage.sgml 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/manpage.sgml 2005-02-20 18:19:27 UTC (rev 13)
@@ -1,179 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
- less'. A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
- docbook-to-man $< > $@
-
-
- The docbook-to-man binary is found in the docbook-to-man package.
- Please remember that if you create the nroff version in one of the
- debian/rules file targets (such as build), you will need to include
- docbook-to-man in your Build-Depends control field.
-
- -->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Tobias</firstname>">
- <!ENTITY dhsurname "<surname>Grimm</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>Februar 19, 2005</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>tg@e-tobi.net</email>">
- <!ENTITY dhusername "Tobias Grimm">
- <!ENTITY dhucpackage "<refentrytitle>XXV</refentrytitle>">
- <!ENTITY dhpackage "vdr-xxv">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2005</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>provides a central service to administer VDR</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
-
- <command>xxvd.pl</command>
- <arg><option>-configfile=</option><replaceable>FILE</replaceable></arg>
- <arg><option>-logfile=</option><replaceable>FILE</replaceable></arg>
- <arg><option>-pidfile=</option><replaceable>FILE</replaceable></arg>
- <arg><option>-localedir=</option><replaceable>DIR</replaceable></arg>
- <arg><option>-moduledir=</option><replaceable>DIR</replaceable></arg>
- <arg><option>-docudir=</option><replaceable>DIR</replaceable></arg>
- <arg><option>-htmldir=</option><replaceable>DIR</replaceable></arg>
- <arg><option>-kill</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para>This manual page was written for the &debian; distribution
- because the original program does not have a manual page.</para>
-
- <para><command>&dhpackage;</command> runs as a daemon and provides a
- central service to administer VDR, similar to VDRAdmin. Extendable by
- plugins, XXV provides a http daemon, a telnet server and a WAP server.
- It allows to manage timers, auto timers, channels, recordings and much
- more.</para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
- <varlistentry>
- <term>-configfile <replaceable class="parameter">FILE</replaceable></term>
- <listitem>
- <para>Use <filename>FILE</filename> as config file for XXV.
- The config file is modified by XXV, so it shall not be read-only.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-logfile <replaceable class="parameter">FILE</replaceable></term>
- <listitem>
- <para>Output all log messages to <filename>FILE</filename></para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-pidfile <replaceable class="parameter">FILE</replaceable></term>
- <listitem>
- <para>Write process id of xxvd daemon to <filename>FILE</filename></para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-localedir <replaceable class="parameter">DIR</replaceable></term>
- <listitem>
- <para>Search for locales in <filename>DIR</filename>.
- <filename>DIR</filename> should contain the typical locales structure
- with XXV's translations. (eg. de/LC_MESSAGES/xxv.mo)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-moduledir <replaceable class="parameter">DIR</replaceable></term>
- <listitem>
- <para>Search for modules (plugins) in <filename>DIR</filename>.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-docudir <replaceable class="parameter">DIR</replaceable></term>
- <listitem>
- <para>Generate the documentation fils in <filename>DIR</filename>.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-htmldir <replaceable class="parameter">DIR</replaceable></term>
- <listitem>
- <para>XXV searches for it's html templates in <filename>DIR</filename>.
- Each subdirectory in <filename>DIR</filename> is seen as a set of
- templates (Skin).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>-kill</term>
- <listitem>
- <para>Kills the xxvd daemon.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; &dhemail; for
- the &debian; system (but may be used by others). Permission is
- granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 2 any
- later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2005-02-20 18:19:27 UTC (rev 13)
@@ -1,2 +1 @@
01_libpath
-02_opt-mplayer
Modified: vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch 2005-02-20 18:19:27 UTC (rev 13)
@@ -5,9 +5,9 @@
## DP: Set correct lib path
@DPATCH@
-diff -urNad xxv/bin/xxvd.pl /tmp/dpep.CEDz1t/xxv/bin/xxvd.pl
---- xxv/bin/xxvd.pl 2005-02-09 21:39:46.000000000 +0100
-+++ /tmp/dpep.CEDz1t/xxv/bin/xxvd.pl 2005-02-19 09:37:53.000000000 +0100
+diff -urNad xxv/bin/xxvd /tmp/dpep.CEDz1t/xxv/bin/xxvd
+--- xxv/bin/xxvd 2005-02-09 21:39:46.000000000 +0100
++++ /tmp/dpep.CEDz1t/xxv/bin/xxvd 2005-02-19 09:37:53.000000000 +0100
@@ -5,7 +5,7 @@
use FindBin qw($RealBin);
Deleted: vdr/vdr-xxv/trunk/debian/patches/02_opt-mplayer.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_opt-mplayer.dpatch 2005-02-20 17:50:25 UTC (rev 12)
+++ vdr/vdr-xxv/trunk/debian/patches/02_opt-mplayer.dpatch 2005-02-20 18:19:27 UTC (rev 13)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_opt-mplayer.dpatch by Tobias Grimm <tg@e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make mplayer optional
-
-@DPATCH@
-diff -urNad xxv/lib/XXV/MODULES/RECORDS.pm /tmp/dpep.MmRWWX/xxv/lib/XXV/MODULES/RECORDS.pm
---- xxv/lib/XXV/MODULES/RECORDS.pm 2005-02-18 02:59:49.000000000 +0100
-+++ /tmp/dpep.MmRWWX/xxv/lib/XXV/MODULES/RECORDS.pm 2005-02-18 23:03:38.000000000 +0100
-@@ -52,6 +52,7 @@
- description => gettext('Please choose the version from you mplayer'),
- type => 'list',
- choices => [
-+ ['No MPlayer' , 'No MPlayer'],
- ['MPlayer1.0pre5', 'MPlayer1.0pre5'],
- ['MPlayer1.0pre6', 'MPlayer1.0pre6']
- ],
-@@ -411,6 +412,10 @@
- my $event = shift || return error ('No EventHash!');
- my $info = shift || return error ('No InfoHash!');
-
-+ if ($obj->{mplayercommand} eq 'No MPlayer') {
-+ return ();
-+ }
-+
- # Videodir
- # my $vdir = $1 if($info->{files}->[0] =~ /(.+)\//g);
- my $vdir = dirname($info->{files}->[0]) || return warn $info->{files}->[0];