r1431 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-11-03 14:12:50 +0000 (Thu, 03 Nov 2005)
New Revision: 1431

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/dependencies.sh
Log:
vdr: changed dependencies.sh to not conflict with newer vdr versions, instead depend on vdr (>= currentversion), vdr (<< current-9999) - hopefully this will fix the issure with automated testing migration

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-11-03 00:49:24 UTC (rev 1430)
+++ vdr/vdr/trunk/debian/changelog	2005-11-03 14:12:50 UTC (rev 1431)
@@ -8,9 +8,14 @@
       + Removed 18_vdr-1.3.33-recordingsmenu.dpatch
       + Removed 19_vdr-1.3.33-recordingsupdate.dpatch
       + Added 16_recordings.c-fix.dpatch
-    - Corrected FSF Address in debian/copyright
+    - Corrected FSF address in debian/copyright
     - Call dh_installman in binary-indep target in debian/rules, to 
       (re-)include 2 missing manpages
+    - Changed dependencies.sh to create Depends: like 
+      vdr (>= current>), vdr (<< current-9999) without using Conflicts: vdr
+      (>= current-9999) - many thanks to Adeodato Simó for suggesting this
+      (this will hopefully allow vdr+plugins to enter testing without manual
+      hinting)
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  1 Nov 2005 21:43:03 +0100
 

Modified: vdr/vdr/trunk/debian/dependencies.sh
===================================================================
--- vdr/vdr/trunk/debian/dependencies.sh	2005-11-03 00:49:24 UTC (rev 1430)
+++ vdr/vdr/trunk/debian/dependencies.sh	2005-11-03 14:12:50 UTC (rev 1431)
@@ -6,6 +6,5 @@
 
 # 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
+    echo "vdr:Depends=vdr (>= $FIRST_VERSION), vdr (<< $LAST_VERSION)" >> debian/$p.substvars
 done