r2793 - in vdr/vdr-xxv/trunk/debian: . patches upgrade

Tobias Grimm tiber-guest at costa.debian.org
Sat May 20 16:55:38 UTC 2006


Author: tiber-guest
Date: 2006-05-20 16:55:37 +0000 (Sat, 20 May 2006)
New Revision: 2793

Modified:
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/control
   vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch
   vdr/vdr-xxv/trunk/debian/upgrade/0.71
Log:
- New upstream release
- Bumped vdr dependency to >= 1.4.0-1
- Set default path of mugglei to /usr/lib/vdr-plugin-muggle/mugglei
  (reported by Karsten Wacker <vdr AT kwserver.de>)
- Removed COLLATE from upgrade SQL-Statements, because these are not
  supported by MySQL < 4.1


Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2006-05-20 16:20:01 UTC (rev 2792)
+++ vdr/vdr-xxv/trunk/debian/changelog	2006-05-20 16:55:37 UTC (rev 2793)
@@ -1,3 +1,15 @@
+vdr-xxv (0.72-1) unstable; urgency=low
+
+  * New upstream release
+  * Tobias Grimm <tg at e-tobi.net>
+    - Bumped vdr dependency to >= 1.4.0-1
+    - Set default path of mugglei to /usr/lib/vdr-plugin-muggle/mugglei
+      (reported by Karsten Wacker <vdr AT kwserver.de>)
+    - Removed COLLATE from upgrade SQL-Statements, because these are not
+      supported by MySQL < 4.1
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 20 May 2006 18:54:34 +0200
+
 vdr-xxv (0.71-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-xxv/trunk/debian/control
===================================================================
--- vdr/vdr-xxv/trunk/debian/control	2006-05-20 16:20:01 UTC (rev 2792)
+++ vdr/vdr-xxv/trunk/debian/control	2006-05-20 16:55:37 UTC (rev 2793)
@@ -8,7 +8,7 @@
 
 Package: vdr-xxv
 Architecture: all
-Depends:  ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (> 1.8.12), vdr (>= 1.3.33-1), mysql-client, ttf-bitstream-vera, libdbi-perl, libconfig-tiny-perl, libtemplate-perl, libproc-process-perl, libterm-readline-gnu-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libdate-manip-perl, txt2html, libio-zlib-perl, libxml-simple-perl, libgd-graph-perl, libtext-asciitable-perl, libdigest-hmac-perl, libxml-rss-perl, libnet-xmpp-perl, libevent-perl, libterm-readline-perl-perl, libsoap-lite-perl, liblog-log4perl-perl
+Depends:  ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (> 1.8.12), vdr (>= 1.4.0-1), mysql-client, ttf-bitstream-vera, libdbi-perl, libconfig-tiny-perl, libtemplate-perl, libproc-process-perl, libterm-readline-gnu-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libdate-manip-perl, txt2html, libio-zlib-perl, libxml-simple-perl, libgd-graph-perl, libtext-asciitable-perl, libdigest-hmac-perl, libxml-rss-perl, libnet-xmpp-perl, libevent-perl, libterm-readline-perl-perl, libsoap-lite-perl, liblog-log4perl-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/patches/03_defaults.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch	2006-05-20 16:20:01 UTC (rev 2792)
+++ vdr/vdr-xxv/trunk/debian/patches/03_defaults.dpatch	2006-05-20 16:55:37 UTC (rev 2793)
@@ -2,13 +2,13 @@
 ## 04_static-paths.dpatch by Tobias Grimm <tg at e-tobi.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: hard-code some paths, that most likely wil never be changed on a
-## DP: Debian system
+## DP: Hard-code some paths, that most likely will never need to be
+## DP: changed by a user on a Debian system
 
 @DPATCH@
-diff -urNad vdr-xxv-0.70~/lib/XXV/MODULES/LOGREAD.pm vdr-xxv-0.70/lib/XXV/MODULES/LOGREAD.pm
---- vdr-xxv-0.70~/lib/XXV/MODULES/LOGREAD.pm	2006-04-09 05:41:58.000000000 +0200
-+++ vdr-xxv-0.70/lib/XXV/MODULES/LOGREAD.pm	2006-05-05 21:25:24.000000000 +0200
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/LOGREAD.pm vdr-xxv-0.72/lib/XXV/MODULES/LOGREAD.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/LOGREAD.pm	2006-04-09 05:41:58.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/LOGREAD.pm	2006-05-20 18:37:25.000000000 +0200
 @@ -33,7 +33,7 @@
              tail => {
                  description => sprintf(gettext("Path of command '%s'"),'tail'),
@@ -27,11 +27,25 @@
                  required    => gettext('This is required!'),
              },
          },
-diff -urNad vdr-xxv-0.70~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.70/lib/XXV/MODULES/RECORDS.pm
---- vdr-xxv-0.70~/lib/XXV/MODULES/RECORDS.pm	2006-04-23 20:23:24.000000000 +0200
-+++ vdr-xxv-0.70/lib/XXV/MODULES/RECORDS.pm	2006-05-05 21:25:24.000000000 +0200
-@@ -77,8 +77,8 @@
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/MUSIC.pm vdr-xxv-0.72/lib/XXV/MODULES/MUSIC.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/MUSIC.pm	2006-05-17 19:45:02.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/MUSIC.pm	2006-05-20 18:38:47.000000000 +0200
+@@ -79,8 +79,8 @@
              },
