r2476 - vdr/vdr/trunk/debian

[Thomas Günther]

Author: tom-guest
Date: 2006-04-23 16:12:44 +0000 (Sun, 23 Apr 2006)
New Revision: 2476

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/dependencies.sh
   vdr/vdr/trunk/debian/plugin-loader.sh
Log:
Changes for APIVERSION

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-04-23 14:58:18 UTC (rev 2475)
+++ vdr/vdr/trunk/debian/changelog	2006-04-23 16:12:44 UTC (rev 2476)
@@ -1,3 +1,13 @@
+vdr (1.3.47-2) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+  * Thomas Günther <tom at toms-cafe.de>
+    - Changed dependencies.sh: don't create conflicts with next vdr version
+    - Changed plugin-loader.sh: detect api version, too
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 22 Apr 2006 17:03:40 +0200
+
 vdr (1.3.47-1) unstable; urgency=low
 
   * NOT RELEASED YET

Modified: vdr/vdr/trunk/debian/dependencies.sh
===================================================================
--- vdr/vdr/trunk/debian/dependencies.sh	2006-04-23 14:58:18 UTC (rev 2475)
+++ vdr/vdr/trunk/debian/dependencies.sh	2006-04-23 16:12:44 UTC (rev 2476)
@@ -2,9 +2,8 @@
 set -e
 
 FIRST_VERSION=$(dpkg -s vdr-dev | awk '/Version/ { print $2 }')
-LAST_VERSION=$(echo $FIRST_VERSION | sed -e 's/-[^-]*$//')-9999
 
-# Set conflicts with previous and next vdr version in control
+# Set conflicts with previous vdr version in control
 for p in $(dh_listpackages); do
-    echo "vdr:Depends=vdr (>= $FIRST_VERSION), vdr (<< $LAST_VERSION)" >> debian/$p.substvars
+    echo "vdr:Depends=vdr (>= $FIRST_VERSION)" >> debian/$p.substvars
 done

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2006-04-23 14:58:18 UTC (rev 2475)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2006-04-23 16:12:44 UTC (rev 2476)
@@ -18,7 +18,7 @@
     local vdrcmd
     local version
 
-    vdrcmd="/usr/bin/vdr -u $USER -g $GROUP $OPTIONS"
+    vdrcmd="/usr/bin/vdr -u $USER $OPTIONS"
 
     if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
         vdrcmd="LD_ASSUME_KERNEL=2.4.1 $vdrcmd"
@@ -32,6 +32,7 @@
     echo -ne "\nSearching for plugins (VDR $version):"
 
     # find installed plugins
+    version=`echo "$version" | sed 's:.*/::'`
     plugins=(`find ${PLUGIN_DIR} -maxdepth 1 \
                    -name "${PLUGIN_PREFIX}*.so.${version}" | \
               xargs -r dpkg -S 2>&1 | \