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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-04-26 23:55:10 +0000 (Wed, 26 Apr 2006)
New Revision: 2596

Removed:
   vdr/vdr-plugin-xine/trunk/debian/patches/90_APIVERSION.dpatch
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
Log:
Removed 90_APIVERSION.dpatch and corrected 01_debian.dpatch


Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2006-04-26 23:53:36 UTC (rev 2595)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2006-04-26 23:55:10 UTC (rev 2596)
@@ -1,10 +1,3 @@
-vdr-plugin-xine (0.7.9-2) unstable; urgency=low
-
-  * Thomas Schmidt <tschmidt at debian.org>
-    - Added 90_APIVERSION.dpatch
-
- -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 25 Apr 2006 17:26:01 +0200
-
 vdr-plugin-xine (0.7.9-1) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>
@@ -15,7 +8,6 @@
     - Updated 02_constness.dpatch
     - Removed 01_Makefile-fPIC-fix.dpatch - fixed upstream
     - Removed DVBDIR from debian/rules
-    - Added 90_APIVERSION.dpatch
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Mon, 24 Apr 2006 21:49:35 +0200
 

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list	2006-04-26 23:53:36 UTC (rev 2595)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list	2006-04-26 23:55:10 UTC (rev 2596)
@@ -2,4 +2,3 @@
 #01_upstream
 02_constness
 #03_extra_keys
-90_APIVERSION

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2006-04-26 23:53:36 UTC (rev 2595)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_debian.dpatch	2006-04-26 23:55:10 UTC (rev 2596)
@@ -8,7 +8,7 @@
 @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-23 22:04:33.000000000 +0200
++++ vdr-plugin-xine-0.7.9/Make.config	2006-04-27 01:49:48.000000000 +0200
 @@ -0,0 +1,5 @@
 +INCLUDES+=-I/usr/include/freetype2
 +VDRDIR=/usr/include/vdr
@@ -17,7 +17,7 @@
 +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-23 22:04:23.000000000 +0200
++++ vdr-plugin-xine-0.7.9/Makefile	2006-04-27 01:50:09.000000000 +0200
 @@ -29,7 +29,7 @@
  
  ### Allow user defined options to overwrite defaults:
@@ -49,12 +49,12 @@
 -	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 +
 +install: libvdr-$(PLUGIN).so
-+	@install -D -m755 $< $(LIBDIR)/$<.$(VDRVERSION)
++	@install -D -m755 $< $(LIBDIR)/$<.$(APIVERSION)
 +	@install -d "$(DATA_DIR)"
 +	@install -m644 data/* "$(DATA_DIR)/"
 +
 +uninstall:
-+	@rm $(LIBDIR)/$<.$(VDRVERSION)
++	@rm $(LIBDIR)/$<.$(APIVERSION)
 +	@rm $(addprefix "$(DATA_DIR)/", $(patsubst data/%,%,$(wildcard data/*)))
 +	@rmdir --ignore-fail-on-non-empty "$(DATA_DIR)"
  

Deleted: vdr/vdr-plugin-xine/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/90_APIVERSION.dpatch	2006-04-26 23:53:36 UTC (rev 2595)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/90_APIVERSION.dpatch	2006-04-26 23:55:10 UTC (rev 2596)
@@ -1,20 +0,0 @@
-#! /bin/sh -e
-## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
-
-case "$1" in
-    -patch)
-        sed -i -e s/VDRVERSION/APIVERSION/g Makefile
-        ;;
-    -unpatch)
-        sed -i -e s/APIVERSION/VDRVERSION/g Makefile
-        ;;
-     *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-        ;;
-esac
-
-exit 0