r7600 - in /vdr/vdr-plugin-xine/trunk/debian: changelog control copyright patches/01_debian.dpatch

Mon Apr 13 14:04:39 UTC 2009

Author: tiber-guest
Date: Mon Apr 13 14:04:38 2009
New Revision: 7600

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7600
Log:
* New upstream release
* Updated 01_debian.dpatch
* Bumped Standards-Version to 3.8.1
* Updated debian/copyright

Modified:
    vdr/vdr-plugin-xine/trunk/debian/changelog
    vdr/vdr-plugin-xine/trunk/debian/control
    vdr/vdr-plugin-xine/trunk/debian/copyright
    vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/changelog?rev=7600&op=diff
==============================================================================

--- vdr/vdr-plugin-xine/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog Mon Apr 13 14:04:38 2009
@@ -1,9 +1,12 @@
-vdr-plugin-xine (0.8.2-2) UNRELEASED; urgency=low
-
+vdr-plugin-xine (0.9.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Updated 01_debian.dpatch
   * Dropped patchlevel control field
   * Build-Depend on vdr-dev (>=1.6.0-5)
-  * Bumped Standards-Version to 3.8.0
+  * Bumped Standards-Version to 3.8.1
   * Added installation of noSignal.mpg (Closes: #478656)
+  * Updated debian/copyright
 
  -- Tobias Grimm <tg at e-tobi.net>  Thu, 24 Jul 2008 15:53:30 +0200
 

Modified: vdr/vdr-plugin-xine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/control?rev=7600&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control (original)
+++ vdr/vdr-plugin-xine/trunk/debian/control Mon Apr 13 14:04:38 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas GÃ¼nther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5), gettext, libxine-dev (>= 1.1.90hg+20080321+5ac9723858b2)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/
 Homepage: http://home.vr-web.de/~rnissl/

Modified: vdr/vdr-plugin-xine/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/copyright?rev=7600&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-xine/trunk/debian/copyright Mon Apr 13 14:04:38 2009
@@ -11,10 +11,10 @@
     Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
-    (C) 2003-2007 Reinhard Nissl
+    (C) 2003 - 2007 Reinhard Nissl
 
 Copyright (Debian packaging):
-    (C) 2003-2008 Tobias Grimm, Thomas GÃ¼nther, Darren Salt, Thomas Schmidt
+    (C) 2003 - 2009 Tobias Grimm, Thomas GÃ¼nther, Darren Salt, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch?rev=7600&op=diff
==============================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch (original)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch Mon Apr 13 14:04:38 2009
@@ -6,18 +6,18 @@
 ## DP: Package-specific bits
 
 @DPATCH@
-diff -urNad vdr-plugin-xine-0.7.11~/Make.config vdr-plugin-xine-0.7.11/Make.config
---- vdr-plugin-xine-0.7.11~/Make.config	1970-01-01 01:00:00.000000000 +0100
-+++ vdr-plugin-xine-0.7.11/Make.config	2007-10-08 00:29:12.000000000 +0200
+diff -urNad vdr-plugin-xine-0.9.1~/Make.config vdr-plugin-xine-0.9.1/Make.config
+--- vdr-plugin-xine-0.9.1~/Make.config	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xine-0.9.1/Make.config	2009-04-13 15:55:46.000000000 +0200
 @@ -0,0 +1,5 @@
 +INCLUDES+=-I/usr/include/freetype2
 +VDRDIR=/usr/include/vdr
 +LIBDIR=$(DESTDIR)/usr/lib/vdr/plugins
 +VIDEODIR=/var/lib/video
 +DATA_DIR=$(DESTDIR)/usr/share/vdr-plugin-xine
-diff -urNad vdr-plugin-xine-0.7.11~/Makefile vdr-plugin-xine-0.7.11/Makefile
---- vdr-plugin-xine-0.7.11~/Makefile	2007-10-08 00:28:48.000000000 +0200
-+++ vdr-plugin-xine-0.7.11/Makefile	2007-10-08 00:30:57.000000000 +0200
+diff -urNad vdr-plugin-xine-0.9.1~/Makefile vdr-plugin-xine-0.9.1/Makefile
+--- vdr-plugin-xine-0.9.1~/Makefile	2009-04-04 21:01:49.000000000 +0200
++++ vdr-plugin-xine-0.9.1/Makefile	2009-04-13 15:56:46.000000000 +0200
 @@ -31,7 +31,7 @@
  
  ### Allow user defined options to overwrite defaults:
@@ -25,24 +25,22 @@
 --include $(VDRDIR)/Make.config
 +-include Make.config
  
- INCLUDES += `xine-config --cflags` 
+ INCLUDES += `pkg-config --cflags libxine` 
  
-@@ -42,10 +42,10 @@
+@@ -48,9 +48,9 @@
  #VDR_XINE_SET_VIDEO_WINDOW = 1
  
  # where are these utilities for image grabbing? (default: anywhere on your PATH)
 -#VDR_XINE_Y4MSCALER = /usr/bin/y4mscaler
 -#VDR_XINE_Y4MTOPPM  = /usr/bin/y4mtoppm
--#VDR_XINE_PNMCUT    = /usr/bin/pnmcut
 -#VDR_XINE_PNMTOJPEG = /usr/bin/pnmtojpeg
 +VDR_XINE_Y4MSCALER = /usr/bin/y4mscaler
 +VDR_XINE_Y4MTOPPM  = /usr/bin/y4mtoppm
-+VDR_XINE_PNMCUT    = /usr/bin/pnmcut
 +VDR_XINE_PNMTOJPEG = /usr/bin/pnmtojpeg
  
  ### The version number of VDR's plugin API (taken from VDR's "config.h"):
  
-@@ -109,7 +109,7 @@
+@@ -116,7 +116,7 @@
  ### Internationalization (I18N):
  
  PODIR     = po
@@ -51,7 +49,7 @@
  I18Npo    = $(wildcard $(PODIR)/*.po)
  I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
  I18Ndirs  = $(notdir $(foreach file, $(I18Npo), $(basename $(file))))
-@@ -137,6 +137,16 @@
+@@ -144,6 +144,16 @@
  	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
  	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
  


