r2592 - vdr/vdr-plugin-radio/trunk/debian

[Thomas Günther]

Author: tom-guest
Date: 2006-04-26 22:04:36 +0000 (Wed, 26 Apr 2006)
New Revision: 2592

Modified:
   vdr/vdr-plugin-radio/trunk/debian/changelog
   vdr/vdr-plugin-radio/trunk/debian/prerm
Log:
Fixed debian/prerm

Modified: vdr/vdr-plugin-radio/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/changelog	2006-04-25 22:15:36 UTC (rev 2591)
+++ vdr/vdr-plugin-radio/trunk/debian/changelog	2006-04-26 22:04:36 UTC (rev 2592)
@@ -1,3 +1,12 @@
+vdr-plugin-radio (0.1.1-2) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Fixed debian/prerm
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Wed, 26 Apr 2006 23:14:04 +0200
+
 vdr-plugin-radio (0.1.1-1) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-radio/trunk/debian/prerm
===================================================================
--- vdr/vdr-plugin-radio/trunk/debian/prerm	2006-04-25 22:15:36 UTC (rev 2591)
+++ vdr/vdr-plugin-radio/trunk/debian/prerm	2006-04-26 22:04:36 UTC (rev 2592)
@@ -4,17 +4,19 @@
 RADIO_MPG=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-live.mpg
 REPLAY_MPG=/usr/share/vdr-plugin-radio/rtextUnten-kleo2-replay.mpg
 
-RADIO_LNK=/var/lib/vdr/plugins/radio.mpg
-REPLAY_LNK=/var/lib/vdr/plugins/replay.mpg
+RADIO_LNK=/var/lib/vdr/plugins/radio/radio.mpg
+REPLAY_LNK=/var/lib/vdr/plugins/radio/replay.mpg
 
 # Remove the links only if linked to the default images
 
 if [ "$1" = "remove" ]; then
     if [ -L $RADIO_LNK ] && /usr/bin/cmp --quiet $RADIO_LNK $RADIO_MPG ; then
-        /bin/rm -f -r $(dirname $RADIO_LNK) || true
+        /bin/rm -f $RADIO_LNK || true
+        /bin/rmdir --ignore-fail-on-non-empty $(dirname $RADIO_LNK) || true
     fi
     if [ -L $REPLAY_LNK ] && /usr/bin/cmp --quiet $REPLAY_LNK $REPLAY_MPG ; then
-        /bin/rm -f -r $(dirname $REPLAY_LNK) || true
+        /bin/rm -f $REPLAY_LNK || true
+        /bin/rmdir --ignore-fail-on-non-empty $(dirname $REPLAY_LNK) || true
     fi
 fi