r3752 - in vdr/vdr-xxv/trunk/debian: . patches upgrade
Tobias Grimm
tiber-guest at alioth.debian.org
Thu Nov 30 23:27:26 CET 2006
Author: tiber-guest
Date: 2006-11-30 23:27:26 +0100 (Thu, 30 Nov 2006)
New Revision: 3752
Added:
vdr/vdr-xxv/trunk/debian/upgrade/0.80+svn20061130
Removed:
vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch
vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/patches/00list
Log:
* (NOT RELEASED YET) New upstream release
* Removed 02_disable-restart.dpatch - fixed upstream
* Removed 10_RECORDS-missing-same-title.dpatch - fixed upstream
* Added new SQL upgrade script 0.80+svn20061130
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2006-11-11 22:39:39 UTC (rev 3751)
+++ vdr/vdr-xxv/trunk/debian/changelog 2006-11-30 22:27:26 UTC (rev 3752)
@@ -1,3 +1,12 @@
+vdr-xxv (0.80+svn20061130-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+ * Removed 02_disable-restart.dpatch - fixed upstream
+ * Removed 10_RECORDS-missing-same-title.dpatch - fixed upstream
+ * Added new SQL upgrade script 0.80+svn20061130
+
+ -- Tobias Grimm <tg at e-tobi.net> Thu, 30 Nov 2006 22:09:22 +0100
+
vdr-xxv (0.80-3) unstable; urgency=low
* Added 10_RECORDS-missing-same-title.dpatch
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2006-11-11 22:39:39 UTC (rev 3751)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2006-11-30 22:27:26 UTC (rev 3752)
@@ -1,5 +1,2 @@
01_libpath
-02_disable-restart
03_defaults
-
-10_RECORDS-missing-same-title
Deleted: vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch 2006-11-11 22:39:39 UTC (rev 3751)
+++ vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch 2006-11-30 22:27:26 UTC (rev 3752)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_disable-restart.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable restart, because xxv does not run as root and therefore
-## DP: can't run the init script
-
- at DPATCH@
---- vdr-xxv-0.80.orig/bin/xxvd
-+++ vdr-xxv-0.80/bin/xxvd
-@@ -130,12 +130,12 @@
- callback => sub{ more(@_) },
- Level => 'user',
- },
-- restart => {
-- description => gettext('Call initialization script to restart xxv system.'),
-- short => 'restart',
-- callback => sub{ restart(@_) },
-- Level => 'admin',
-- },
-+# restart => {
-+# description => gettext('Call initialization script to restart xxv system.'),
-+# short => 'restart',
-+# callback => sub{ restart(@_) },
-+# Level => 'admin',
-+# },
- },
- };
- return $args;
Deleted: vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch 2006-11-11 22:39:39 UTC (rev 3751)
+++ vdr/vdr-xxv/trunk/debian/patches/10_RECORDS-missing-same-title.dpatch 2006-11-30 22:27:26 UTC (rev 3752)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_RECORDS-missing-same-title.dpatch by Andreas Brachold <vdr04 at deltab.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes Bug in RECORDS module, causing recordings with the same
-## DP: title to appear as a single recording.
-
- at DPATCH@
-diff -urNad vdr-xxv-0.80~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.80/lib/XXV/MODULES/RECORDS.pm
---- vdr-xxv-0.80~/lib/XXV/MODULES/RECORDS.pm 2006-10-20 18:17:13.000000000 +0200
-+++ vdr-xxv-0.80/lib/XXV/MODULES/RECORDS.pm 2006-10-20 18:17:37.000000000 +0200
-@@ -223,7 +223,7 @@
- # The Initprocess
- my $erg = $self->init or return error('Problem to initialze Module');
-
-- # Interval to read channels and put to DB
-+ # Interval to read recordings and put to DB
- Event->timer(
- interval => $self->{interval},
- prio => 6, # -1 very hard ... 6 very low
-@@ -814,7 +814,7 @@
- $title =~ s/%/\%/sg;
-
- # Search in DB
-- my $sql = "SELECT * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= '$start' and UNIX_TIMESTAMP(starttime+duration) <= '$bis' AND title = '$title'";
-+ my $sql = "SELECT * FROM OLDEPG WHERE UNIX_TIMESTAMP(starttime) >= '$start' and UNIX_TIMESTAMP(starttime)+duration <= '$bis' AND title = '$title'";
- if($subtitle) {
- my $st = $subtitle;
- $st =~ s/\'/\\\'/g;
Added: vdr/vdr-xxv/trunk/debian/upgrade/0.80+svn20061130
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.80+svn20061130 2006-11-11 22:39:39 UTC (rev 3751)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.80+svn20061130 2006-11-30 22:27:26 UTC (rev 3752)
@@ -0,0 +1,32 @@
+SET FOREIGN_KEY_CHECKS = 0;
+
+ALTER TABLE AUTOTIMER
+ ADD startdate datetime NULL DEFAULT NULL AFTER Weekdays,
+ ADD stopdate datetime NULL DEFAULT NULL AFTER startdate,
+ ADD count int(11) NULL DEFAULT NULL AFTER stopdate,
+ MODIFY Done set('timer','recording','chronicle') NOT NULL DEFAULT 'timer',
+ ALTER MinLength DROP DEFAULT,
+ ALTER Priority DROP DEFAULT,
+ ALTER Lifetime DROP DEFAULT,
+ ALTER prevminutes DROP DEFAULT,
+ ALTER afterminutes DROP DEFAULT;
+
+ALTER TABLE USER
+ MODIFY Deny set('tlist','alist','rlist','mlist','tedit','aedit','redit','remote','stream','cedit') NULL DEFAULT NULL;
+
+DROP TABLE IF EXISTS CHANNELGROUPS;
+DROP TABLE IF EXISTS CHANNELS;
+DROP TABLE IF EXISTS MUSIC;
+DROP TABLE IF EXISTS EPG;
+DROP TABLE IF EXISTS OLDEPG;
+DROP TABLE IF EXISTS RECORDS;
+DROP TABLE IF EXISTS TIMERS;
+DROP TABLE IF EXISTS CHRONICLE;
+
+INSERT INTO VERSION
+ (Version) VALUES ('23');
+
+REPLACE INTO VERSION
+ (Version) VALUES ('23');
+
+SET FOREIGN_KEY_CHECKS = 1;
More information about the pkg-vdr-dvb-changes
mailing list