r8409 - in /vdr/vdr-plugin-image/trunk/debian: changelog control copyright install patches/ patches/00list patches/01_fix-PLUGIN-definition.dpatch rules

tom-guest at users.alioth.debian.org tom-guest at users.alioth.debian.org
Mon Mar 1 00:53:25 UTC 2010 

Author: tom-guest
Date: Mon Mar  1 00:53:16 2010
New Revision: 8409

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8409
Log:
* Added 01_fix-PLUGIN-definition.dpatch
* Removed DVBDIR from debian/rules
* Added installation of locale files

Added:
    vdr/vdr-plugin-image/trunk/debian/patches/
    vdr/vdr-plugin-image/trunk/debian/patches/00list
    vdr/vdr-plugin-image/trunk/debian/patches/01_fix-PLUGIN-definition.dpatch
Modified:
    vdr/vdr-plugin-image/trunk/debian/changelog
    vdr/vdr-plugin-image/trunk/debian/control
    vdr/vdr-plugin-image/trunk/debian/copyright
    vdr/vdr-plugin-image/trunk/debian/install
    vdr/vdr-plugin-image/trunk/debian/rules

Modified: vdr/vdr-plugin-image/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/changelog?rev=8409&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-image/trunk/debian/changelog Mon Mar  1 00:53:16 2010
@@ -1,3 +1,11 @@
+vdr-plugin-image (0.3.0-5) experimental; urgency=low
+
+  * Added 01_fix-PLUGIN-definition.dpatch
+  * Removed DVBDIR from debian/rules
+  * Added installation of locale files
+
+ -- Thomas Günther <tom at toms-cafe.de>  Mon, 01 Mar 2010 00:21:47 +0100
+
 vdr-plugin-image (0.3.0-4) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules

Modified: vdr/vdr-plugin-image/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/control?rev=8409&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/control (original)
+++ vdr/vdr-plugin-image/trunk/debian/control Mon Mar  1 00:53:16 2010
@@ -5,7 +5,7 @@
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5), gettext, pkg-config,
  libavcodec-dev, libavformat-dev, libswscale-dev, libavutil-dev,
- liblame-dev | libmp3lame-dev, libexif-dev (>= 0.6.12), libxvidcore-dev
+ liblame-dev | libmp3lame-dev, libexif-dev (>= 0.6.12), libxvidcore-dev, dpatch
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/

Modified: vdr/vdr-plugin-image/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/copyright?rev=8409&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-image/trunk/debian/copyright Mon Mar  1 00:53:16 2010
@@ -18,7 +18,7 @@
 
 Copyright (Debian packaging):
     (C) 2004        Andreas Brachold, "Interpohl", Onno Kreuzinger
-    (C) 2004 - 2009 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2004 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-image/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/install?rev=8409&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/install (original)
+++ vdr/vdr-plugin-image/trunk/debian/install Mon Mar  1 00:53:16 2010
@@ -5,3 +5,5 @@
 examples/imagecmds.conf etc/vdr/plugins/
 
 scripts/*.sh usr/lib/vdr-plugin-image/
+
+debian/tmp/usr/share/locale

Added: vdr/vdr-plugin-image/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/00list?rev=8409&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-image/trunk/debian/patches/00list Mon Mar  1 00:53:16 2010
@@ -1,0 +1,1 @@
+01_fix-PLUGIN-definition

Added: vdr/vdr-plugin-image/trunk/debian/patches/01_fix-PLUGIN-definition.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/01_fix-PLUGIN-definition.dpatch?rev=8409&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/01_fix-PLUGIN-definition.dpatch (added)
+++ vdr/vdr-plugin-image/trunk/debian/patches/01_fix-PLUGIN-definition.dpatch Mon Mar  1 00:53:16 2010
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix-PLUGIN-definition.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with VDR >= 1.7.13.
+
+ at DPATCH@
+--- image-0.3.0/Makefile
++++ image-0.3.0/Makefile
+@@ -20,6 +20,12 @@
+ #FFMDIR = ../../../../ffmpeg
+ 
+ 
++# The official name of this plugin.
++# This name will be used in the '-P...' option of VDR to load the plugin.
++# By default the main source file also carries this name.
++#
++PLUGIN = image
++
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+@@ -44,12 +50,6 @@
+ 
+ -include $(VDRDIR)/Make.config
+ 
+-# The official name of this plugin.
+-# This name will be used in the '-P...' option of VDR to load the plugin.
+-# By default the main source file also carries this name.
+-#
+-PLUGIN = image
+-
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+@@ -182,7 +182,7 @@
+ 	@for i in $(SUBDIRS) ;\
+ 	do \
+ 	    ( cd $$i;\
+-              $(MAKE) all;\
++              $(MAKE) all PLUGIN=$(PLUGIN);\
+        ) \
+ 	|| exit 1;\
+ 	done

Modified: vdr/vdr-plugin-image/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/rules?rev=8409&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/rules (original)
+++ vdr/vdr-plugin-image/trunk/debian/rules Mon Mar  1 00:53:16 2010
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. \
                LOCALEDIR=debian/tmp/usr/share/locale
 
 common-build-arch::

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