r3906 - in vdr/vdr-plugin-xine/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2007-01-14 20:09:43 +0100 (Sun, 14 Jan 2007)
New Revision: 3906

Modified:
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/patches/00list
   vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
   vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
Log:
* New upstream release

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2007-01-14 19:04:49 UTC (rev 3905)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2007-01-14 19:09:43 UTC (rev 3906)
@@ -1,4 +1,4 @@
-vdr-plugin-xine (0.7.9-8) UNRELEASED; urgency=low
+vdr-plugin-xine (0.7.10-1) UNRELEASED; urgency=low
 
   [ Thomas Günther ]
   * NOT RELEASED YET
@@ -11,8 +11,9 @@
 
   [ Thomas Schmidt ]
   * Install the plugin-binary via dh_install
+  * New upstream release
 
- -- Thomas Schmidt <tschmidt at debian.org>  Fri, 12 Jan 2007 22:34:03 +0100
+ -- Thomas Schmidt <tschmidt at debian.org>  Sat, 13 Jan 2007 11:12:26 +0100
 
 vdr-plugin-xine (0.7.9-7) unstable; urgency=low
 

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list	2007-01-14 19:04:49 UTC (rev 3905)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list	2007-01-14 19:09:43 UTC (rev 3906)
@@ -1,4 +1,2 @@
 01_debian
-#01_upstream
 02_constness
-#03_extra_keys

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2007-01-14 19:04:49 UTC (rev 3905)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2007-01-14 19:09:43 UTC (rev 3906)
@@ -6,19 +6,19 @@
 ## DP: Package-specific bits
 
 @DPATCH@
-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-27 01:49:48.000000000 +0200
+diff -urNad vdr-plugin-xine-0.7.10~/Make.config vdr-plugin-xine-0.7.10/Make.config
+--- vdr-plugin-xine-0.7.10~/Make.config	1970-01-01 01:00:00.000000000 +0100
++++ vdr-plugin-xine-0.7.10/Make.config	2007-01-13 11:31:22.000000000 +0100
 @@ -0,0 +1,5 @@
 +INCLUDES+=-I/usr/include/freetype2
 +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.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-27 01:50:09.000000000 +0200
-@@ -29,7 +29,7 @@
+diff -urNad vdr-plugin-xine-0.7.10~/Makefile vdr-plugin-xine-0.7.10/Makefile
+--- vdr-plugin-xine-0.7.10~/Makefile	2006-12-10 21:12:37.000000000 +0100
++++ vdr-plugin-xine-0.7.10/Makefile	2007-01-13 11:31:45.000000000 +0100
+@@ -31,7 +31,7 @@
  
  ### Allow user defined options to overwrite defaults:
  
@@ -27,7 +27,7 @@
  
  INCLUDES += `xine-config --cflags` 
  
-@@ -40,10 +40,10 @@
+@@ -42,10 +42,10 @@
  #VDR_XINE_SET_VIDEO_WINDOW = 1
  
  # where are these utilities for image grabbing? (default: anywhere on your PATH)
@@ -42,12 +42,10 @@
  
  ### The version number of VDR's plugin API (taken from VDR's "config.h"):
  
-@@ -106,7 +106,16 @@
- 
- libvdr-$(PLUGIN).so: $(OBJS) Makefile
+@@ -110,6 +110,16 @@
  	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
--	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
-+
+ 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
 +install: libvdr-$(PLUGIN).so
 +	@install -D -m755 $< $(LIBDIR)/$<.$(APIVERSION)
 +	@install -d "$(DATA_DIR)"
@@ -57,6 +55,7 @@
 +	@rm $(LIBDIR)/$<.$(APIVERSION)
 +	@rm $(addprefix "$(DATA_DIR)/", $(patsubst data/%,%,$(wildcard data/*)))
 +	@rmdir --ignore-fail-on-non-empty "$(DATA_DIR)"
- 
++
  xineplayer: xineplayer.o Makefile
  	$(CXX) $(CXXFLAGS) xineplayer.o -o $@
+ 

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch	2007-01-14 19:04:49 UTC (rev 3905)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/02_constness.dpatch	2007-01-14 19:09:43 UTC (rev 3906)
@@ -5,19 +5,19 @@
 ## DP: No description.
 
 @DPATCH@
-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
+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
 @@ -17,9 +17,9 @@
  
  
  
--static const char *VERSION        = "0.7.9";
+-static const char *VERSION        = "0.7.10";
 -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";
++static const char VERSION[]       = "0.7.10";
++static const char DESCRIPTION[]   = "Software based playback using xine";
++//static const char MAINMENUENTRY[] = "xine - Toggle prebuffer setting";