r3775 - in vdr/vdr-plugin-image/trunk: . debian debian/patches
Tobias Grimm
tiber-guest at alioth.debian.org
Sun Jan 7 01:23:32 CET 2007
Author: tiber-guest
Date: 2007-01-07 01:23:30 +0100 (Sun, 07 Jan 2007)
New Revision: 3775
Added:
vdr/vdr-plugin-image/trunk/debian/
vdr/vdr-plugin-image/trunk/debian/changelog
vdr/vdr-plugin-image/trunk/debian/compat
vdr/vdr-plugin-image/trunk/debian/control
vdr/vdr-plugin-image/trunk/debian/copyright
vdr/vdr-plugin-image/trunk/debian/dirs
vdr/vdr-plugin-image/trunk/debian/docs
vdr/vdr-plugin-image/trunk/debian/examples
vdr/vdr-plugin-image/trunk/debian/imagesources.conf
vdr/vdr-plugin-image/trunk/debian/install
vdr/vdr-plugin-image/trunk/debian/links
vdr/vdr-plugin-image/trunk/debian/patches/
vdr/vdr-plugin-image/trunk/debian/patches/00list
vdr/vdr-plugin-image/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch
vdr/vdr-plugin-image/trunk/debian/plugin.image.conf
vdr/vdr-plugin-image/trunk/debian/postinst
vdr/vdr-plugin-image/trunk/debian/rules
vdr/vdr-plugin-image/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: vdr/vdr-plugin-image/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: vdr/vdr-plugin-image/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/changelog 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,318 @@
+vdr-plugin-image (0.2.6-8) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * Replaced VDRdevel adaptions in debian/rules with make-special-vdr,
+ Build-Depend on vdr-dev (>= 1.4.4-2)
+
+ -- Thomas Günther <tom at toms-cafe.de> Sun, 17 Dec 2006 16:26:59 +0100
+
+vdr-plugin-image (0.2.6-7) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.4-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 5 Nov 2006 11:45:40 +0100
+
+vdr-plugin-image (0.2.6-6) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.3-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 23 Sep 2006 20:32:57 +0200
+
+vdr-plugin-image (0.2.6-5) unstable; urgency=low
+
+ * Build-Depend on vdr-dev (>=1.4.2-1)
+ * Bumped Standards-Version to 3.7.2
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 27 Aug 2006 14:39:32 +0200
+
+vdr-plugin-image (0.2.6-4) unstable; urgency=low
+
+ * Added 01_Makefile-fPIC-fix.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 26 Jul 2006 18:56:27 +0200
+
+vdr-plugin-image (0.2.6-3) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.1-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Fri, 16 Jun 2006 22:02:57 +0200
+
+vdr-plugin-image (0.2.6-2) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Build-Depend on vdr-dev (>=1.4.0-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 3 May 2006 23:07:28 +0200
+
+vdr-plugin-image (0.2.6-1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - New upstream release
+ - Modified debian/watch to use new downloadurlmangle option of uscan
+ - Build-Depend on vdr (>=1.3.48-1)
+ - Removed DVBDIR from debian/rules
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 24 Apr 2006 23:04:40 +0200
+
+vdr-plugin-image (0.2.5-4) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.46-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 12 Apr 2006 22:14:04 +0200
+
+vdr-plugin-image (0.2.5-3) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.45-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 27 Mar 2006 21:16:27 +0200
+
+vdr-plugin-image (0.2.5-2) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr (>=1.3.41-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Tue, 31 Jan 2006 01:28:59 +0100
+
+vdr-plugin-image (0.2.5-1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Build-Depend on vdr-dev (>=1.3.40-1)
+ - libexif-dev (>= 0.6.12)
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ + Updated 01_link_libavcodec.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Wed, 25 Jan 2006 23:51:26 +0100
+
+vdr-plugin-image (0.2.4-2) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.37-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 3 Dec 2005 20:56:25 +0100
+
+vdr-plugin-image (0.2.4-1) unstable; urgency=low
+
+ * Thomas Günther <tom at toms-cafe.de>
+ - New upstream release
+ - Adapted 01_link_libavcodec.dpatch
+ - Removed 02_encode.dpatch
+ - Added Suggests: imagemagick, libjpeg-progs for commands in imagecmds.conf
+ (Thx to wilderigel at vdrportal.de)
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 25 Nov 2005 15:46:14 +0100
+
+vdr-plugin-image (0.2.3-9) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.33-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 2 Oct 2005 10:33:41 +0200
+
+vdr-plugin-image (0.2.3-8) unstable; urgency=low
+
+ * Build-Depend on vdr (>=1.3.32-1)
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 14 Sep 2005 19:17:58 +0200
+
+vdr-plugin-image (0.2.3-7) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.31-1)
+ * Conflict with vdr (>=1.3.31.99)
+ * Use dependencies.sh from vdr-dev to set vdr dependencies and
+ conflicts
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 30 Aug 2005 23:07:02 +0200
+
+vdr-plugin-image (0.2.3-6) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.30-1)
+ * Conflict with vdr (>=1.3.30.99)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 22 Aug 2005 17:28:40 +0200
+
+vdr-plugin-image (0.2.3-5) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.29-1)
+ * Conflict with vdr (>=1.3.30)
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 15 Aug 2005 21:12:21 +0200
+
+vdr-plugin-image (0.2.3-4) unstable; urgency=low
+
+ * Depend/Build-Depend on vdr (>=1.3.28-1)
+ * Conflict with vdr (>=1.3.29)
+ * Bumped Standards-Version to 3.6.2
+ * Updated debian/watch and project homepage
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 8 Aug 2005 20:25:10 +0200
+
+vdr-plugin-image (0.2.3-3) unstable; urgency=low
+
+ * Fixed bug in encode patch
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 17 Jul 2005 21:57:15 +0200
+
+vdr-plugin-image (0.2.3-2) unstable; urgency=low
+
+ * Use statically linked libavcodec from official Debian ffmpeg package
+ * Added patch that rewrites major parts of the encoder to fix some
+ bugs, increase readability and make it compatible with newer ffmpeg
+ versions
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 17 Jul 2005 16:43:11 +0200
+
+vdr-plugin-image (0.2.3-1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - New upstream release
+ - Depend/Build-Depend on vdr (>=1.3.27-1)
+ - Conflict with vdr (>=1.3.28)
+ - Made debian/rules svn-buildpackage-save
+ * Thomas Günther <tom at toms-cafe.de>
+ - Adapted link_libavcodec patch to new upstream
+ - Removed Makefile-fPIC-fix and fix_imagecmds patch (integrated in upstream)
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 26 Jun 2005 17:19:10 +0200
+
+vdr-plugin-image (0.2.2-4) unstable; urgency=low
+
+ * Make sure cache dir is owned by vdr:vdr
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 2 Apr 2005 21:34:24 +0200
+
+vdr-plugin-image (0.2.2-3) unstable; urgency=low
+
+ * Converted changelog to UTF-8
+ * Set CONVERT_TEMPDIR for commands in imagecmds.conf
+ * Adapted patches for new dpatch >= 2.0.9
+ * Using debian/compat now
+
+ -- Thomas Günther <tom at toms-cafe.de> Mon, 6 Dec 2004 01:56:46 +0100
+
+vdr-plugin-image (0.2.2-2) unstable; urgency=low
+
+ * adapted for vdr 1.2.6-27
+ * Added Makefile-fPIC-fix patch to fix potential FTBFS
+ * Adapted control file to alioth packages
+ * Using patchlevel.sh and custom control field "vdr-patchlevel"
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 28 Sep 2004 00:05:00 +0200
+
+vdr-plugin-image (0.2.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 01 Sep 2004 23:40:00 +0200
+
+vdr-plugin-image (0.2.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Tobias Grimm <tg at e-tobi.net> Sat, 29 Aug 2004 13:00:00 +0200
+
+vdr-plugin-image (0.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * added imagecmds.conf
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 1 Aug 2004 21:00:00 +0200
+
+vdr-plugin-image (0.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * ImageMagick not needed anymore
+ * Converted images are not stored under /var/cache anymore by default, but
+ in /tmp/images. Users upgrading from an older version should change
+ this in the plugin settings manually.
+ * Some general improvements to unify the plugins, as suggested by
+ Thomas Günther
+ * Added watch file
+
+ -- Tobias Grimm <tg at e-tobi.net> Mon, 5 Jul 2004 22:55:12 +0200
+
+vdr-plugin-image (0.0.8-1) unstable; urgency=low
+
+ * New upstream release
+ * default image cache path set to /var/cache/vdr-plugin-image
+
+ -- Tobias Grimm <tg at e-tobi.net> Tue, 16 Mar 2004 20:15:00 +0100
+
+vdr-plugin-image (0.0.7+0.0.8rc2-1) unstable; urgency=low
+
+ * New upstream release
+ * removed sharutils dependency, uudecode isn't used anymore
+ * renamed mount.sh to vdrimagemount.sh and installed into /usr/sbin,
+ changed interpreter to /bin/sh and converted some DOS line endings
+ * added plugin.image.conf with comments about the command line options
+ (requires now vdr 1.2.6-14)
+ * changed defaults in imagesources.conf and added comments
+ * renamed convert.sh, convert_jump.sh and convert_zoom-sh to
+ vdrimageconvert.sh, vdrimagejumpconvert.sh and vdrimagezoomconvert.sh
+ * fixed small bug in debian/rules
+ * missing directory /tmp/image added
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 7 Mar 2004 17:54:08 +0100
+
+vdr-plugin-image (0.0.7+0.0.8rc1-1) unstable; urgency=low
+
+ * New upstream release
+ * added sharurils dependency, because convert script uses uudecode
+ now
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 3 Mar 2004 23:14:12 +0100
+
+vdr-plugin-image (0.0.7+0.0.8pre5-1) unstable; urgency=low
+
+ * complete rework of the debianization
+
+ -- Tobias Grimm <tg at e-tobi.net> Thu, 26 Feb 2004 00:30:00 +0200
+
+vdr-plugin-image (0.0.8-pre-5) unstable; urgency=low
+
+ * Added other File-Filterimplemation with more feature
+ see examples/imagesources.conf.example
+
+ -- A.Brachold <vdr04-at-deltab.de> Tue, 23 Feb 2004 23:00:00 +0200
+
+vdr-plugin-image (0.0.8-pre-4) unstable; urgency=low
+
+ * Reworked convert* scripts for better aspect scaling
+ * Started to optionally replace ImageMagick by netpbm tools, check README.SCRIPTS
+ * Cleanup obsolete code from scripts
+ * Added image_pregen.sh to pre generate a file or folder (cron/at/..)
+
+ -- Onno <kreuzinger.biz> Tue, 22 Feb 2004 18:30:00 +0200
+
+vdr-plugin-image (0.0.8-pre-3) unstable; urgency=low
+
+ * Add Filter for filetype (by Onno Kreuzinger)
+ * Implement Interface to Statusmonitor (this use e.g. GLCD-Plugin)
+ * Fix "Error: unknow config paramater ..."
+ * Make the most text translatable
+ * Change setupmenu form Integer 0/1 to yes/no Selection
+ * Remove some old file form mp3-plugins, and reformated the source with indent
+ * Fix Header with correct copyright
+ * Cleanup errorlog (esyslog)
+ * Remove some possible bufferoverflows throw sprint()
+
+ -- A.Brachold <vdr04-at-deltab.de> Tue, 22 Feb 2004 18:00:00 +0200
+
+vdr-plugin-image (0.0.7-1) unstable; urgency=low
+
+ * Reworks on Jumpmenu
+
+ -- Interpohl <vdr-portal.de> Tue, 31 Jan 2004 18:00:00 +0200
+
+vdr-plugin-image (0.0.7-0) unstable; urgency=low
+
+ * Reworks on Jumpmenu
+
+ -- Interpohl <vdr-portal.de> Tue, 30 Jan 2004 22:00:00 +0200
+
+vdr-plugin-image (0.0.6-0) unstable; urgency=low
+
+ * debianized
+
+ -- Interpohl <vdr-portal.de> Tue, 30 Jan 2004 00:45:00 +0200
Added: vdr/vdr-plugin-image/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/compat 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/compat 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-image/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/control 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/control 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,16 @@
+Source: vdr-plugin-image
+Section: misc
+Priority: extra
+Maintainer: Tobias Grimm <tg at e-tobi.net>
+Origin: ctvdr
+Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.4-2), dpatch (>= 2.0.9), libavcodec-dev (>= 0.cvs20050626-2sarge1), libavformat-dev, libexif-dev (>= 0.6.12)
+Standards-Version: 3.7.2
+
+Package: vdr-plugin-image
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}, netpbm, file
+Suggests: imagemagick, libjpeg-progs
+Description: Image plugin for vdr
+ This plugin implements a image viewer for vdr.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-image/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/copyright 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/copyright 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,14 @@
+This package was debianized by Tobias Grimm on Thu, 26 Feb 2004 01:26:00 +0200.
+
+It was downloaded from http://vdr-image.berlios.de/
+
+Upstream Authors:
+ Andreas Brachold <vdr04-at-deltab.de> (maintainer)
+ Kai Tobias Burwieck <kai-at-burwieck.net>
+ "Interpohl" <interpohl-at-vdr-portal.de>
+ Onno Kreuzinger <o.kreuzinger-at-kreuzinger.biz>
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: vdr/vdr-plugin-image/trunk/debian/dirs
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/dirs 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/dirs 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1 @@
+var/cache/vdr-plugin-image
Added: vdr/vdr-plugin-image/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/docs 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/docs 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,3 @@
+README
+LIESMICH
+TODO
Added: vdr/vdr-plugin-image/trunk/debian/examples
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/examples 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/examples 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1 @@
+examples/*.conf
Added: vdr/vdr-plugin-image/trunk/debian/imagesources.conf
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/imagesources.conf 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/imagesources.conf 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,15 @@
+#
+# Syntax is: <path>;<name>;<mount>;<filter>
+#
+# <path> = Path, where to finde images or image directories
+# <name> = descriptor displayed in VDR
+# <mount> = 0 - if no mounting should be done
+# 1 - if <path> needs to be mounted first.
+# (Dont forget to setup fstab !!!)
+# <filter> = filters, what files should be displayed.
+# i.e. *.jpg *.jpeg *.png *.tif* *.bmp
+#
+
+/cdrom;CDROM;1;*.jpg *.jpeg *.png *.tif* *.bmp
+/var/lib/video;VDR Recordings;0;*.pnm
+/mnt/images;Images on the network;0;*.jpg *.jpeg *.png *.tif* *.bmp
Added: vdr/vdr-plugin-image/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/install 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/install 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,7 @@
+libvdr-image.so.* usr/lib/vdr/plugins/
+
+debian/imagesources.conf etc/vdr/plugins/
+debian/plugin.image.conf etc/vdr/plugins/
+examples/imagecmds.conf etc/vdr/plugins/
+
+scripts/*.sh usr/lib/vdr-plugin-image/
Added: vdr/vdr-plugin-image/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/links 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/links 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,2 @@
+etc/vdr/plugins/imagesources.conf var/lib/vdr/plugins/imagesources.conf
+etc/vdr/plugins/imagecmds.conf var/lib/vdr/plugins/imagecmds.conf
Added: vdr/vdr-plugin-image/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/00list 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/patches/00list 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,2 @@
+01_Makefile-fPIC-fix
+01_link_libavcodec
Added: vdr/vdr-plugin-image/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_Makefile-fPIC-fix.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad vdr-plugin-image-0.2.6~/libimage/Makefile vdr-plugin-image-0.2.6/libimage/Makefile
+--- vdr-plugin-image-0.2.6~/libimage/Makefile 2005-09-11 17:51:12.000000000 +0200
++++ vdr-plugin-image-0.2.6/libimage/Makefile 2006-07-26 18:51:46.000000000 +0200
+@@ -8,7 +8,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O0 -g -Wall -Woverloaded-virtual
+
+ -include $(VDRDIR)/Make.config
+
+diff -urNad vdr-plugin-image-0.2.6~/liboutput/Makefile vdr-plugin-image-0.2.6/liboutput/Makefile
+--- vdr-plugin-image-0.2.6~/liboutput/Makefile 2006-01-29 17:04:05.000000000 +0100
++++ vdr-plugin-image-0.2.6/liboutput/Makefile 2006-07-26 18:51:58.000000000 +0200
+@@ -8,7 +8,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O0 -g -Wall -Woverloaded-virtual
+
+ -include $(VDRDIR)/Make.config
+
Property changes on: vdr/vdr-plugin-image/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_link_libavcodec.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Statically link libavcodec
+
+ at DPATCH@
+diff -urNad vdr-plugin-image-0.2.5/Makefile /tmp/dpep.MS1BWe/vdr-plugin-image-0.2.5/Makefile
+--- vdr-plugin-image-0.2.5/Makefile 2006-01-22 11:41:04.528742250 +0100
++++ /tmp/dpep.MS1BWe/vdr-plugin-image-0.2.5/Makefile 2006-01-22 11:43:10.808634250 +0100
+@@ -30,7 +30,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
+
+ ###############################################
+ ###############################################
+@@ -88,16 +88,7 @@
+
+ INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I.
+
+-ifdef FFMDIR
+-INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+-LIBS += -L$(FFMDIR)/libavcodec
+-ifeq ($(LIBAVCODECVERSION),51)
+-LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavutil
+-LIBS += -lavformat -lavutil
+-endif
+-endif
+-
+-LIBS += -lavcodec
++LIBS += `ffmpeg-config --plugin-libs avcodec avformat`
+ LIBS += -lz
+
+ ifdef FFMDIR
Property changes on: vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-image/trunk/debian/plugin.image.conf
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/plugin.image.conf 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/plugin.image.conf 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,12 @@
+#
+# The following command line parameters are supported:
+#
+# -m CMD, --mount=CMD : use CMD to mount/unmount/eject image sources
+# -C CMD, --convert=CMD : use CMD when converting Images
+#
+
+# the following parameters are necessary, because the upstreams default
+# values will not work with the debian package!
+
+-m /usr/lib/vdr-plugin-image/mount.sh
+-C /usr/lib/vdr-plugin-image/imageplugin.sh
Added: vdr/vdr-plugin-image/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/postinst 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/postinst 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postinst script for vdr-plugin-image
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+# source debconf lib
+. /usr/share/debconf/confmodule
+
+case "$1" in
+ configure)
+ # ensure that the cache dir is correctly owned
+ if [ -d /var/cache/vdr-plugin-image ] ; then
+ chown -R vdr:vdr /var/cache/vdr-plugin-image || true
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: vdr/vdr-plugin-image/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/rules 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/rules 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,93 @@
+#! /bin/sh /usr/lib/vdr-dev/make-special-vdr
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all $(MAKE_OPTIONS)
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ /usr/lib/vdr-dev/patchlevel.sh subst
+ /usr/lib/vdr-dev/dependencies.sh
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-image/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: vdr/vdr-plugin-image/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-image/trunk/debian/watch 2007-01-07 00:23:21 UTC (rev 3774)
+++ vdr/vdr-plugin-image/trunk/debian/watch 2007-01-07 00:23:30 UTC (rev 3775)
@@ -0,0 +1,4 @@
+version=3
+opts=downloadurlmangle=s/prdownload/download/ \
+ http://developer.berlios.de/project/showfiles.php?group_id=4286 \
+ .*/vdr-image/vdr-image-(.*)\.tar.gz
More information about the pkg-vdr-dvb-changes
mailing list