* prepare release 1.4

4 files changed, 55 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index f6edeab..81efeff 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # $Id$
 
 XXV = xxv
-VERSION = 1.3
+VERSION = 1.4
 
 ### The name of the distribution archive:
 
@@ -15,7 +15,6 @@ TMPDIR = /tmp
 ### The subdirectories:
 
 ### Targets:
-INCLUDE = bin contrib doc etc html share lib locale wml README INSTALL Makefile install.sh install-debian.sh
 EXCLUDE = "*~" "*.bak" "*.org" "*.diff" "xxvd.pid" "$(XXV)-*.tgz"
 
 
@@ -28,14 +27,10 @@ clean:
 
 tmpfolder:
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir -p $(TMPDIR)/$(ARCHIVE)/contrib/
 
 copyfiles:
-	@for i in $(INCLUDE) ;\
-	do \
-	    cp -a $$i $(TMPDIR)/$(ARCHIVE) \
-	|| exit 1;\
-	done
+	@svn export . $(TMPDIR)/$(ARCHIVE)
+
 
 removefiles:
 	@for i in $(EXCLUDE) ;\
@@ -69,8 +64,8 @@ setpermission:
 	@chmod a+x $(TMPDIR)/$(ARCHIVE)/install.sh
 
 dist: tmpfolder\
-    updatesql\
     copyfiles\
+    updatesql\
     removefiles\
     updateversion\
     setpermission
diff --git a/bin/xxvd b/bin/xxvd
index dc8e52a..1dc9055 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -42,7 +42,7 @@ $|++;
 
 my $REV = (split(/ /, '$Revision$'))[1];
 my $MODULES;
-my $VERSION = '1.3'; 
+my $VERSION = '1.4'; 
 my $VDRVERSION = 0;
 my $DBVERSION = 0;
 my $CLEANUP;
diff --git a/contrib/upgrade-xxv-db.sql b/contrib/upgrade-xxv-db.sql
index 3251a99..b1719a6 100644
--- a/contrib/upgrade-xxv-db.sql
+++ b/contrib/upgrade-xxv-db.sql
@@ -2,7 +2,7 @@
 --
 -- Host: localhost    Database: xxv
 -- ------------------------------------------------------
--- Server version	5.0.32-Debian_7etch5
+-- Server version	5.0.51a-24
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -14,6 +14,8 @@
 -- Table structure for table `AUTOTIMER`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `AUTOTIMER` (
   `Id` int(11) unsigned NOT NULL auto_increment,
   `Activ` enum('y','n') default 'y',
@@ -37,11 +39,14 @@ CREATE TABLE IF NOT EXISTS `AUTOTIMER` (
   `keywords` text,
   PRIMARY KEY  (`Id`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `CHRONICLE`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `CHRONICLE` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `hash` varchar(16) NOT NULL default '',
@@ -52,11 +57,14 @@ CREATE TABLE IF NOT EXISTS `CHRONICLE` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `hash` (`hash`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `MEDIALIB_ACTORS`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `MEDIALIB_ACTORS` (
   `name` varchar(255) NOT NULL default '',
   `actorid` varchar(15) NOT NULL default '',
@@ -64,11 +72,14 @@ CREATE TABLE IF NOT EXISTS `MEDIALIB_ACTORS` (
   `checked` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`name`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `MEDIALIB_VIDEODATA`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `MEDIALIB_VIDEODATA` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `md5` varchar(32) default NULL,
@@ -111,21 +122,27 @@ CREATE TABLE IF NOT EXISTS `MEDIALIB_VIDEODATA` (
   FULLTEXT KEY `actors_idx` (`actors`),
   FULLTEXT KEY `comment` (`comment`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `MEDIALIB_VIDEOGENRE`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `MEDIALIB_VIDEOGENRE` (
   `video_id` int(10) unsigned NOT NULL default '0',
   `genre_id` int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (`video_id`,`genre_id`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `MOVETIMER`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `MOVETIMER` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `sourcevid` int(10) unsigned NOT NULL default '1',
@@ -135,58 +152,68 @@ CREATE TABLE IF NOT EXISTS `MOVETIMER` (
   `move` enum('y','n','collision') default 'collision',
   `original` enum('move','keep','copy') default 'move',
   PRIMARY KEY  (`id`),
-  UNIQUE KEY (`sourcevid`,`source`)
-);
-
---
--- Table structure for table `RECORDER`
---
-
-CREATE TABLE IF NOT EXISTS `RECORDER` (
-  `id` int(11) unsigned NOT NULL auto_increment,
-  `active` enum('y','n') default 'y',
-  `master` enum('y','n') default 'n',
-  `host` varchar(100) NOT NULL default 'localhost',
-  `port` smallint(4) unsigned default '2001',
-  `cards` varchar(100) default '',
-  `videodirectory` text default '',
-  PRIMARY KEY  (`id`)
+  UNIQUE KEY `sourcevid` (`sourcevid`,`source`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `USER`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `USER` (
   `Id` int(11) unsigned NOT NULL auto_increment,
   `Name` varchar(100) NOT NULL default '',
   `Password` varchar(32) NOT NULL,
   `Level` set('admin','user','guest') NOT NULL,
-  `Prefs` text default '',
-  `UserPrefs` text default '',
+  `Prefs` text,
+  `UserPrefs` text,
   `Deny` set('tlist','alist','rlist','mlist','tedit','aedit','redit','remote','stream','cedit','media') default NULL,
   `MaxLifeTime` tinyint(2) default '0',
   `MaxPriority` tinyint(2) default '0',
   PRIMARY KEY  (`Id`)
 );
+SET character_set_client = @saved_cs_client;
 
 --
 -- Table structure for table `XMLTV`
 --
 
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
 CREATE TABLE IF NOT EXISTS `XMLTV` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `active` enum('y','n') default 'n',
   `xmltvname` varchar(256) NOT NULL,
-  `vid` int unsigned NOT NULL default '1',
+  `vid` int(10) unsigned NOT NULL default '1',
   `channel` varchar(64) NOT NULL,
   `template` enum('y','n') default 'n',
   `updateinterval` enum('e','d','w') default 'e',
   `source` text NOT NULL,
   `updated` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`),
-  UNIQUE KEY (`vid`,`channel`)
+  UNIQUE KEY `vid` (`vid`,`channel`)
+);
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `RECORDER`
+--
+
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE IF NOT EXISTS `RECORDER` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `active` enum('y','n') default 'y',
+  `master` enum('y','n') default 'n',
+  `host` varchar(100) NOT NULL default 'localhost',
+  `port` smallint(4) unsigned default '2001',
+  `cards` varchar(100) default '',
+  `videodirectory` text,
+  PRIMARY KEY  (`id`)
 );
+SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
@@ -194,4 +221,4 @@ CREATE TABLE IF NOT EXISTS `XMLTV` (
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2008-07-26 18:32:18
+-- Dump completed on 2009-04-13  9:58:19
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index bee8403..ee527ef 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -188,7 +188,7 @@ Changes and bug fixes inside modules:
 + Use regular expressions to compare transponder source to detect collision like '(S19.2E|S13.0),T'
 + rewrite event/news handling
 + dump news event if timer adjusted
-+ Store parameter aux inside timer now as xml structure (autotimautotimer id, keywords)
++ Store parameter aux inside timer now as xml structure (autotimer id, keywords)
 + tlist: display used recorder
 + tlist: add paging support by &start= .. &limit=
 + add more parameter check