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

Sat Jan 1 15:49:34 UTC 2011

The following commit has been merged in the master branch:
commit 4476af4aba93c59044362d3f9302c13c3785c26b
Author: etobi <git at e-tobi.net>
Date:   Sat Jan 1 16:23:05 2011 +0100

    Removed vdr-kbd, vdr-daemon, vdr-lirc and vdr-rcu - /usr/bin/vdr should be used instead

diff --git a/debian/NEWS b/debian/NEWS
index 612ae19..a6b4f4f 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,5 +1,7 @@
 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.
@@ -10,4 +12,10 @@ vdr (1.7.16-1) unstable; urgency=low
 
   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, 04 Dec 2010 11:00:54 +0100
diff --git a/debian/README.Debian b/debian/README.Debian
index 3bd9c6a..d3ecc0a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -24,10 +24,6 @@ Comments to the Debian version:
    ENABLED=0 to ENABLED=1, and the other options in this file
  - video-dir is moved to /var/lib/video see #234429
  - cfg-dir was moved to /var/lib/vdr, to be FHS-compliant
- - The selection of your favourite vdr-binary (vdr-daemon, vdr-kbd, vdr-lirc or 
-   vdr-rcu) is now handled via update-alternatives, so if you have more than 
-   one of these packages installed, and are not happy with the default 
-   priorities, you can select the binary via "update-alternatives --config vdr"
 
 
 Additional configuration options
diff --git a/debian/changelog b/debian/changelog
index 1e8767f..7fcf1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,11 @@ vdr (1.7.16-1) UNRELEASED; urgency=low
   * Update Vcs-* fields: Move packaging from svn to git
   * Fixed some lintian warnings 
 
- -- Thomas Schmidt <tschmidt at debian.org>  Mon, 29 Nov 2010 21:15:39 +0100
+  [ Tobias Grimm ]
+  * Removed vdr-kbd, vdr-daemon, vdr-lirc and vdr-rcu - /usr/bin/vdr should be
+    used instead
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 01 Jan 2011 16:20:54 +0100
 
 vdr (1.6.0-19.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 405a3c5..0aa5d25 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, psmisc
 Recommends: lirc, ttf-bitstream-vera | ttf-freefont
 Suggests: vdr-plugin-dvbsddevice
-Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu, ${vdr:Provides}
-Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu, vdradmin (<< 3.4.3)
-Replaces: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
+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/rules b/debian/rules
index eda7990..0960b14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,6 @@ build-stamp: configure-stamp
 
 	# build "productive" vdr
 	$(MAKE) all $(MAKE_OPTIONS)
-	ln -f vdr vdr-kbd
 
 	# plugins
 	mkdir -p PLUGINS/lib
@@ -96,7 +95,7 @@ clean-patched:
 	$(MAKE) -o .dependencies clean-plugins $(MAKE_OPTIONS)
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f vdr-dbg
-	rm -f vdr-kbd
+	rm -f vdr
 	rm -rf PLUGINS/lib
 	rm -f vdr-newplugin
 	rm -f debian/vdr-shutdown.wrapper
diff --git a/debian/scripts/vdr-daemon b/debian/scripts/vdr-daemon
deleted file mode 100644
index 82dc245..0000000
--- a/debian/scripts/vdr-daemon
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-exec /usr/bin/vdr-kbd "$@" --no-kbd
diff --git a/debian/scripts/vdr-lirc b/debian/scripts/vdr-lirc
deleted file mode 100644
index 24cd05b..0000000
--- a/debian/scripts/vdr-lirc
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-exec /usr/bin/vdr-kbd "$@" --lirc
diff --git a/debian/scripts/vdr-rcu b/debian/scripts/vdr-rcu
deleted file mode 100644
index edc6912..0000000
--- a/debian/scripts/vdr-rcu
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/sh
-exec /usr/bin/vdr-kbd "$@" --rcu
diff --git a/debian/vdr.install b/debian/vdr.install
index 883d60d..a077e0e 100644
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@ -1,7 +1,4 @@
-vdr-kbd                   usr/bin/
-debian/scripts/vdr-daemon usr/bin/
-debian/scripts/vdr-lirc   usr/bin/
-debian/scripts/vdr-rcu    usr/bin/
+vdr                       usr/bin/
 
 debian/runvdr usr/sbin/
 
diff --git a/debian/vdr.links b/debian/vdr.links
index 7fb564f..75b7df0 100644
--- a/debian/vdr.links
+++ b/debian/vdr.links
@@ -12,11 +12,6 @@ etc/vdr/keymacros.conf   var/lib/vdr/keymacros.conf
 etc/vdr/sources.conf     var/lib/vdr/sources.conf
 etc/vdr/svdrphosts.conf  var/lib/vdr/svdrphosts.conf
 
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-daemon.1.gz
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-kbd.1.gz
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-lirc.1.gz
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-rcu.1.gz
-
 var/lib/vdr/setup.conf       etc/vdr/setup.conf
 var/lib/vdr/remote.conf      etc/vdr/remote.conf
 var/lib/vdr/channels.conf    etc/vdr/channels.conf
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index 1817c55..9c0a60d 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -119,11 +119,12 @@ case "$1" in
             chmod 6750 /usr/lib/vdr/vdr-shutdown.wrapper
         fi
 
-        # Install alternatives for the different control methods
-        update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc   120
-        update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd    110
-        update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu    105
-        update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
+        # Dropped alternatives from old package version
+        # (This can be dropped at squeeze +2)
+        update-alternatives --remove vdr /usr/bin/vdr-daemon
+        update-alternatives --remove vdr /usr/bin/vdr-kbd
+        update-alternatives --remove vdr /usr/bin/vdr-lirc
+        update-alternatives --remove vdr /usr/bin/vdr-rcu
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/vdr.prerm b/debian/vdr.prerm
deleted file mode 100644
index 52f986a..0000000
--- a/debian/vdr.prerm
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-# prerm script for vdr
-#
-# see: dh_installdeb(1)
-
-set -e
-
-case "$1" in
-  remove)
-        update-alternatives --remove vdr /usr/bin/vdr-daemon
-        update-alternatives --remove vdr /usr/bin/vdr-kbd
-        update-alternatives --remove vdr /usr/bin/vdr-lirc
-        update-alternatives --remove vdr /usr/bin/vdr-rcu
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0

-- 
vdr packaging repository

