r2474 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-04-21 20:55:36 +0000 (Fri, 21 Apr 2006)
New Revision: 2474

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/control
Log:
vdr: Conflict with older vdradmin-versions, to force users to upgrade to vdradmin-am

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-04-21 20:42:30 UTC (rev 2473)
+++ vdr/vdr/trunk/debian/changelog	2006-04-21 20:55:36 UTC (rev 2474)
@@ -1,4 +1,4 @@
-vdr (1.3.47-1) UNRELEASED; urgency=low
+vdr (1.3.47-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
@@ -7,13 +7,15 @@
     - Updated 10_dd-record-option.dpatch
     - Removed 16_vdr-1.3.46_menuitems.c-fix.dpatch
     - Upgraded opt-24_jumpplay-0.6.dpatch to opt-24_jumpplay-0.7.dpatch
+  * Thomas Schmidt <tschmidt at debian.org>
+    - Conflict with vdradmin (< 3.4.3) to force users to upgrade to
+      vdradmin-am, because the old vdradmin package which is partly 
+      incompatible with newer vdr versions
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 18 Apr 2006 00:53:07 +0200
 
-vdr (1.3.46-1) UNRELEASED; urgency=low
+vdr (1.3.46-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   * New upstream release
   * Thomas Günther <tom at toms-cafe.de>
     - Removed 13_vdr_1.3.45_sources.conf-fix.dpatch

Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control	2006-04-21 20:42:30 UTC (rev 2473)
+++ vdr/vdr/trunk/debian/control	2006-04-21 20:55:36 UTC (rev 2474)
@@ -11,7 +11,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, makedev (>=2.3.1-66), adduser, psmisc
 Recommends: lirc
 Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
-Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
+Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu, vdradmin (< 3.4.3)
 Replaces: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
 Description: Video Disk Recorder for DVB cards
  Video Disk Recorder (VDR) is a digital sat-receiver program using