r586 - in vdr/vdr-xxv/trunk/debian: . patches scripts upgrade
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 22 May 2005 11:14:39 +0000
Author: tiber-guest
Date: 2005-05-22 11:14:38 +0000 (Sun, 22 May 2005)
New Revision: 586
Added:
vdr/vdr-xxv/trunk/debian/scripts/
vdr/vdr-xxv/trunk/debian/scripts/read-config.pl
vdr/vdr-xxv/trunk/debian/scripts/update-config.pl
vdr/vdr-xxv/trunk/debian/upgrade/0.35
Removed:
vdr/vdr-xxv/trunk/debian/update-config.pl
vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427
Modified:
vdr/vdr-xxv/trunk/debian/TODO.Debian
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/config
vdr/vdr-xxv/trunk/debian/control
vdr/vdr-xxv/trunk/debian/install
vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch
vdr/vdr-xxv/trunk/debian/postinst
vdr/vdr-xxv/trunk/debian/postrm
Log:
new release
Modified: vdr/vdr-xxv/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/TODO.Debian 2005-05-22 11:14:38 UTC (rev 586)
@@ -14,6 +14,7 @@
initial installation
* Test installation with no mysql installed / fresh mysql installation
* Ask for auto-start during debconf (/etc/default/vdr-xxv:ENABLED=0|1)
+* Import database configuration from xxvd.cfg and pass it to dbconfig-common
DONE:
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/changelog 2005-05-22 11:14:38 UTC (rev 586)
@@ -1,10 +1,11 @@
-vdr-xxv (0.32+svn20050502-1) UNRELEASED; urgency=low
+vdr-xxv (0.35-1) unstable; urgency=low
- * New upstream release
- * Use debconf_common now
- * TODO: Added database upgrade capability
+ * Tobias Grimm <tg@e-tobi.net>
+ - New upstream release
+ - Use debconf_common now
+ - Added database upgrade capability
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 24 Apr 2005 13:05:32 +0200
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Fri, 13 May 2005 23:30:48 +0200
vdr-xxv (0.20-5) unstable; urgency=low
Modified: vdr/vdr-xxv/trunk/debian/config
===================================================================
--- vdr/vdr-xxv/trunk/debian/config 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/config 2005-05-22 11:14:38 UTC (rev 586)
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-# set -x
+#set -x
. /usr/share/debconf/confmodule
db_version 2.0
@@ -11,7 +11,9 @@
dbc_dbuser="xxv"
dbc_dbname="xxv"
-#FIXME: Read defaults from xxvd.cfg!!!
+# First version using dbconfig-common
+dbc_first_version="0.33-1"
+dbc_load_include="perl:/usr/share/vdr-xxv/debian/read-config.pl"
# source dbconfig-common tools
. /usr/share/debconf/confmodule
Modified: vdr/vdr-xxv/trunk/debian/control
===================================================================
--- vdr/vdr-xxv/trunk/debian/control 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/control 2005-05-22 11:14:38 UTC (rev 586)
@@ -8,7 +8,7 @@
Package: vdr-xxv
Architecture: all
-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
+Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (>= 1.8), vdr (>= 1.2.6-6), mysql-client, 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, libwww-mechanize-formfiller-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/install
===================================================================
--- vdr/vdr-xxv/trunk/debian/install 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/install 2005-05-22 11:14:38 UTC (rev 586)
@@ -1,19 +1,19 @@
-debian/update-config.pl usr/share/vdr-xxv/debian
-debian/upgrade/* usr/share/dbconfig-common/data/vdr-xxv/upgrade/mysql/
+debian/scripts/* usr/share/vdr-xxv/debian
+debian/upgrade/* usr/share/dbconfig-common/data/vdr-xxv/upgrade/mysql/
-bin/xxvd usr/bin/
+bin/xxvd usr/bin/
-locale/de usr/share/locale/
+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/
+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/
-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/
+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/patches/01_libpath.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/patches/01_libpath.dpatch 2005-05-22 11:14:38 UTC (rev 586)
@@ -5,15 +5,15 @@
## DP: Set correct lib path
@DPATCH@
-diff -urNad xxv/bin/xxvd /tmp/dpep.CEDz1t/xxv/bin/xxvd
---- xxv/bin/xxvd 2005-02-09 21:39:46.000000000 +0100
-+++ /tmp/dpep.CEDz1t/xxv/bin/xxvd 2005-02-19 09:37:53.000000000 +0100
-@@ -5,7 +5,7 @@
- use FindBin qw($RealBin);
-
- # Paths for debian installation
--use lib "$RealBin/../lib";
-+use lib "/usr/share/perl5/vdr-xxv/";
-
- my $PATHS = {
- LOGFILE => "/var/log/xxvd.log",
+diff -urNad vdr-xxv-0.35/bin/xxvd /tmp/dpep.cFRBWl/vdr-xxv-0.35/bin/xxvd
+--- vdr-xxv-0.35/bin/xxvd 2005-05-21 16:47:19.000000000 +0200
++++ /tmp/dpep.cFRBWl/vdr-xxv-0.35/bin/xxvd 2005-05-21 17:12:38.000000000 +0200
+@@ -6,7 +6,7 @@
+ use FindBin qw($RealBin);
+
+ # Paths for debian installation
+-use lib "$RealBin/../lib";
++use lib "/usr/share/perl5/vdr-xxv/";
+
+ my $PATHS = {
+ LOGFILE => "/var/log/xxvd.log",
Modified: vdr/vdr-xxv/trunk/debian/postinst
===================================================================
--- vdr/vdr-xxv/trunk/debian/postinst 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/postinst 2005-05-22 11:14:38 UTC (rev 586)
@@ -4,7 +4,7 @@
# see: dh_installdeb(1)
set -e
-# set -x
+#set -x
#
# get port config parameters from debconf
@@ -17,7 +17,7 @@
db_get vdr-xxv/port_telnet ; porttelnet="$RET"
db_get vdr-xxv/port_interface ; portinterface="$RET"
db_get vdr-xxv/port_icecast ; porticecast="$RET"
- db_get vdr-xxv/port_wap ; portwap="$RET"
+ db_get vdr-xxv/port_wap ; portwap="$RET"
fi
}
@@ -71,15 +71,11 @@
# dbconfig-common
. /usr/share/dbconfig-common/dpkg/postinst.mysql
+dbc_first_version="0.33-1"
perl_db_config=/tmp/vdr-xxv-$$.pm
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:
Modified: vdr/vdr-xxv/trunk/debian/postrm
===================================================================
--- vdr/vdr-xxv/trunk/debian/postrm 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/postrm 2005-05-22 11:14:38 UTC (rev 586)
@@ -23,6 +23,7 @@
rm -rf /var/cache/vdr-xxv/doc/* || true
rm -f /var/log/vdr-xxv/* || true
rm -rf /var/cache/vdr-xxv/preview || true
+ rm -f /var/run/vdr-xxv/* || true
;;
remove)
;;
Added: vdr/vdr-xxv/trunk/debian/scripts/read-config.pl
===================================================================
--- vdr/vdr-xxv/trunk/debian/scripts/read-config.pl 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/scripts/read-config.pl 2005-05-22 11:14:38 UTC (rev 586)
@@ -0,0 +1,26 @@
+#
+# Tobias Grimm <tg@e-tobi.net>
+#
+# Read xxv's config file and make database settings available to
+# dbconfig-common
+
+use Config::Tiny;
+
+$xxv_config_file='/var/lib/vdr-xxv/xxvd.cfg';
+
+#
+# Read XXV config file
+#
+$Config = Config::Tiny->new();
+$Config = Config::Tiny->read($xxv_config_file) or die Config::Tiny::errstr
+$Config->{_}; # dummy read, otherwise the first value will not be read"
+
+$dbuser = $Config->{General}->{USR};
+$dbpass = $Config->{General}->{PWD};
+
+$dsn = $Config->{General}->{DSN};
+if ($dsn =~ /.*database=([^;]*).*/) { $dbname = $1 };
+if ($dsn =~ /.*host=([^;]*).*/) { $dbserver = $1 };
+if ($dsn =~ /.*port=([^;]*).*/) { $dbport = $1 };
+
+$dbtype = 'mysql';
Copied: vdr/vdr-xxv/trunk/debian/scripts/update-config.pl (from rev 496, vdr/vdr-xxv/trunk/debian/update-config.pl)
Deleted: vdr/vdr-xxv/trunk/debian/update-config.pl
===================================================================
--- vdr/vdr-xxv/trunk/debian/update-config.pl 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/update-config.pl 2005-05-22 11:14:38 UTC (rev 586)
@@ -1,44 +0,0 @@
-#
-# Tobias Grimm <tg@e-tobi.net>
-#
-# Set all database parameters in the xxv's config file (used by postinst)
-#
-
-use Config::Tiny;
-
-my $Config = Config::Tiny->read($ARGV[1]) or die Config::Tiny::errstr;
-
-if ($ARGV[0] eq "--db")
-{
- require $ARGV[2];
- $Config->{General}->{USR} = $dbuser;
- $Config->{General}->{PWD} = $dbpass;
-
- my $dsn = "DBI:${dbtype}:database=${dbname}";
- if ($dbserver)
- {
- $dsn = "${dsn};host=${dbserver}";
- }
- if ($dbport)
- {
- $dsn = "${dsn};port=${dbport}";
- }
-
- $Config->{General}->{DSN} = $dsn;
-}
-elsif ($ARGV[0] eq "--ports")
-{
- my $porthttp = $ARGV[2];
- my $porttelnet = $ARGV[3];
- my $portinterface = $ARGV[4];
- my $porticecast = $ARGV[5];
- my $portwap = $ARGV[6];
-
- $Config->{HTTPD}->{Port} = $porthttp;
- $Config->{TELNET}->{Port} = $porttelnet;
- $Config->{INTERFACE}->{Port} = $portinterface;
- $Config->{MUSIC}->{port} = $porticecast;
- $Config->{WAPD}->{Port} = $portwap;
-}
-
-$Config->write($ARGV[1]) or die Config::Tiny::errstr;
Deleted: vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.32+svn20050427 2005-05-22 11:14:38 UTC (rev 586)
@@ -1,76 +0,0 @@
-#
-# 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;
Added: vdr/vdr-xxv/trunk/debian/upgrade/0.35
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.35 2005-05-22 10:06:29 UTC (rev 585)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.35 2005-05-22 11:14:38 UTC (rev 586)
@@ -0,0 +1,82 @@
+#
+# MySQLDiff 1.5.0
+#
+# http://www.mysqldiff.org
+# (c) 2001-2004, Lippe-Net Online-Service
+#
+# Create time: 21.05.2005 21:30
+#
+# --------------------------------------------------------
+# Source info
+# Host: localhost
+# Database: xxvold
+# --------------------------------------------------------
+# Target info
+# Host: localhost
+# Database: xxv
+# --------------------------------------------------------
+#
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+#
+# DDL START
+#
+CREATE TABLE `NEXTEPG` (
+ `channel_id` varchar(100) NOT NULL DEFAULT '',
+ `nexttime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
+) TYPE=MyISAM;
+
+CREATE TABLE `VERSION` (
+ `Version` tinyint(4) NOT NULL DEFAULT '0'
+) TYPE=MyISAM;
+
+CREATE TABLE `test` (
+ `a` int(11) NOT NULL DEFAULT 0 auto_increment,
+ PRIMARY KEY (`a`)
+) TYPE=MyISAM COMMENT='V0.30';
+
+ALTER TABLE `AUTOTIMER`
+ ADD `VPS` enum('y','n') NULL DEFAULT 'y' 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') NOT NULL DEFAULT '' AFTER afterminutes;
+
+
+ALTER TABLE `MUSIC`
+ ADD `Id` int(11) NOT NULL DEFAULT 0 auto_increment FIRST,
+ DROP `ID`,
+ DROP PRIMARY KEY,
+ ADD PRIMARY KEY (`Id`);
+
+
+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;
+
+
+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;
+
+
+ALTER TABLE `USER`
+ ADD `Prefs` varchar(100) NULL DEFAULT '' AFTER Level;
+
+
+#
+# DDL END
+#
+
+#
+# DML START
+#
+INSERT INTO `VERSION` (`Version`) VALUES ('2');
+
+#
+# DML END
+#
+
+SET FOREIGN_KEY_CHECKS = 1;