r496 - in vdr/vdr-xxv/trunk/debian: . upgrade
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 03 May 2005 16:33:35 +0000
Author: tiber-guest
Date: 2005-05-03 16:33:35 +0000 (Tue, 03 May 2005)
New Revision: 496
Added:
vdr/vdr-xxv/trunk/debian/update-config.pl
vdr/vdr-xxv/trunk/debian/upgrade/
vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427
Removed:
vdr/vdr-xxv/trunk/debian/debconf/
Modified:
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/control
vdr/vdr-xxv/trunk/debian/init
vdr/vdr-xxv/trunk/debian/install
vdr/vdr-xxv/trunk/debian/postinst
Log:
vdr-xxv: added database upgrade
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-05-03 16:33:35 UTC (rev 496)
@@ -1,4 +1,4 @@
-vdr-xxv (0.32+svn20050427-1) UNRELEASED; urgency=low
+vdr-xxv (0.32+svn20050502-1) UNRELEASED; urgency=low
* New upstream release
* Use debconf_common now
Modified: vdr/vdr-xxv/trunk/debian/control
===================================================================
--- vdr/vdr-xxv/trunk/debian/control 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/control 2005-05-03 16:33:35 UTC (rev 496)
@@ -8,7 +8,7 @@
Package: vdr-xxv
Architecture: all
-Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (>= 1.7.1), makepasswd, mysql-client, vdr (>= 1.2.6-6), libevent-perl, libdbi-perl, libtimedate-perl, libtime-hires-perl, libmime-base64-perl, libconfig-tiny-perl, libtemplate-perl, libdate-manip-perl, liburi-perl, ttf-bitstream-vera, libproc-process-perl, libwww-mechanize-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph-perl
+Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (>= 1.8), makepasswd, mysql-client, vdr (>= 1.2.6-6), libevent-perl, libdbi-perl, libtimedate-perl, libtime-hires-perl, libmime-base64-perl, libconfig-tiny-perl, libtemplate-perl, libdate-manip-perl, liburi-perl, ttf-bitstream-vera, libproc-process-perl, libwww-mechanize-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libgd-graph-perl
Recommends: mysql-server
Suggests: mplayer, vdr-plugin-osdteletext | vdr-plugin-teletext
Description: Provides a central service to administer VDR
Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/init 2005-05-03 16:33:35 UTC (rev 496)
@@ -4,8 +4,8 @@
#
set -e
+# set -x
-
#
# Username/Group xxv should run on:
#
@@ -56,6 +56,8 @@
#
start()
{
+# start-stop-daemon --start --pidfile $PIDFILE --nicelevel 19 \
+# -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
start-stop-daemon --start --pidfile $PIDFILE --nicelevel 19 \
-c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
}
Modified: vdr/vdr-xxv/trunk/debian/install
===================================================================
--- vdr/vdr-xxv/trunk/debian/install 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/install 2005-05-03 16:33:35 UTC (rev 496)
@@ -1,18 +1,19 @@
-debian/debconf/ usr/share/vdr-xxv/
+debian/update-config.pl usr/share/vdr-xxv/debian
+debian/upgrade/* usr/share/dbconfig-common/data/vdr-xxv/upgrade/mysql/
-bin/xxvd usr/bin/
-html/* usr/share/vdr-xxv/html/default
-wml/ usr/share/vdr-xxv/html/
+bin/xxvd usr/bin/
-lib/Tools.pm usr/share/perl5/vdr-xxv/
-lib/Tie/ usr/share/perl5/vdr-xxv/
-lib/XXV/ usr/share/perl5/vdr-xxv/
-lib/Event/ usr/share/perl5/vdr-xxv/
-lib/Text/ usr/share/perl5/vdr-xxv/
-lib/Module/ usr/share/perl5/vdr-xxv/
-lib/MP3/ usr/share/perl5/vdr-xxv/
+locale/de usr/share/locale/
-doc/docu.tmpl usr/share/vdr-xxv/doc/
-locale/de usr/share/locale/
+html/* usr/share/vdr-xxv/html/default
+wml/ usr/share/vdr-xxv/html/
+doc/docu.tmpl usr/share/vdr-xxv/doc/
+contrib usr/share/vdr-xxv/
-contrib usr/share/vdr-xxv/
+lib/Tools.pm usr/share/perl5/vdr-xxv/
+lib/Tie/ usr/share/perl5/vdr-xxv/
+lib/XXV/ usr/share/perl5/vdr-xxv/
+lib/Event/ usr/share/perl5/vdr-xxv/
+lib/Text/ usr/share/perl5/vdr-xxv/
+lib/Module/ usr/share/perl5/vdr-xxv/
+lib/MP3/ usr/share/perl5/vdr-xxv/
Modified: vdr/vdr-xxv/trunk/debian/postinst
===================================================================
--- vdr/vdr-xxv/trunk/debian/postinst 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/postinst 2005-05-03 16:33:35 UTC (rev 496)
@@ -27,7 +27,7 @@
update_config()
{
if [ "$portconfigure" = "true" ] ; then
- perl /usr/share/vdr-xxv/debconf/update-config.pl --ports $configfile \
+ perl /usr/share/vdr-xxv/debian/update-config.pl --ports $configfile \
$porthttp $porttelnet $portinterface $porticecast $portwap
if [ $? -gt 0 ]; then
echo "Error: Could not write port settings to config file">&2
@@ -35,7 +35,7 @@
fi
fi
if [ "$dbc_install" = "true" ] ; then
- perl /usr/share/vdr-xxv/debconf/update-config.pl --db $configfile \
+ perl /usr/share/vdr-xxv/debian/update-config.pl --db $configfile \
$perl_db_config
if [ $? -gt 0 ]; then
echo "Error: Could not write database settings to config-file">&2
@@ -75,6 +75,11 @@
dbc_generate_include=perl:$perl_db_config
dbc_go vdr-xxv $@
+
+db_reset vdr-xxv/port_configure
+db_input critical vdr-xxv/port_configure || true
+db_go
+
case "$1" in
configure)
# install example config file:
@@ -102,4 +107,6 @@
#DEBHELPER#
+db_stop
+
exit 0
Copied: vdr/vdr-xxv/trunk/debian/update-config.pl (from rev 495, vdr/vdr-xxv/trunk/debian/debconf/update-config.pl)
Added: vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427 2005-04-27 22:53:10 UTC (rev 495)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427 2005-05-03 16:33:35 UTC (rev 496)
@@ -0,0 +1,76 @@
+#
+# MySQLDiff 1.5.0
+#
+# http://www.mysqldiff.org
+# (c) 2001-2004, Lippe-Net Online-Service
+#
+# Create time: 01.05.2005 23:44
+#
+# --------------------------------------------------------
+# Source info
+# Host: localhost
+# SQL-File: xxv-0.20.sql
+# --------------------------------------------------------
+# Target info
+# Host: localhost
+# SQL-File: xxv-0.31.sql
+# --------------------------------------------------------
+#
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+#
+# DDL START
+#
+ALTER TABLE `AUTOTIMER`
+ ADD `VPS` enum('y','n') NULL DEFAULT 'n' AFTER Dir,
+ ADD `prevminutes` int(11) NULL DEFAULT NULL AFTER VPS,
+ ADD `afterminutes` int(11) NULL DEFAULT NULL AFTER prevminutes,
+ ADD `Weekdays` set('Mon','Tue','Wed','Thu','Fri','Sat','Sun') NULL DEFAULT NULL AFTER afterminutes,
+ COMMENT='0.33';
+
+
+ALTER TABLE `CHANNELS`
+ COMMENT='0.33';
+
+
+ALTER TABLE `EPG`
+ COMMENT='0.33';
+
+
+ALTER TABLE `MUSIC`
+ ADD `Id` int(11) NOT NULL DEFAULT 0 auto_increment FIRST,
+ DROP `ID`,
+ DROP PRIMARY KEY,
+ ADD PRIMARY KEY (`Id`),
+ AUTO_INCREMENT=1 COMMENT='0.33';
+
+
+ALTER TABLE `OLDEPG`
+ COMMENT='0.33';
+
+
+ALTER TABLE `RECORDS`
+ ADD `Prio` tinyint(4) NOT NULL DEFAULT '0' AFTER Path,
+ ADD `Lifetime` tinyint(4) NOT NULL DEFAULT '0' AFTER Prio,
+ ADD `Marks` text NULL DEFAULT NULL AFTER Lifetime,
+ COMMENT='0.33';
+
+
+ALTER TABLE `TIMERS`
+ ADD `NextEpgId` int(11) NULL DEFAULT '0' AFTER Collision,
+ ADD `AutotimerId` int(11) NULL DEFAULT '0' AFTER NextEpgId,
+ ADD `addtime` timestamp(14) NULL DEFAULT NULL AFTER AutotimerId,
+ COMMENT='0.33';
+
+
+ALTER TABLE `USER`
+ ADD `Prefs` varchar(100) NULL DEFAULT '' AFTER Level,
+ COMMENT='0.33';
+
+
+#
+# DDL END
+#
+
+SET FOREIGN_KEY_CHECKS = 1;
Property changes on: vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427
___________________________________________________________________
Name: svn:executable
+ *