r1481 - in vdr/vdr-xxv/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-11-12 22:05:23 +0000 (Sat, 12 Nov 2005)
New Revision: 1481

Removed:
   vdr/vdr-xxv/trunk/debian/patches/91_dbversion.dpatch
Modified:
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/patches/00list
Log:
new SVN version

Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2005-11-12 21:20:25 UTC (rev 1480)
+++ vdr/vdr-xxv/trunk/debian/changelog	2005-11-12 22:05:23 UTC (rev 1481)
@@ -1,3 +1,11 @@
+vdr-xxv (0.50+svn599-1) unstable; urgency=low
+
+  * Tobias Grimm <tg at e-tobi.net>
+    - New upstream SVN version
+    - Removed patch to let xxv set db version - fixed in upstream
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 12 Nov 2005 22:58:02 +0100
+
 vdr-xxv (0.50+svn584-3) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list	2005-11-12 21:20:25 UTC (rev 1480)
+++ vdr/vdr-xxv/trunk/debian/patches/00list	2005-11-12 22:05:23 UTC (rev 1481)
@@ -1,3 +1,2 @@
 01_libpath
 03_defaults
-91_dbversion

Deleted: vdr/vdr-xxv/trunk/debian/patches/91_dbversion.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/91_dbversion.dpatch	2005-11-12 21:20:25 UTC (rev 1480)
+++ vdr/vdr-xxv/trunk/debian/patches/91_dbversion.dpatch	2005-11-12 22:05:23 UTC (rev 1481)
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_dbversion.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-xxv-0.50+svn584~/bin/xxvd vdr-xxv-0.50+svn584/bin/xxvd
---- vdr-xxv-0.50+svn584~/bin/xxvd	2005-11-06 17:41:50.000000000 +0100
-+++ vdr-xxv-0.50+svn584/bin/xxvd	2005-11-06 17:42:43.000000000 +0100
-@@ -445,7 +445,7 @@
-     # Keine Versionstabelle?
-     unless(tableExists($dbh, 'VERSION')) {
-         $dbh->do("create table `VERSION` ( `Version` tinyint (4)  DEFAULT '0' NOT NULL );");
--        $dbh->do("insert into  `VERSION` ( `Version` ) values ( '1' );");
-+        $dbh->do(sprintf("insert into  `VERSION` ( `Version` ) values ( '%s' );", &getActualDbVersion()));
-     }
-     my $row = $dbh->selectrow_hashref('select * from VERSION');
-     return $row->{Version};
-@@ -554,12 +554,19 @@
- }
- 
- # ------------------
-+sub getActualDbVersion {
-+# ------------------
-+    my $cmd       = sprintf('%s/update-xxv', $PATHS->{CONTRIB});
-+    my ($aver) = (`$cmd -v`)[-1] =~ /\'(\d+)\'/;
-+    return $aver;
-+}
-+
-+# ------------------
- sub checkDB {
- # ------------------
-     my $dbh = shift || return error('No DB Handle');
-     my $dbversion = &getDBVersion($dbh);
--    my $cmd       = sprintf('%s/update-xxv', $PATHS->{CONTRIB});
--    my ($aver) = (`$cmd -v`)[-1] =~ /\'(\d+)\'/;
-+    my $aver = &getActualDbVersion();
- 
-     unless($dbversion == $aver) {
-         return undef, sprintf(gettext(q|