r2488 - in vdr/vdr-plugin-xine/branches/network/debian: . patches

Tobias Grimm tiber-guest at costa.debian.org
Sun Apr 23 20:16:48 UTC 2006 

Author: tiber-guest
Date: 2006-04-23 20:16:48 +0000 (Sun, 23 Apr 2006)
New Revision: 2488

Removed:
   vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch
Modified:
   vdr/vdr-plugin-xine/branches/network/debian/changelog
   vdr/vdr-plugin-xine/branches/network/debian/control
   vdr/vdr-plugin-xine/branches/network/debian/patches/00list
   vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch
   vdr/vdr-plugin-xine/branches/network/debian/patches/02_constness.dpatch
   vdr/vdr-plugin-xine/branches/network/debian/rules
Log:
Synced with 0.7.9-1


Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog	2006-04-23 20:16:48 UTC (rev 2488)
@@ -1,3 +1,23 @@
+vdr-plugin-xine (0.7.9-1net1) unstable; urgency=low
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - Synced with 0.7.9-1
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 23 Apr 2006 22:16:30 +0200
+
+vdr-plugin-xine (0.7.9-1) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Build-Depend on vdr-dev (>=1.3.47-1)
+  * Tobias Grimm <tg at e-tobi.net>
+    - New upstream release
+    - Updated 01_debian.dpatch
+    - Updated 02_constness.dpatch
+    - Removed 01_Makefile-fPIC-fix.dpatch - fixed upstream
+    - Removed DVBDIR from debian/rules
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu, 20 Apr 2006 08:26:02 +0200
+
 vdr-plugin-xine (0.7.8-2net2) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-xine/branches/network/debian/control
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/control	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/control	2006-04-23 20:16:48 UTC (rev 2488)
@@ -3,7 +3,7 @@
 Priority: extra
 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>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.1.1-1vdr1), vdr-dev (>=1.3.46-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.1.1-1vdr1), vdr-dev (>=1.3.47-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xine

Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/00list	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/00list	2006-04-23 20:16:48 UTC (rev 2488)
@@ -1,5 +1,4 @@
 01_debian
-01_Makefile-fPIC-fix
 #01_upstream
 02_constness
 #03_extra_keys

Deleted: vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-04-23 20:16:48 UTC (rev 2488)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile 
-
- at DPATCH@
-diff -urNad vdr-plugin-xine-0.7.8~/Makefile vdr-plugin-xine-0.7.8/Makefile
---- vdr-plugin-xine-0.7.8~/Makefile	2006-03-26 00:06:04.000000000 +0100
-+++ vdr-plugin-xine-0.7.8/Makefile	2006-03-26 00:06:27.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- CXX      ?= g++
- #CXX       = /soft/gcc-4.1-20060113/bin/g++ -I/soft/include -L/soft/lib
--CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -O2 -fPIC -g -Wall -Woverloaded-virtual
- #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual
- #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual -Wformat=2 -Wextra
- 

Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2006-04-23 20:16:48 UTC (rev 2488)
@@ -6,20 +6,19 @@
 ## DP: Package-specific bits
 
 @DPATCH@
-diff -urNad vdr-plugin-xine-0.7.8~/Make.config vdr-plugin-xine-0.7.8/Make.config
---- vdr-plugin-xine-0.7.8~/Make.config	2006-03-21 01:05:54.000000000 +0000
-+++ vdr-plugin-xine-0.7.8/Make.config	2006-03-21 01:05:55.290710274 +0000
-@@ -0,0 +1,6 @@
+diff -urNad vdr-plugin-xine-0.7.9~/Make.config vdr-plugin-xine-0.7.9/Make.config
+--- vdr-plugin-xine-0.7.9~/Make.config	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xine-0.7.9/Make.config	2006-04-23 22:04:33.000000000 +0200
+@@ -0,0 +1,5 @@
 +INCLUDES+=-I/usr/include/freetype2
-+DVBDIR=.
 +VDRDIR=/usr/include/vdr
 +LIBDIR=$(DESTDIR)/usr/lib/vdr/plugins
 +VIDEODIR=/video
 +DATA_DIR=$(DESTDIR)/usr/share/vdr-plugin-xine
-diff -urNad vdr-plugin-xine-0.7.8~/Makefile vdr-plugin-xine-0.7.8/Makefile
---- vdr-plugin-xine-0.7.8~/Makefile	2006-03-21 01:05:54.000000000 +0000
-+++ vdr-plugin-xine-0.7.8/Makefile	2006-03-21 01:05:55.294710016 +0000
-@@ -30,7 +30,7 @@
+diff -urNad vdr-plugin-xine-0.7.9~/Makefile vdr-plugin-xine-0.7.9/Makefile
+--- vdr-plugin-xine-0.7.9~/Makefile	2006-04-17 20:43:13.000000000 +0200
++++ vdr-plugin-xine-0.7.9/Makefile	2006-04-23 22:04:23.000000000 +0200
+@@ -29,7 +29,7 @@
  
  ### Allow user defined options to overwrite defaults:
  
@@ -28,7 +27,7 @@
  
  INCLUDES += `xine-config --cflags` 
  
-@@ -41,10 +41,10 @@
+@@ -40,10 +40,10 @@
  #VDR_XINE_SET_VIDEO_WINDOW = 1
  
  # where are these utilities for image grabbing? (default: anywhere on your PATH)
@@ -41,13 +40,13 @@
 +VDR_XINE_PNMCUT    = /usr/bin/pnmcut
 +VDR_XINE_PNMTOJPEG = /usr/bin/pnmtojpeg
  
- ### The version number of VDR (taken from VDR's "config.h"):
+ ### The version number of VDR's plugin API (taken from VDR's "config.h"):
  
-@@ -107,7 +107,16 @@
+@@ -106,7 +106,16 @@
  
  libvdr-$(PLUGIN).so: $(OBJS) Makefile
  	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
--	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+-	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 +
 +install: libvdr-$(PLUGIN).so
 +	@install -D -m755 $< $(LIBDIR)/$<.$(VDRVERSION)

Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/02_constness.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/02_constness.dpatch	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/02_constness.dpatch	2006-04-23 20:16:48 UTC (rev 2488)
@@ -5,19 +5,19 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad vdr-plugin-xine-0.7.7~/xine.c vdr-plugin-xine-0.7.7/xine.c
---- vdr-plugin-xine-0.7.7~/xine.c	2006-02-14 21:17:03.000000000 +0000
-+++ vdr-plugin-xine-0.7.7/xine.c	2006-02-14 21:17:04.501963573 +0000
+diff -urNad vdr-plugin-xine-0.7.9~/xine.c vdr-plugin-xine-0.7.9/xine.c
+--- vdr-plugin-xine-0.7.9~/xine.c	2006-04-17 20:17:09.000000000 +0200
++++ vdr-plugin-xine-0.7.9/xine.c	2006-04-23 21:10:36.000000000 +0200
 @@ -17,9 +17,9 @@
  
  
  
--static const char *VERSION        = "0.7.8";
+-static const char *VERSION        = "0.7.9";
 -static const char *DESCRIPTION    = "Software based playback using xine";
 -//static const char *MAINMENUENTRY  = "xine - Toggle prebuffer setting";
-+static const char VERSION[]       = "0.7.8";
-+static const char DESCRIPTION[]   = "Software based playback using xine";
-+//static const char MAINMENUENTRY[] = "xine - Toggle prebuffer setting";
++static const char VERSION[]        = "0.7.9";
++static const char DESCRIPTION[]    = "Software based playback using xine";
++//static const char MAINMENUENTRY[]  = "xine - Toggle prebuffer setting";
  
  
  

Modified: vdr/vdr-plugin-xine/branches/network/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/rules	2006-04-23 20:09:48 UTC (rev 2487)
+++ vdr/vdr-plugin-xine/branches/network/debian/rules	2006-04-23 20:16:48 UTC (rev 2488)
@@ -25,7 +25,6 @@
 VDR=vdr
 PACKAGE=$(VDR)-plugin-xine
 VDRDIR=/usr/include/$(VDR)
-DVBDIR=/usr/include
 
 # Drop the following three lines sometime...
 VDRVERSION = $(shell grep 'define VDRVERSION ' /usr/include/vdr/config.h | awk '{ print $$3 }' | sed -e 's/"//g')

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