r8678 - in /vdr/vdr-plugin-dxr3/trunk/debian: changelog control copyright patches/02_debian_ffmpeg.dpatch

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Tue Jun  8 23:03:12 2010
New Revision: 8678

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8678
Log:
* Adapted 02_debian_ffmpeg.dpatch to newer ffmpeg versions
* Added myself to Uploaders
* Standards-Version: 3.8.4
* Updated debian/copyright

Modified:
    vdr/vdr-plugin-dxr3/trunk/debian/changelog
    vdr/vdr-plugin-dxr3/trunk/debian/control
    vdr/vdr-plugin-dxr3/trunk/debian/copyright
    vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/changelog?rev=8678&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog Tue Jun  8 23:03:12 2010
@@ -1,3 +1,12 @@
+vdr-plugin-dxr3 (0.2.9-6) experimental; urgency=low
+
+  * Adapted 02_debian_ffmpeg.dpatch to newer ffmpeg versions
+  * Added myself to Uploaders
+  * Standards-Version: 3.8.4
+  * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de>  Tue, 08 Jun 2010 23:17:46 +0200
+
 vdr-plugin-dxr3 (0.2.9-5) experimental; urgency=low
 
   * Removed non-standard shebang line from debian/rules

Modified: vdr/vdr-plugin-dxr3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/control?rev=8678&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/control (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/control Tue Jun  8 23:03:12 2010
@@ -2,9 +2,9 @@
 Section: contrib/misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
-Uploaders: Nicolas Boullis <nboullis at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
+Uploaders: Nicolas Boullis <nboullis at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext, pkg-config, libavcodec-dev (>= 0.cvs20060329), em8300-headers (>= 0.16.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/
 Homepage: http://sourceforge.net/projects/dxr3plugin/

Modified: vdr/vdr-plugin-dxr3/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/copyright?rev=8678&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/copyright Tue Jun  8 23:03:12 2010
@@ -23,7 +23,7 @@
     (C) 2005 - 2009 Ville Skyttä
 
 Copyright (Debian packaging):
-    (C) 2003 - 2009 Nicolas Boullis, Tobias Grimm, Peter Siering,
+    (C) 2003 - 2010 Nicolas Boullis, Tobias Grimm, Peter Siering,
                     Thomas Günther, Thomas Schmidt
 
 License (main plug-in, dxr3colormanager, dxr3interface_spu_encoder,

Modified: vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch?rev=8678&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/02_debian_ffmpeg.dpatch Tue Jun  8 23:03:12 2010
@@ -8,7 +8,7 @@
 diff -urNad vdr-plugin-dxr3-0.2.9~/Makefile vdr-plugin-dxr3-0.2.9/Makefile
 --- vdr-plugin-dxr3-0.2.9~/Makefile	2009-05-01 18:13:16.000000000 +0200
 +++ vdr-plugin-dxr3-0.2.9/Makefile	2009-05-01 18:14:25.000000000 +0200
-@@ -41,8 +41,8 @@
+@@ -41,8 +41,9 @@
  
  ### Includes and Defines (add further entries here):
  
@@ -16,6 +16,7 @@
 -LIBS     = -L$(FFMDIR)/libavcodec -lavcodec
 +INCLUDES += -I$(VDRDIR)/include `pkg-config --cflags libavcodec` -I/usr/include/ffmpeg/libavcodec -I$(EM8300)
 +LIBS     = `pkg-config --libs libavcodec`
++DEFINES += -D__STDC_CONSTANT_MACROS
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  DEFINES += -D_GNU_SOURCE