r455 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-04-13 16:44:08 +0000 (Wed, 13 Apr 2005)
New Revision: 455

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/control
Log:
vdr: merged r454 (Provides: vdr-daemon...) from branches/sarge into trunk


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-04-13 16:15:34 UTC (rev 454)
+++ vdr/vdr/trunk/debian/changelog	2005-04-13 16:44:08 UTC (rev 455)
@@ -18,6 +18,9 @@
   * Tobias Grimm <tg@e-tobi.net>
     - Don't restrict root capabilities with --allow-root anymore
     - Passing $OPTIONS to binary compatibility test in plugin loader now
+  * Thomas Schmidt <tschmidt@debian.org>
+    - Add "Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu" to package 
+      vdr to ensure smooth upgrades
 
  -- Tobias Grimm <tg@e-tobi.net>  Sun, 10 Apr 2005 17:00:24 +0200
 

Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control	2005-04-13 16:15:34 UTC (rev 454)
+++ vdr/vdr/trunk/debian/control	2005-04-13 16:44:08 UTC (rev 455)
@@ -10,6 +10,7 @@
 Architecture: any
 Depends: ${misc:Depends}, makedev (>=2.3.1-66), adduser
 Recommends: lirc
+Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
 Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
 Replaces: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
 Description: Video Disk Recorder for DVB cards