r7992 - /vdr/vdr-plugin-webvideo/trunk/debian/

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Thu Nov 5 02:00:49 UTC 2009 

Author: tom-guest
Date: Thu Nov  5 02:00:48 2009
New Revision: 7992

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7992
Log:
* New upstream release
  - Moved the default download directory to /var/lib/webvideo
  - Standards-Version: 3.8.3
* Moved webvid daemon to new package webvid
* Removed non-standard shebang line from debian/rules
* Removed DVBDIR from debian/rules
* Added myself to Uploaders and Debian Maintainers

Added:
    vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.install   (contents, props changed)
      - copied, changed from r7973, vdr/vdr-plugin-webvideo/trunk/debian/install
    vdr/vdr-plugin-webvideo/trunk/debian/webvid.default   (props changed)
      - copied unchanged from r7973, vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.default
    vdr/vdr-plugin-webvideo/trunk/debian/webvid.init   (contents, props changed)
      - copied, changed from r7973, vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.init
    vdr/vdr-plugin-webvideo/trunk/debian/webvid.install   (contents, props changed)
      - copied, changed from r7973, vdr/vdr-plugin-webvideo/trunk/debian/install
    vdr/vdr-plugin-webvideo/trunk/debian/webvid.manpages   (props changed)
      - copied unchanged from r7973, vdr/vdr-plugin-webvideo/trunk/debian/manpages
Removed:
    vdr/vdr-plugin-webvideo/trunk/debian/install
    vdr/vdr-plugin-webvideo/trunk/debian/manpages
    vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.default
    vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.init
Modified:
    vdr/vdr-plugin-webvideo/trunk/debian/changelog
    vdr/vdr-plugin-webvideo/trunk/debian/control
    vdr/vdr-plugin-webvideo/trunk/debian/copyright
    vdr/vdr-plugin-webvideo/trunk/debian/rules
    vdr/vdr-plugin-webvideo/trunk/debian/webvi.1.txt

