r1109 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-08-31 20:04:53 +0000 (Wed, 31 Aug 2005)
New Revision: 1109

Added:
   vdr/vdr/trunk/debian/dependencies.sh
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/control
   vdr/vdr/trunk/debian/patchlevel.sh
   vdr/vdr/trunk/debian/vdr-dev.install
Log:
vdr: Added dependencies.sh Thomas G?\195?\188nther and the new patchlevel.sh from Tobias Grimm

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-08-31 19:50:57 UTC (rev 1108)
+++ vdr/vdr/trunk/debian/changelog	2005-08-31 20:04:53 UTC (rev 1109)
@@ -13,6 +13,8 @@
       a sequence end code when moving cutting marks in radio recordings
     - Added 21_vdr-1.3.31-skipframes - Fixes a problem with skipping frames
       when moving cutting marks in radio recordings
+    - Added dependencies.sh to vdr-dev to automatically fill in the right
+      Depends and Conflicts to vdr when building a plugin
   * Tobias Grimm <tg at e-tobi.net>
     - Made debian/patchlevel.sh acccept opt-entries in 00list with leading
       spaces and removed leading space from vdr-patchlevel output

Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control	2005-08-31 19:50:57 UTC (rev 1108)
+++ vdr/vdr/trunk/debian/control	2005-08-31 20:04:53 UTC (rev 1109)
@@ -26,7 +26,7 @@
  programs. Also the standard VDR (without special plugins) requires 
  a DVB-Card with an integrated mpeg-decoder, a so called 
  Full-Featured Card.
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
 
 Package: vdr-dev
 Architecture:  all
@@ -40,7 +40,7 @@
  .
  This package contains the header files of VDR.
  You need this package to be able to build vdr-plugins!
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
 
 Package: vdr-plugin-sky
 Architecture: any 
@@ -54,7 +54,7 @@
  the analog a/v output of a Sky Digibox to VDR, so that you can 
  enjoy the full recording flexibility of VDR with your Sky 
  subscription. 
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
 
 Package: vdr-plugin-examples
 Architecture: any 
@@ -68,4 +68,4 @@
  from the vdr-source. These plugins do not have useful features,
  they only demonstrate how vdr-plugins work and what is possible to
  do with them.
-XB-VDR-Patchlevel: ${patchlevel}
+XB-VDR-Patchlevel: ${vdr:Patchlevel}

Added: vdr/vdr/trunk/debian/dependencies.sh
===================================================================
--- vdr/vdr/trunk/debian/dependencies.sh	2005-08-31 19:50:57 UTC (rev 1108)
+++ vdr/vdr/trunk/debian/dependencies.sh	2005-08-31 20:04:53 UTC (rev 1109)
@@ -0,0 +1,11 @@
+#!/bin/sh
+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
+for p in $(dh_listpackages); do
+    echo "vdr:Depends=  vdr (>= $FIRST_VERSION)" >> debian/$p.substvars
+    echo "vdr:Conflicts=vdr (>>  $LAST_VERSION)" >> debian/$p.substvars
+done

Modified: vdr/vdr/trunk/debian/patchlevel.sh
===================================================================
--- vdr/vdr/trunk/debian/patchlevel.sh	2005-08-31 19:50:57 UTC (rev 1108)
+++ vdr/vdr/trunk/debian/patchlevel.sh	2005-08-31 20:04:53 UTC (rev 1109)
@@ -6,14 +6,14 @@
         echo -n "Patches: "
         for p in $(grep "^[[:space:]]*opt-[0-9][0-9]_" debian/patches/00list | cut -d"_" -f2-); do
             echo -n "$p "
-            if [ -z $PATCHES ]; then
+            if [ -z "$PATCHES" ]; then
                 PATCHES="$p"
             else
                 PATCHES="$PATCHES $p"
             fi
         done
         echo
-        echo "patchlevel=$PATCHES" > patchlevel
+        echo "vdr:Patchlevel=$PATCHES" > patchlevel
         ;;
     "clean")
         # remove patchlevel file
@@ -29,7 +29,7 @@
             PATCHES=$(cat /usr/include/vdr/patchlevel)
         fi
         # write *.substvars only if patchlevel not empty
-        if [ "$PATCHES" != "patchlevel=" ]; then
+        if [ "$PATCHES" != "vdr:Patchlevel=" ]; then
             # scan control for packages
             for p in $(dh_listpackages); do
                 echo "$PATCHES" >> debian/$p.substvars

Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install	2005-08-31 19:50:57 UTC (rev 1108)
+++ vdr/vdr/trunk/debian/vdr-dev.install	2005-08-31 20:04:53 UTC (rev 1109)
@@ -10,3 +10,4 @@
 debian/lintian/vdr-dev          usr/share/lintian/overrides/
 
 debian/patchlevel.sh            usr/lib/vdr-dev/
+debian/patchlevel.sh            usr/lib/vdr-dev/