r627 - in vdr/vdr-xxv/trunk/debian: . scripts upgrade

[Tobias Grimm]

Author: tiber-guest
Date: 2005-05-31 20:01:31 +0000 (Tue, 31 May 2005)
New Revision: 627

Added:
   vdr/vdr-xxv/trunk/debian/upgrade/0.40
Modified:
   vdr/vdr-xxv/trunk/debian/TODO.Debian
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/scripts/read-config.pl
Log:
vdr-xxv: new upstream release

Modified: vdr/vdr-xxv/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-xxv/trunk/debian/TODO.Debian	2005-05-31 15:01:11 UTC (rev 626)
+++ vdr/vdr-xxv/trunk/debian/TODO.Debian	2005-05-31 20:01:31 UTC (rev 627)
@@ -14,10 +14,13 @@
   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
+* FIXME: Handling of defaults should probably be done in dbconfig-common, not
+  in read_config.pl. Defaults are already defined in debian/config!
 
+
 DONE:
 
+* Import database configuration from xxvd.cfg and pass it to dbconfig-common
 * doc is generated, should be under /var
 * Delete logs on purge
 * Bug: password gets deleted, when upgrading

Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2005-05-31 15:01:11 UTC (rev 626)
+++ vdr/vdr-xxv/trunk/debian/changelog	2005-05-31 20:01:31 UTC (rev 627)
@@ -1,3 +1,15 @@
+vdr-xxv (0.40-1) unstable; urgency=low
+
+  * Tobias Grimm <tg@e-tobi.net>
+    - Added SQL update script for 0.40
+    - read-config.pl doesn't raise an error anymore, if the config file does
+      not exist
+    - Set default dbname and dbuser in read_config.pl, because the values in
+      debian/config get overwritten by dbconfig-load-include. This should
+      probably be fixed in dbconfig-common.
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Tue, 31 May 2005 20:11:42 +0200
+
 vdr-xxv (0.35-2) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net>

Modified: vdr/vdr-xxv/trunk/debian/scripts/read-config.pl
===================================================================
--- vdr/vdr-xxv/trunk/debian/scripts/read-config.pl	2005-05-31 15:01:11 UTC (rev 626)
+++ vdr/vdr-xxv/trunk/debian/scripts/read-config.pl	2005-05-31 20:01:31 UTC (rev 627)
@@ -12,15 +12,34 @@
 # 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"
+$Config = Config::Tiny->read($xxv_config_file);
 
-$dbuser = $Config->{General}->{USR};
-$dbpass = $Config->{General}->{PWD};
+if ($Config)
+{
+    $Config->{_}; # dummy read, otherwise the first value will not be read"
 
-$dsn = $Config->{General}->{DSN};
-if ($dsn =~ /.*database=([^;]*).*/) { $dbname = $1 };
-if ($dsn =~ /.*host=([^;]*).*/)     { $dbserver = $1 };
-if ($dsn =~ /.*port=([^;]*).*/)     { $dbport = $1 };
+    $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 };
+};
+
+#
+# Defaults
+#
+# FIXME: Handling of defaults should probably be done in dbconfig-common
+#
+if (not $dbname) 
+{
+    $dbname="xxv"; 
+};
+
+if (not $dbuser) 
+{
+    $dbuser="xxv"; 
+};
+
 $dbtype = 'mysql';

Added: vdr/vdr-xxv/trunk/debian/upgrade/0.40
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.40	2005-05-31 15:01:11 UTC (rev 626)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.40	2005-05-31 20:01:31 UTC (rev 627)
@@ -0,0 +1,61 @@
+#
+# MySQLDiff 1.5.0
+#
+# http://www.mysqldiff.org
+# (c) 2001-2004, Lippe-Net Online-Service
+#
+# Erstellt am: 31.05.2005 20:53
+#
+# --------------------------------------------------------
+# Quelldatenbank
+# Host: vdr
+# Datenbank: xxv035
+# --------------------------------------------------------
+# Zieldatenbank
+# Host: vdr
+# Datenbank: xxv
+# --------------------------------------------------------
+#
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+#
+# DDL START
+#
+ALTER TABLE AUTOTIMER
+    COMMENT='0.40';
+
+
+ALTER TABLE CHANNELS
+    COMMENT='0.40';
+
+
+ALTER TABLE EPG
+    COMMENT='0.40';
+
+
+ALTER TABLE MUSIC
+    COMMENT='0.40';
+
+
+ALTER TABLE OLDEPG
+    COMMENT='0.40';
+
+
+ALTER TABLE RECORDS
+    COMMENT='0.40';
+
+
+ALTER TABLE TIMERS
+    COMMENT='0.40';
+
+
+ALTER TABLE USER
+    COMMENT='0.40';
+
+
+#
+# DDL ENDE
+#
+
+SET FOREIGN_KEY_CHECKS = 1;