Modified: vdr/vdr-plugin-webvideo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/changelog?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/changelog Thu Nov  5 02:00:48 2009
@@ -1,3 +1,15 @@
+vdr-plugin-webvideo (0.1.7-1) unstable; urgency=low
+
+  * New upstream release
+    - Moved the default download directory to /var/lib/webvideo
+    - Standards-Version: 3.8.3
+  * Moved webvid daemon to new package webvid
+  * Removed non-standard shebang line from debian/rules
+  * Removed DVBDIR from debian/rules
+  * Added myself to Uploaders and Debian Maintainers
+
+ -- Thomas Günther <tom at toms-cafe.de>  Thu, 05 Nov 2009 02:34:31 +0100
+
 vdr-plugin-webvideo (0.1.3-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-webvideo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/control?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/control (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/control Thu Nov  5 02:00:48 2009
@@ -2,18 +2,27 @@
 Section: video
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-Uploaders: Tobias Grimm <etobi at debian.org>
+Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, txt2man, vdr-dev (>= 1.6.0-5), gettext, libxml2-dev, python-dev, python-central, libglib2.0-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://users.tkk.fi/~aajanki/vdr/webvideo
 XS-Python-Version: current
 
+Package: webvid
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-libxml2, python-libxslt1, python-pycurl, libmms0
+Description: Web video downloader daemon
+ This daemon downloads web pages from certain media sharing websites, such as
+ YouTube or Google Video, and transforms them into an XML-based menu format.
+ It listens for client (VDR plugin or webvi, the command line client)
+ connections in port 2357.
+XB-Python-Version: ${python:Versions}
+
 Package: vdr-plugin-webvideo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, python, python-libxml2, python-libxslt1, python-pycurl, libmms0
-Suggests: libmms0 (>= 0.4-1), python-ctypes, vdr-plugin-mplayer|vdr-plugin-xineliboutput
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}, webvid
+Suggests: vdr-plugin-mplayer | vdr-plugin-xineliboutput
 Description: VDR plugin for downloading videos from the Web
  This plugin for the Linux Video Disc Recorder (VDR) provides ability
  to download video files from popular video sharing websites, such as
  YouTube or Google Video.
-XB-Python-Version: ${python:Versions}

Modified: vdr/vdr-plugin-webvideo/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/copyright?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/copyright Thu Nov  5 02:00:48 2009
@@ -7,13 +7,14 @@
 Debian Maintainers:
     Antti Ajanki <antti.ajanki at iki.fi>
     Tobias Grimm <etobi at debian.org>
+    Thomas Günther <tom at toms-cafe.de>
 
 Copyright:
     (C) 2008, 2009 Antti Ajanki
 
 Copyright (Debian packaging):
     (C) 2008, 2009 Antti Ajanki
-    (C) 2009       Tobias Grimm
+    (C) 2009       Tobias Grimm, Thomas Günther
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-webvideo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/rules?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/rules (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/rules Thu Nov  5 02:00:48 2009
@@ -1,4 +1,4 @@
-#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
+#!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 # include /usr/share/cdbs/1/rules/dpatch.mk
@@ -6,16 +6,24 @@
 DEB_PYTHON_SYSTEM = pycentral
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+# Make sure that we install to /usr, not /usr/local.
+DEB_PYTHON_INSTALL_ARGS_ALL += --prefix usr
+
 DEB_COMPRESS_EXCLUDE := .py
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-DEB_DH_INSTALLINIT_ARGS = --name=webvid
-
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
                LOCALEDIR=$(CURDIR)/debian/tmp/usr/share/locale
 
 #DEB_DH_STRIP_ARGS = -Xlibvdr-webvideo
+
+# cdbs (< 0.4.53) installs dh_installinit postinst fragment before
+# dh_pycentral fragment which causes the postinst to try to start the
+# daemon before Python modules are correctly set-up.  Suppress the
+# normal dh_installinit run, and execute it manually later in
+# binary-install.
+#DEB_DH_INSTALLINIT_ARGS := -n
 
 TXT2MANPAGES = debian/webvid.1 debian/webvi.1
 
@@ -23,7 +31,9 @@
 	cat $< | grep -v "^###" | \
 	  eval "`cat $< | grep "^### txt2man" | sed "s/### //"`" >$@
 
-common-build-arch:: $(TXT2MANPAGES)
+common-build-indep:: $(TXT2MANPAGES)
+
+common-build-arch::
 	$(MAKE) all $(MAKE_OPTIONS)
 
 cleanbuilddir::
@@ -33,4 +43,3 @@
 
 common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/dependencies.sh
-

Copied: vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.install (from r7973, vdr/vdr-plugin-webvideo/trunk/debian/install)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.install?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/install (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.install Thu Nov  5 02:00:48 2009
@@ -2,4 +2,3 @@
 debian/plugin.webvideo.conf        etc/vdr/plugins/
 debian/tmp/usr/share/locale
 vdr-plugin/mime.types              var/lib/vdr/plugins/webvideo/
-webvidaemon/services/*             usr/share/webvid/

Propchange: vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: vdr/vdr-plugin-webvideo/trunk/debian/webvi.1.txt
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/webvi.1.txt?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/webvi.1.txt (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/webvi.1.txt Thu Nov  5 02:00:48 2009
@@ -27,21 +27,33 @@
 
   Following commands are recognized:
 
-  help       Show help
-  select x   Select a link whose index is x
-  download x Download a media object whose index is x
-  stream x   Play a media object whose index is x
-  back       Go backward in history
-  forward    Go forward in history
-  display    Redisplay the current menu
-  menu       Go back to the main menu
-  quit       Quit the program
+  help        Show help
+  select x    Select a link whose index is x
+  download x  Download a media object whose index is x
+  stream x    Play a media object whose index is x
+  back        Go backward in history
+  forward     Go forward in history
+  display     Redisplay the current menu
+  menu        Go back to the main menu
+  quit        Quit the program
 
   x is an index of a link in the current menu. Entering an index number
   x without any command is a shorthand for "select x".
+
+CONFIG FILE
+  webvi will read the following config files: /etc/webvi.conf and
+  ~/.webvi. The files are in INI format. The following options are
+  recognized in [webvi] section:
+
+  streamplayers1 to streamplayer9  are alternative player commands to be used for streaming videos
+
+  host, port  are the IP address and port of a listening webvid daemon
+
+  daemonpath, daemonargs  define the path to webvid executable and command line arguments that will be used to start the daemon if it is not already running
 
 SEE ALSO
   webvid(1)
 
 AUTHOR
-   This manual page was written by Tobias Grimm <tg at e-tobi.net>.
+   This manual page was written by Tobias Grimm <tg at e-tobi.net> and
+   Antti Ajanki <antti.ajanki at iki.fi>.

Propchange: vdr/vdr-plugin-webvideo/trunk/debian/webvid.default
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: vdr/vdr-plugin-webvideo/trunk/debian/webvid.init (from r7973, vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.init)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/webvid.init?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/vdr-plugin-webvideo.webvid.init (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/webvid.init Thu Nov  5 02:00:48 2009
@@ -23,7 +23,7 @@
 DAEMON=/usr/bin/$NAME
 DAEMON_ARGS="-d -l/tmp/webvid.log"
 PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/vdr-plugin-webvideo
+SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0

Propchange: vdr/vdr-plugin-webvideo/trunk/debian/webvid.init
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: vdr/vdr-plugin-webvideo/trunk/debian/webvid.install (from r7973, vdr/vdr-plugin-webvideo/trunk/debian/install)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-webvideo/trunk/debian/webvid.install?rev=7992&op=diff
==============================================================================
--- vdr/vdr-plugin-webvideo/trunk/debian/install (original)
+++ vdr/vdr-plugin-webvideo/trunk/debian/webvid.install Thu Nov  5 02:00:48 2009
@@ -1,5 +1,4 @@
-vdr-plugin/libvdr-webvideo.so.*    usr/lib/vdr/plugins/
-debian/plugin.webvideo.conf        etc/vdr/plugins/
-debian/tmp/usr/share/locale
-vdr-plugin/mime.types              var/lib/vdr/plugins/webvideo/
 webvidaemon/services/*             usr/share/webvid/
+webvidaemon/*.py                   usr/share/pyshared/webvidaemon/
+debian/tmp/usr/bin
+debian/webvi.conf                  etc/

Propchange: vdr/vdr-plugin-webvideo/trunk/debian/webvid.install
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: vdr/vdr-plugin-webvideo/trunk/debian/webvid.manpages
------------------------------------------------------------------------------
    svn:mergeinfo =

More information about the pkg-vdr-dvb-changes mailing list