+             mugglei => {
+                 description => gettext('Path to the binary from mugglei.'),
+-                default     => '/usr/local/bin/mugglei',
+-                type        => 'file',
++                default     => '/usr/lib/vdr-plugin-muggle/mugglei',
++                type        => 'hidden', #'file',
+             },
+         },
+         Commands => {
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/RECORDS.pm vdr-xxv-0.72/lib/XXV/MODULES/RECORDS.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/RECORDS.pm	2006-05-11 01:00:27.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/RECORDS.pm	2006-05-20 18:37:25.000000000 +0200
+@@ -78,8 +78,8 @@
+             },
              previewimages => {
                  description => gettext('common directory for preview images'),
 -                default     => '/var/cache/xxv/preview',
@@ -41,9 +55,9 @@
                  required    => gettext('This is required!'),
              },
              vfat => {
-diff -urNad vdr-xxv-0.70~/lib/XXV/MODULES/STATUS.pm vdr-xxv-0.70/lib/XXV/MODULES/STATUS.pm
---- vdr-xxv-0.70~/lib/XXV/MODULES/STATUS.pm	2006-04-09 05:41:59.000000000 +0200
-+++ vdr-xxv-0.70/lib/XXV/MODULES/STATUS.pm	2006-05-05 21:25:24.000000000 +0200
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/STATUS.pm vdr-xxv-0.72/lib/XXV/MODULES/STATUS.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/STATUS.pm	2006-04-09 05:41:59.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/STATUS.pm	2006-05-20 18:37:25.000000000 +0200
 @@ -33,20 +33,20 @@
              whoBinary => {
                  description => sprintf(gettext("Path of command '%s'"),'who'),
@@ -68,9 +82,9 @@
              },
              interval => {
                  description => gettext('Interval in seconds to remember data'),
-diff -urNad vdr-xxv-0.70~/lib/XXV/MODULES/USER.pm vdr-xxv-0.70/lib/XXV/MODULES/USER.pm
---- vdr-xxv-0.70~/lib/XXV/MODULES/USER.pm	2006-04-30 19:25:55.000000000 +0200
-+++ vdr-xxv-0.70/lib/XXV/MODULES/USER.pm	2006-05-05 21:25:24.000000000 +0200
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/USER.pm vdr-xxv-0.72/lib/XXV/MODULES/USER.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/USER.pm	2006-05-17 19:45:02.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/USER.pm	2006-05-20 18:37:25.000000000 +0200
 @@ -62,8 +62,8 @@
              },
              tempimages => {
@@ -82,9 +96,9 @@
                  required    => gettext('This is required!'),
              },
          },
-diff -urNad vdr-xxv-0.70~/lib/XXV/MODULES/VTX.pm vdr-xxv-0.70/lib/XXV/MODULES/VTX.pm
---- vdr-xxv-0.70~/lib/XXV/MODULES/VTX.pm	2006-04-09 05:41:58.000000000 +0200
-+++ vdr-xxv-0.70/lib/XXV/MODULES/VTX.pm	2006-05-05 21:25:24.000000000 +0200
+diff -urNad vdr-xxv-0.72~/lib/XXV/MODULES/VTX.pm vdr-xxv-0.72/lib/XXV/MODULES/VTX.pm
+--- vdr-xxv-0.72~/lib/XXV/MODULES/VTX.pm	2006-04-09 05:41:58.000000000 +0200
++++ vdr-xxv-0.72/lib/XXV/MODULES/VTX.pm	2006-05-20 18:37:25.000000000 +0200
 @@ -27,7 +27,7 @@
              },
              dir => {

Modified: vdr/vdr-xxv/trunk/debian/upgrade/0.71
===================================================================
--- vdr/vdr-xxv/trunk/debian/upgrade/0.71	2006-05-20 16:20:01 UTC (rev 2792)
+++ vdr/vdr-xxv/trunk/debian/upgrade/0.71	2006-05-20 16:55:37 UTC (rev 2793)
@@ -2,11 +2,11 @@
 
 ALTER TABLE AUTOTIMER
     MODIFY Id int(11) unsigned NOT NULL COMMENT '' auto_increment,
-    MODIFY Search text NOT NULL DEFAULT '' COMMENT '' COLLATE latin1_swedish_ci,
+    MODIFY Search text NOT NULL DEFAULT '' COMMENT '',
     MODIFY MinLength tinyint(4) NULL DEFAULT '0' COMMENT '',
     MODIFY Priority tinyint(2) NULL DEFAULT '0' COMMENT '',
     MODIFY Lifetime tinyint(2) NULL DEFAULT '0' COMMENT '',
-    MODIFY Dir text NULL DEFAULT NULL COMMENT '' COLLATE latin1_swedish_ci,
+    MODIFY Dir text NULL DEFAULT NULL COMMENT '',
     MODIFY prevminutes tinyint(4) NULL DEFAULT '0' COMMENT '',
     MODIFY afterminutes tinyint(4) NULL DEFAULT '0' COMMENT '';
 




More information about the pkg-vdr-dvb-changes mailing list