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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-03-28 22:39:07 +0000 (Tue, 28 Mar 2006)
New Revision: 2275

Removed:
   vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.dirs
Modified:
   vdr/vdr-plugin-xine/branches/network/debian/changelog
   vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch
   vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.install
   vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.preinst
   vdr/vdr-plugin-xine/branches/network/debian/watch
Log:
synched with main branch

Modified: vdr/vdr-plugin-xine/branches/network/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/changelog	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/changelog	2006-03-28 22:39:07 UTC (rev 2275)
@@ -1,3 +1,12 @@
+vdr-plugin-xine (0.7.8-2net2) unreleased; urgency=low
+
+  * NOT RELEASED YET
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - Synced with 0.7.8-2 again
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Wed, 29 Mar 2006 00:32:59 +0200
+
 vdr-plugin-xine (0.7.8-2net1) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>
@@ -11,6 +20,7 @@
     - Build-Depend on vdr-dev (>=1.3.45-1)
   * Tobias Grimm <tg at e-tobi.net>
     - Remove symlink /var/lib/vdr/plugins/xine from old versions in preinst
+    - Get rid off debian/vdr-plugin-xine.dirs
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 26 Mar 2006 21:28:33 +0200
 

Modified: 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-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-03-28 22:39:07 UTC (rev 2275)
@@ -6,15 +6,15 @@
 ## DP: Adds -fPIC to Makefile 
 
 @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
+diff -urNad vdr-plugin-xine-0.7.7~/Makefile vdr-plugin-xine-0.7.7/Makefile
+--- vdr-plugin-xine-0.7.7~/Makefile	2006-03-08 23:09:04.000000000 +0100
++++ vdr-plugin-xine-0.7.7/Makefile	2006-03-08 23:09:29.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
  
+ ### The directory environment:

Modified: vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/patches/01_debian.dpatch	2006-03-28 22:39:07 UTC (rev 2275)
@@ -50,7 +50,7 @@
 -	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
 +
 +install: libvdr-$(PLUGIN).so
-+	@install -m755 $< $(LIBDIR)/$<.$(VDRVERSION)
++	@install -D -m755 $< $(LIBDIR)/$<.$(VDRVERSION)
 +	@install -d "$(DATA_DIR)"
 +	@install -m644 data/* "$(DATA_DIR)/"
 +

Deleted: vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.dirs
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.dirs	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.dirs	2006-03-28 22:39:07 UTC (rev 2275)
@@ -1,3 +0,0 @@
-usr/lib/vdr/plugins
-usr/share/vdr/vdr-xine
-etc/vdr/plugins

Modified: vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.install
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.install	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.install	2006-03-28 22:39:07 UTC (rev 2275)
@@ -1,3 +1,3 @@
-debian/plugin.xine.conf		etc/vdr/plugins/
+debian/plugin.xine.conf         etc/vdr/plugins/
 
 xineplayer                      usr/bin/

Modified: vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.preinst
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.preinst	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/vdr-plugin-xine.preinst	2006-03-28 22:39:07 UTC (rev 2275)
@@ -16,7 +16,7 @@
 
 case $1 in
     install|upgrade)
-        [ -L /var/lib/vdr/plugins/xine ] && rm -f /var/lib/vdr/plugins/xine
+        [ ! -L /var/lib/vdr/plugins/xine ] || rm -f /var/lib/vdr/plugins/xine
     ;;
     abort-upgrade)
         # nothing to do

Modified: vdr/vdr-plugin-xine/branches/network/debian/watch
===================================================================
--- vdr/vdr-plugin-xine/branches/network/debian/watch	2006-03-28 21:55:05 UTC (rev 2274)
+++ vdr/vdr-plugin-xine/branches/network/debian/watch	2006-03-28 22:39:07 UTC (rev 2275)
@@ -1,2 +1,2 @@
 version=2
-http://home.vr-web.de/~rnissl/	vdr-xine-(\d.*)\.tgz
+http://home.vr-web.de/~rnissl/  vdr-xine-(\d.*)\.tgz