vdr/vdr/debian changelog vdr.config vdr.postinst vdr.templates
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 14 Nov 2004 10:45:37 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv8118/vdr/vdr/debian
Modified Files:
changelog vdr.config vdr.postinst vdr.templates
Log Message:
* removed debconf question about creating the dvb devices
* cleaned up debian/vdr.postinst a little bit
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- changelog 13 Nov 2004 23:12:27 -0000 1.62
+++ changelog 14 Nov 2004 10:45:35 -0000 1.63
@@ -27,17 +27,20 @@
normal vdr-source-tree
- Added debianize-vdrplugin-script and the plugin-template-dir from
c't-vdr
- - Moved lintian-override-file to debian/lintian/vdr
+ - Moved lintian-override file to debian/lintian/vdr
- Added lintian-override to avoid the lintian-warnings for the
plugin-template-scripts
- Cleaned up debin/rules a little bit
- - Default VIDEODIR is now /var/lib/video.00, so new harddiscs can
+ - Default VIDEO_DIR is now /var/lib/video.00, so new harddiscs can
be added very easy by mounting them to /var/lib/video.0{1,2,...}
(if the old directory /var/lib/video exists, create
/var/lib/video.00 as symlink to the old directory, if it does
not exist, /var/lib/video will be a symlink to /var/lib/video.00)
+ - Removed unnecessary debconf-question about creating the dvb
+ devices, they will now be created without any question when they
+ are not existing
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 06 Nov 2004 19:16:11 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 14 Nov 2004 11:38:36 +0100
vdr (1.2.6-5) unstable; urgency=low
Index: vdr.config
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.config,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- vdr.config 21 Apr 2004 14:19:07 -0000 1.1.1.1
+++ vdr.config 14 Nov 2004 10:45:35 -0000 1.2
@@ -21,11 +21,4 @@
db_input high vdr/select_dvb_card || true
db_go
-
-# ask about creating /dev nodes
-if [ ! -e /dev/dvb ]; then
- db_input medium vdr/create_devices || true
- db_go
-fi
-
exit 0
Index: vdr.templates
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.templates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vdr.templates 14 May 2004 11:36:37 -0000 1.3
+++ vdr.templates 14 Nov 2004 10:45:35 -0000 1.4
@@ -22,10 +22,3 @@
By default VDR is configured to use /var/lib/video to store recordings.
You can either create this directory now, or change this behavior later
by modifying the VIDEO_DIR variable in /etc/default/vdr.
-
-Template: vdr/create_devices
-Type: boolean
-Default: true
-_Description: Create DVB device nodes?
- VDR needs device nodes for it to work. They can be created automatically
- for you now, or you can create them yourself later.
Index: vdr.postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vdr.postinst 13 Nov 2004 23:08:17 -0000 1.10
+++ vdr.postinst 14 Nov 2004 10:45:35 -0000 1.11
@@ -33,7 +33,7 @@
# move cfg-files from /etc/vdr to /var/lib/vdr
for FILE in remote.conf setup.conf timers.conf; do
- if [ -e /etc/vdr/$FILE -a ! -e /var/lib/vdr/$FILE ]; then
+ if [ -e /etc/vdr/$FILE ] && [ ! -e /var/lib/vdr/$FILE ]; then
printf "Note: Moving /etc/vdr/$FILE to /var/lib/vdr/$FILE\n"
mv /etc/vdr/$FILE /var/lib/vdr/$FILE
fi
@@ -41,7 +41,6 @@
# install/move channels.conf
if [ ! -e /var/lib/vdr/channels.conf ]; then
-
if [ -e /etc/vdr/channels.conf ]; then
printf "Note: Moving /etc/vdr/channels.conf to /var/lib/vdr/channels.conf\n"
mv /etc/vdr/channels.conf /var/lib/vdr/channels.conf
@@ -50,28 +49,29 @@
case "$RET" in
Satellite)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
;;
-
Terrestrial)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
;;
Cable)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
;;
esac
fi
fi
# create needed devices nodes
- if [ ! -e /dev/dvb ]; then
- db_get vdr/create_devices
- if $RET; then
- cd /dev && MAKEDEV dvb
- fi
+ if [ ! -e /dev/dvb/ ]; then
+ echo -n "Creating DVB-Devices: "
+ cd /dev && MAKEDEV dvb
+ echo "done."
fi
db_get vdr/create_video_dir