r2600 - in vdr/vdr-plugin-radio/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-04-28 18:15:01 +0000 (Fri, 28 Apr 2006)
New Revision: 2600

Removed:
   vdr/vdr-plugin-radio/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Modified:
   vdr/vdr-plugin-radio/trunk/debian/changelog
   vdr/vdr-plugin-radio/trunk/debian/patches/00list
   vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf
   vdr/vdr-plugin-radio/trunk/debian/postinst
Log:
- New upstream release
- Removed 01_Makefile-fPIC-fix (fixed upstream)
- radio.mpg and replay.mpg symlinks are not used anymore, these files can be
  specified in plugin.radio.conf now


Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog	2006-04-27 17:51:39 UTC (rev 2599)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog	2006-04-28 18:15:01 UTC (rev 2600)
@@ -1,3 +1,13 @@
+vdr-plugin-radio (0.1.2-1) UNRELEASED; urgency=low
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - New upstream release
+    - Removed 01_Makefile-fPIC-fix (fixed upstream)
+    - radio.mpg and replay.mpg symlinks are not used anymore, these files can be
+      specified in plugin.radio.conf now
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Thu, 27 Apr 2006 18:39:32 +0200
+
 vdr-plugin-radio (0.1.1-2) unstable; urgency=low
 
   * Thomas Günther <tom at toms-cafe.de>

Modified: vdr/vdr-plugin-radio/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/00list	2006-04-27 17:51:39 UTC (rev 2599)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/00list	2006-04-28 18:15:01 UTC (rev 2600)
@@ -1,2 +1 @@
-01_Makefile-fPIC-fix
 02_radio-0.1.1-fix-DataDir

Deleted: vdr/vdr-plugin-radio/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-04-27 17:51:39 UTC (rev 2599)
+++ vdr/vdr-plugin-radio/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-04-28 18:15:01 UTC (rev 2600)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## Makefile-fPIC-fix patch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile to fix potential FTBFS.
-
- at DPATCH@
-diff -urNad vdr-plugin-radio-0.1.1~/Makefile vdr-plugin-radio-0.1.1/Makefile
---- vdr-plugin-radio-0.1.1~/Makefile	2006-04-18 17:16:28.000000000 +0200
-+++ vdr-plugin-radio-0.1.1/Makefile	2006-04-21 21:21:35.000000000 +0200
-@@ -32,7 +32,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
- #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual
- 
- ### The directory environment:

Modified: vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf	2006-04-27 17:51:39 UTC (rev 2599)
+++ vdr/vdr-plugin-radio/trunk/debian/plugin.radio.conf	2006-04-28 18:15:01 UTC (rev 2600)
@@ -2,8 +2,22 @@
 # vdr-plugin-radio configuration file
 #
 
+# image directory
+--files=/usr/share/vdr-plugin-radio
+
+# temp. data directory
+--data=/tmp/radio
+
+#  default mpegfile in livemode
+--live=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-live.mpg
+
+# default mpegfile in replaymode
+--replay=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-replay.mpg
+
+# set verbosity level
 #
-# Directory for temporary data files
-#
-
--d /tmp/radio
+# 0 = Off
+# 1 = RDS-Text+Tags (default)
+# 2 = +RDS-Telegram/Debug
+# 3 = +RawData 0xfd
+--verbose=1

Modified: vdr/vdr-plugin-radio/trunk/debian/postinst
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/postinst	2006-04-27 17:51:39 UTC (rev 2599)
+++ vdr/vdr-plugin-radio/trunk/debian/postinst	2006-04-28 18:15:01 UTC (rev 2600)
@@ -1,23 +1,16 @@
 #!/bin/sh
 set -e
 
-RADIO_MPG=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-live.mpg
-REPLAY_MPG=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-replay.mpg
+# remove old symlinks from previous versions
 
-RADIO_LNK=/var/lib/vdr/plugins/radio/radio.mpg
-REPLAY_LNK=/var/lib/vdr/plugins/radio/replay.mpg
-
-# Create links to default background images
-# (user defined links will not be overwritten)
-
 if [ "$1" = "configure" ]; then
-    if [ ! -r $RADIO_LNK ]; then
-        /bin/mkdir -p $(dirname $RADIO_LNK)
-        /bin/ln -sf $RADIO_MPG $RADIO_LNK || true
-    fi
-    if [ ! -r $REPLAY_LNK ]; then
-        /bin/ln -sf $REPLAY_MPG $REPLAY_LNK || true
-    fi
+    radio_mpg=/var/lib/vdr/plugins/radio/radio.mpg
+    replay_mpg=/replay.mpg
+
+    [ -L $radio_mpg ] && rm -rf $radio_mpg || true
+    [ -L $replay_mpg ] && rm -rf $replay_mpg || true
+    
+    rmdir /var/lib/vdr/plugins/radio || true
 fi
 
 #DEBHELPER#