r7029 - in /vdr/vdr/trunk/debian: ./ patches/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Jun 14 22:02:04 UTC 2008


Author: tiber-guest
Date: Sat Jun 14 22:02:04 2008
New Revision: 7029

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7029
Log:
Installing the pictures plugin now with vdr-plugin-examples

Added:
    vdr/vdr/trunk/debian/vdr-plugin-examples.examples
Removed:
    vdr/vdr/trunk/debian/patches/01_pic2mpg-debian.dpatch
    vdr/vdr/trunk/debian/pic2mpg.1
    vdr/vdr/trunk/debian/plugin.pictures.conf
    vdr/vdr/trunk/debian/vdr-plugin-examples.links
    vdr/vdr/trunk/debian/vdr-plugin-pictures.docs
    vdr/vdr/trunk/debian/vdr-plugin-pictures.install
    vdr/vdr/trunk/debian/vdr-plugin-pictures.manpages
Modified:
    vdr/vdr/trunk/debian/README.Debian
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/control
    vdr/vdr/trunk/debian/patches/00list
    vdr/vdr/trunk/debian/rules
    vdr/vdr/trunk/debian/vdr-plugin-examples.install

Modified: vdr/vdr/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/README.Debian?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/README.Debian (original)
+++ vdr/vdr/trunk/debian/README.Debian Sat Jun 14 22:02:04 2008
@@ -310,24 +310,3 @@
 create their own customized vdr distribution.
 
  -- Tobias Grimm <tg at e-tobi.net>,  Thu, 3 Jun 2004 02:20:00 +0100
-
-The Pictures Plugin
---------------------
-
-The pictures plugin requires the pictures to be already converted to mpeg files.
-A separate tool called `pic2mpg' is provided to convert a directory of pictures.
-
-This tool will use the mjpegtools package to convert the pictures to MPEG2, if 
-available. mjpegtools is not part of Debian, but is available at
-http://mjpeg.sourceforge.net or in third party repositories like
-http://debian-multimedia.org.
-
-If mjpegtools is not available, ffmpeg will be used to convert the pictures to
-MPEG1 instead.
-
-In order to display the pictures, you must tell the plugin, where to find them.
-You can do so in /etc/vdr/plugins/plugin.pictures.conf.
-
-Please read the documentation in /usr/share/doc/vdr-plugin-pictures/README
-carefully, as the pictures plugin is very restrictive about the picture
-directory layout.

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Sat Jun 14 22:02:04 2008
@@ -1,3 +1,9 @@
+vdr (1.6.0-3) UNRELEASED; urgency=low
+
+  * Installing the pictures plugin now with vdr-plugin-examples
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 14 Jun 2008 15:39:38 +0200
+
 vdr (1.6.0-2) unstable; urgency=low
 
   [ Tobias Grimm ]

Modified: vdr/vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/control?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/control (original)
+++ vdr/vdr/trunk/debian/control Sat Jun 14 22:02:04 2008
@@ -83,20 +83,3 @@
  These plugins do not have useful features, they only demonstrate 
  how vdr-plugins work and what is possible to do with them.
 XB-VDR-Patchlevel: ${vdr:Patchlevel}
-
-Package: vdr-plugin-pictures
-Architecture: any 
-Section: misc
-Depends: ${shlibs:Depends}, vdr (= ${binary:Version}), ${perl:Depends},
- libimage-size-perl, netpbm, mjpegtools | ffmpeg
-Description: Plugin for vdr providing a very basic picture viewer
- Video Disk Recorder (VDR) is a digital sat-receiver program using
- Linux and DVB technologies. It allows one to record MPEG2 streams,
- as well as output the stream to TV.
- .
- This package contains the pictures-plugin, which provides a very
- basic picture viewer. It assumes, that the pictures are converted
- to MPEG frames.
- .
- A separate tool called `pic2mpg' is provided to convert pictures.
-XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/patches/00list?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/patches/00list (original)
+++ vdr/vdr/trunk/debian/patches/00list Sat Jun 14 22:02:04 2008
@@ -1,4 +1,3 @@
-01_pic2mpg-debian
 03_cmdsubmenu
 04_newplugin
 06_default_svdrp_port_0

Modified: vdr/vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/rules?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/rules (original)
+++ vdr/vdr/trunk/debian/rules Sat Jun 14 22:02:04 2008
@@ -95,6 +95,9 @@
 	dh_installdirs
 	dh_install
 	chmod +x $(CURDIR)/debian/vdr/usr/lib/vdr/vdr-*
+	for example in hello osddemo pictures servicedemo skincurses status svdrpdemo; do \
+	    install -D PLUGINS/src/$$example/README $(CURDIR)/debian/vdr-plugin-examples/usr/share/doc/vdr-plugin-examples/README.$$example; \
+	done
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -132,7 +135,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdebconf -a
-	dh_installdocs -a -Nvdr-dbg -Nvdr-plugin-examples
+	dh_installdocs -a -Nvdr-dbg
 	dh_installexamples -a
 	dh_installmenu -a
 #	dh_installlogrotate -a
@@ -146,7 +149,7 @@
 #	dh_undocumented -a
 	dh_installchangelogs -pvdr HISTORY
 	dh_installchangelogs -pvdr-plugin-sky PLUGINS/src/sky/HISTORY
-	dh_installchangelogs -pvdr-plugin-pictures PLUGINS/src/pictures/HISTORY
+	dh_installchangelogs -pvdr-plugin-examples
 	dh_link -a
 	dh_strip -a -Xvdr-dbg
 	dh_compress -a

Added: vdr/vdr/trunk/debian/vdr-plugin-examples.examples
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr-plugin-examples.examples?rev=7029&op=file
==============================================================================
--- vdr/vdr/trunk/debian/vdr-plugin-examples.examples (added)
+++ vdr/vdr/trunk/debian/vdr-plugin-examples.examples Sat Jun 14 22:02:04 2008
@@ -1,0 +1,1 @@
+PLUGINS/src/pictures/pic2mpg

Modified: vdr/vdr/trunk/debian/vdr-plugin-examples.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr-plugin-examples.install?rev=7029&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr-plugin-examples.install (original)
+++ vdr/vdr/trunk/debian/vdr-plugin-examples.install Sat Jun 14 22:02:04 2008
@@ -5,3 +5,4 @@
 PLUGINS/lib/libvdr-skincurses.so.*      usr/lib/vdr/plugins/
 PLUGINS/lib/libvdr-status.so.*          usr/lib/vdr/plugins/
 PLUGINS/lib/libvdr-svdrpdemo.so.*       usr/lib/vdr/plugins/
+PLUGINS/lib/libvdr-pictures.so.*        usr/lib/vdr/plugins/




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