[vdr] 04/21: Merge branch 'master' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Mar 25 00:19:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch e-tobi
in repository vdr.
commit 21e26da32fa9ecb475202b4e50cc0db0991a8675
Merge: c086a12 2001301
Author: etobi <git at e-tobi.net>
Date: Sun Mar 22 12:14:48 2015 +0100
Merge branch 'master' into e-tobi
Conflicts:
debian/abi-version
debian/changelog
debian/vdr.NEWS
debian/vdr.default
debian/vdr.init
debian/vdr.install
debian/vdr.postinst
debian/00-vdr.conf | 21 +++
debian/README.Debian | 10 --
debian/abi-version | 2 +-
debian/changelog | 15 +-
debian/control | 2 +-
debian/copyright | 4 +-
debian/dependencies.sh | 21 ---
debian/dh-addon-vdrplugin/dh_vdrplugin_depends | 64 ++++++++
debian/dh-addon-vdrplugin/dh_vdrplugin_enable | 182 +++++++++++++++++++++
debian/dh-addon-vdrplugin/dh_vdrplugin_migrate | 92 +++++++++++
.../dh-addon-vdrplugin/postinst-vdrplugin-enable | 22 +++
.../dh-addon-vdrplugin/postinst-vdrplugin-migrate | 56 +++++++
debian/dh-addon-vdrplugin/postrm-vdrplugin-enable | 29 ++++
debian/dh-addon-vdrplugin/postrm-vdrplugin-migrate | 29 ++++
debian/dh-addon-vdrplugin/preinst-vdrplugin-enable | 22 +++
.../dh-addon-vdrplugin/preinst-vdrplugin-migrate | 22 +++
debian/dh-addon-vdrplugin/vdrplugin.pm | 11 ++
debian/dvbhddevice.conf | 7 +
debian/dvbsddevice.conf | 7 +
debian/migrate-old-config.sh | 23 +++
debian/order.conf | 22 ---
debian/plugin-loader.sh | 126 --------------
debian/plugin-template/rules | 15 +-
debian/rules | 4 +
debian/runvdr | 63 -------
debian/runvdr.8 | 27 ---
debian/vdr-dev.install | 11 +-
debian/vdr-dev.manpages | 1 +
debian/vdr-plugin-dvbhddevice.install | 4 +-
debian/vdr-plugin-dvbhddevice.postinst | 11 ++
debian/vdr-plugin-dvbsddevice.install | 2 +
debian/vdr-plugin-dvbsddevice.postinst | 11 ++
debian/vdr.NEWS | 2 +-
debian/vdr.default | 8 -
debian/vdr.init | 27 +--
debian/vdr.install | 8 +-
debian/vdr.manpages | 1 -
debian/vdr.postinst | 96 +++++++++++
debian/vdr.postrm | 1 +
39 files changed, 750 insertions(+), 331 deletions(-)
diff --cc debian/abi-version
index 2f7d0f6,87c2c84..59c04ee
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-2.2.0-multipatch
-vdr-abi-2.2.0-debian
++vdr-abi-2.2.0-multipatch-1
diff --cc debian/changelog
index 2091e72,b378739..db7cab3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,25 +1,54 @@@
-vdr (2.2.0-1) UNRELEASED; urgency=medium
++vdr (2.2.0-1~etobi5) UNRELEASED; urgency=medium
+
- * New upstream release
- * Dropped upgrade code for pre-Squeeze releases
- * Default video directory is now /var/lib/video because multiple video
- directories are not supported anymore
- * When LIRC is set to an empty string, disable LIRC. By default use
- /var/run/lirc/lircd
+ * Updated copyright
+ * Arguments for vdr are now read from /etc/vdr/conf.d/
+ * Plugins must provide a config, which may cointain plugin arguments, in
+ /etc/vdr/conf.d/ in order to be loaded
+ * Install a debhelper addon in vdr-dev which supports the plugin packaging
+ * Delete /etc/vdr/conf.d on purge
+ * Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the
+ --chartab command line argument
+ * Removed dvb-modules reloading code (Closes: #512362)
+
- -- Tobias Grimm <etobi at debian.org> Sat, 07 Mar 2015 13:02:02 +0100
++ -- Tobias Grimm <etobi at debian.org> Sun, 22 Mar 2015 12:12:25 +0100
++
+vdr (2.2.0-1~etobi4) unstable; urgency=medium
+
+ * Install channels.conf.sat as default channels.conf file
+ * Dropped the default video directory link
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 12 Mar 2015 16:09:09 +0100
+
+vdr (2.2.0-1~etobi3) unstable; urgency=medium
+
+ * When LIRC is set to an empty string, disable LIRC. By default use
+ /var/run/lirc/lircd
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 01 Mar 2015 19:33:54 +0100
+
+vdr (2.2.0-1~etobi2) unstable; urgency=medium
+
+ * Dropped upgrade code for pre-Squeeze releases
+ * Default video directory is now /var/lib/video because multiple video
+ directories are not supported anymore
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 22 Feb 2015 11:42:27 +0100
-vdr (2.0.6-2) unstable; urgency=medium
+vdr (2.2.0-1~etobi1) unstable; urgency=medium
+ * New upstream release
+ * New ABI version 2.2.0
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 19 Feb 2015 12:29:13 +0100
+
+vdr (2.1.10-1~etobi1) unstable; urgency=medium
+
+ * New upstream release
-
+ -- Tobias Grimm <etobi at debian.org> Thu, 12 Feb 2015 18:51:55 +0100
+
+vdr (2.1.9-1~etobi1) unstable; urgency=medium
+
+ * New upstream release
* Merged from Jessie-version 2.0.3-3: Fixed use of getent in postinst script
for detecting existing vdr user and group (Closes: #770773)
* Standards-Version: 3.9.6
diff --cc debian/vdr.default
index e25e4b9,ab7070a..befd16c
--- a/debian/vdr.default
+++ b/debian/vdr.default
@@@ -4,12 -4,4 +4,4 @@@
#
# Change to 1 to enable vdr's init-script
-ENABLED=0
+ENABLED=1
-
- # Change this to 1 if you want vdr to be able to shutdown the
- # computer
- ENABLE_SHUTDOWN=1
-
- # Options that will be passed to vdr's commandline
- # for example: OPTIONS="-w 15"
- OPTIONS="-w 60"
diff --cc debian/vdr.install
index 0a879b9,25a6a4e..5afe6cf
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@@ -21,8 -19,7 +19,8 @@@ debian/vdr-recordingactio
debian/vdr-shutdown usr/lib/vdr/
debian/vdr-shutdown.wrapper usr/lib/vdr/
+debian/svdrpsend etc/bash_completion.d/
-
+ debian/00-vdr.conf etc/vdr/conf.d/
debian/vdr.groups etc/vdr/
debian/R90.custom etc/vdr/recording-hooks/
debian/S90.custom etc/vdr/shutdown-hooks/
@@@ -36,5 -32,4 +33,6 @@@ debian/themes/*.them
var/lib/vdr/channels.conf.sat usr/share/vdr/channels.conf-examples/
channels.conf.* usr/share/vdr/channels.conf-examples/
+ debian/migrate-old-config.sh usr/share/vdr/
+
+debian/vdraptrefresh usr/sbin/
diff --cc debian/vdr.postinst
index 65d11da,69b21af..07304d4
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@@ -1,8 -1,32 +1,19 @@@
-#! /bin/sh
-# postinst script for vdr
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+#!/bin/sh
+
+# Peter Siering <ps at ctmagazin.de>, 10/2/2003
+
#
+ # quoting from the policy:
+ # Any necessary prompting should almost always be confined to the
+ # post-installation script, and should be protected with a conditional
+ # so that unnecessary prompting doesn't happen if a package's
+ # installation fails and the `postinst' is called with `abort-upgrade',
+ # `abort-remove' or `abort-deconfigure'.
+
+ # source debconf lib
+ . /usr/share/debconf/confmodule
+
+ #
# Create /var/lib/video if /var/lib/video does not exist.
# If /var/lib/video.00 exists, /var/lib/video will become a symlink
#
@@@ -18,61 -42,98 +29,146 @@@ TryCreateVideoDir()
fi
}
+
+ACTION=$1
+
+# Upgrade <= 1.2.6-26 to a more FHS-conform directory structure
+#
+ InstallChannelsConf() {
+ [ -e /var/lib/vdr/channels.conf ] && return
+ case "$1" in
+ Satellite)
+ cp /usr/share/vdr/channels.conf-examples/channels.conf.sat /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ Terrestrial)
+ cp /usr/share/vdr/channels.conf-examples/channels.conf.terr /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ Cable)
+ cp /usr/share/vdr/channels.conf-examples/channels.conf.cable /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ esac
+ }
+
+ InstallUserAndGroupVdr() {
+ USER=vdr
+ GROUP=vdr
+ if ! getent group "$GROUP"| grep -q "^$GROUP:" ; then
+ echo -n "Adding group $GROUP.."
+ addgroup --quiet --system $GROUP
+ echo "..done"
+ fi
+ if ! getent passwd "$USER"| grep -q "^$USER:"; then
+ echo -n "Adding user $USER.."
+ adduser --system --home /var/lib/vdr --shell /bin/false \
+ --gecos "VDR user" --no-create-home \
+ --disabled-login --disabled-password \
+ --ingroup $GROUP \
+ $USER
+ echo "...done"
+ fi
+
+ # put vdr in group video so that it can access the DVB device nodes
+ adduser $USER video > /dev/null || true
+ }
+
+ ConfigureOwnerShip() {
+ # ensure that vdr's config and recording files are correctly owned
+ [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
+ if [ -e /var/lib/vdr ] ; then
+ chown $USER:$GROUP /var/lib/vdr
+ chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
+ fi
+ if [ -e /var/cache/vdr ] ; then
+ chown $USER:$GROUP /var/cache/vdr
+ chown $USER:$GROUP /var/cache/vdr/* > /dev/null 2>&1|| true
+ fi
+
+ # make /usr/lib/vdr/vdr-shutdown.wrapper setuid/setgid
+ # (owner root:vdr, mode 6750)
+ if [ -e /usr/lib/vdr/vdr-shutdown.wrapper ] ; then
+ chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
+ chmod 6750 /usr/lib/vdr/vdr-shutdown.wrapper
+ fi
+ }
+
+ case "$1" in
+ configure)
+ db_get vdr/select_dvb_card
+ InstallChannelsConf "$RET"
+
+ db_get vdr/create_video_dir
+ if $RET; then
+ TryCreateVideoDir
+ fi
+
+ InstallUserAndGroupVdr
+
+ ConfigureOwnerShip
+
+ if dpkg --compare-versions "$2" lt "2.2.0-1"; then
+ sh /usr/share/vdr/migrate-old-config.sh || true
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+if [ "$ACTION" = "configure" ] ; then
+ TryCreateVideoDir
+
+ # copy example channels.conf file into config dir
+ if [ ! -e /var/lib/vdr/channels.conf ]; then
+ cp /usr/share/doc/vdr/examples/channels.conf-examples/channels.conf.sat /var/lib/vdr/channels.conf
+ fi
+
+ # ensure that user and group 'vdr' exist
+ USER=vdr
+ GROUP=vdr
+ if ! getent group | grep -q "^$GROUP:" ; then
+ echo -n "Adding group $GROUP.."
+ addgroup --quiet --system $GROUP
+ echo "..done"
+ fi
+ if ! getent passwd | grep -q "^$USER:"; then
+ echo -n "Adding user $USER.."
+ adduser --system --home /var/lib/vdr --shell /bin/false \
+ --gecos "VDR user" --no-create-home \
+ --disabled-login --disabled-password \
+ --ingroup $GROUP \
+ $USER
+ echo "...done"
+ fi
+
+ # put vdr in group video so that it can access the DVB device nodes
+ adduser $USER video > /dev/null || true
+
+ # ensure that vdr's config and recording files are correctly owned
+ [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
+ [ -e /var/lib/video.00 ] && chown -R $USER:$GROUP /var/lib/video.00/
+ [ -e /var/lib/video.01 ] && chown -R $USER:$GROUP /var/lib/video.01/
+ if [ -e /var/lib/vdr ] ; then
+ chown -R $USER:$GROUP /var/lib/vdr
+ chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
+ fi
+ if [ -e /var/cache/vdr ] ; then
+ chown $USER:$GROUP /var/cache/vdr
+ chown $USER:$GROUP /var/cache/vdr/* > /dev/null 2>&1|| true
+ fi
+
+ # make /usr/lib/vdr/vdr-shutdown.wrapper setuid/setgid (owner root:vdr, mode 6750)
+ if [ -e /usr/lib/vdr/vdr-shutdown.wrapper ] ; then
+ chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
+ chmod a=,u+srwx,g+srx /usr/lib/vdr/vdr-shutdown.wrapper
+ fi
+fi
+ db_stop
+
+ # dh_installdeb will replace this with shell code automatically
+ # generated by other debhelper scripts.
#DEBHELPER#
exit 0
diff --cc debian/vdr.postrm
index 9dbc969,8b74bc1..7f40872
--- a/debian/vdr.postrm
+++ b/debian/vdr.postrm
@@@ -25,13 -25,11 +25,14 @@@ case "$1" i
rm -f /var/cache/vdr/reccmds.conf > /dev/null 2>&1 || true
rm -f /var/cache/vdr/epg.data > /dev/null 2>&1 || true
rm -f /var/lib/vdr/channels.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/channels.conf.terr > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/channels.conf.cable > /dev/null 2>&1 || true
rm -rf /var/lib/vdr/themes > /dev/null 2>&1 || true
rm -f /var/lib/vdr/remote.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/remote.*.conf > /dev/null 2>&1 || true
rm -f /var/lib/vdr/setup.conf > /dev/null 2>&1 || true
rm -f /var/lib/vdr/timers.conf > /dev/null 2>&1 || true
+ rm -rf /etc/vdr/conf.d
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list