[SCM] vdr packaging repository branch, master, updated. vdr-1.7.16-355-g288473b

[etobi]

The following commit has been merged in the master branch:
commit 3ce43f4235cccbc84487677bdf14dd8edc926951
Author: etobi <git at e-tobi.net>
Date:   Sat Jan 1 16:27:39 2011 +0100

    Dropped conflicts to vdradmin

diff --git a/debian/changelog b/debian/changelog
index 7fcf1a6..6f09e0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ vdr (1.7.16-1) UNRELEASED; urgency=low
   [ Tobias Grimm ]
   * Removed vdr-kbd, vdr-daemon, vdr-lirc and vdr-rcu - /usr/bin/vdr should be
     used instead
+  * Dropped conflicts to vdradmin
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 01 Jan 2011 16:20:54 +0100
 
diff --git a/debian/control b/debian/control
index 0aa5d25..3dc6c8e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, psmisc
 Recommends: lirc, ttf-bitstream-vera | ttf-freefont
 Suggests: vdr-plugin-dvbsddevice
 Provides: ${vdr:Provides}
-Conflicts: vdradmin (<< 3.4.3)
 Description: Video Disk Recorder for DVB cards
  Video Disk Recorder (VDR) is a digital sat-receiver program using
  Linux and DVB technologies. It allows one to record MPEG2 streams,
diff --git a/debian/vdr.NEWS b/debian/vdr.NEWS
index dc28635..7fed55b 100644
--- a/debian/vdr.NEWS
+++ b/debian/vdr.NEWS
@@ -1,3 +1,25 @@
+vdr (1.7.16-1) unstable; urgency=low
+
+  * Changed Full Featured DVB card support
+
+  Starting with VDR 1.7 support for full featured DVB cards (the ones with
+  built-in SDTV video output) requires to install an extra plug-in provided by
+  the vdr-plugin-dvbsddevice package.
+
+  Please also note, that proper trick speed playback with a full featured DVB
+  card, needs an improved av7110 firmware. Oliver Endriss provides such a
+  firmware, which you can download here:
+
+  http://www.escape-edv.de/endriss/firmware/
+
+  * Dropped vdr-* scripts
+
+  The vdr-daemon, vdr-lirc and vdr-rcu wrapper scripts as well as the vdr-kbd
+  binary have been removed from the package. Please use /use/bin/vdr with the
+  options "--no-kbd", "--lirc" and "--rcu" instead.
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 01 Jan 2011 16:24:50 +0100
+
 vdr (1.4.7-1) experimental; urgency=low
 
   The script /usr/lib/vdr/vdr-groups.sh may now be used by plugins to

-- 
vdr packaging repository