[Pkg-voip-commits] r7946 - in /mumble/trunk/debian: changelog patches/0001-Fixed-patch-for-sqlite-syntax.patch patches/series

[slicer-guest at alioth.debian.org]

Author: slicer-guest
Date: Sat Jan  9 19:18:13 2010
New Revision: 7946

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7946
Log:
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Added:
    mumble/trunk/debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/patches/series

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7946&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sat Jan  9 19:18:13 2010
@@ -1,3 +1,10 @@
+mumble (1.2.1-2) unstable; urgency=low
+
+  * Fix upgrade failure when upgrading mumble-server directly from 1.1.x
+    to 1.2.1
+
+ -- Thorvald Natvig <slicer at users.sourceforge.net>  Sat, 09 Jan 2010 19:28:50 +0100
+
 mumble (1.2.1-1) unstable; urgency=low
 
   * New upstream release.

Added: mumble/trunk/debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch?rev=7946&op=file
==============================================================================
--- mumble/trunk/debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch (added)
+++ mumble/trunk/debian/patches/0001-Fixed-patch-for-sqlite-syntax.patch Sat Jan  9 19:18:13 2010
@@ -1,0 +1,44 @@
+From e11e8a72dad3c9dc7b29891917e153f645bfd04d Mon Sep 17 00:00:00 2001
+From: Thorvald Natvig <slicer at users.sourceforge.net>
+Date: Sat, 9 Jan 2010 15:41:54 +0100
+Subject: [PATCH] Fixed patch for sqlite syntax
+
+---
+ src/murmur/ServerDB.cpp |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
+index e2a402b..d78f4f0 100644
+--- a/src/murmur/ServerDB.cpp
++++ b/src/murmur/ServerDB.cpp
+@@ -332,7 +332,8 @@ ServerDB::ServerDB() {
+ 		} else {
+ 			qWarning("Importing old data...");
+ 
+-			SQLDO("SET FOREIGN_KEY_CHECKS = 0;");
++			if (Meta::mp.qsDBDriver != "QSQLITE")
++				SQLDO("SET FOREIGN_KEY_CHECKS = 0;");
+ 			SQLDO("INSERT INTO `%1servers` (`server_id`) SELECT `server_id` FROM `%1servers_old`");
+ 			SQLDO("INSERT INTO `%1slog` (`server_id`, `msg`, `msgtime`) SELECT `server_id`, `msg`, `msgtime` FROM `%1slog_old`");
+ 			SQLDO("INSERT INTO `%1config` (`server_id`, `key`, `value`) SELECT `server_id`, `keystring`, `value` FROM `%1config_old`");
+@@ -342,7 +343,8 @@ ServerDB::ServerDB() {
+ 			SQLDO("INSERT INTO `%1group_members` (`group_id`, `server_id`, `user_id`, `addit`) SELECT `group_id`, `server_id`, `player_id`, `addit` FROM `%1group_members_old`");
+ 			SQLDO("INSERT INTO `%1acl` (`server_id`, `channel_id`, `priority`, `user_id`, `group_name`, `apply_here`, `apply_sub`, `grantpriv`, `revokepriv`) SELECT `server_id`, `channel_id`, `priority`, `player_id`, `group_name`, `apply_here`, `apply_sub`, `grantpriv`, `revokepriv` FROM `%1acl_old`");
+ 			SQLDO("INSERT INTO `%1channel_links` (`server_id`, `channel_id`, `link_id`) SELECT `server_id`, `channel_id`, `link_id` FROM `%1channel_links_old`");
+-			SQLDO("SET FOREIGN_KEY_CHECKS = 1;");
++			if (Meta::mp.qsDBDriver != "QSQLITE")
++				SQLDO("SET FOREIGN_KEY_CHECKS = 1;");
+ 
+ 			QList<QList<QVariant> > ql;
+ 			SQLPREP("SELECT `server_id`, `base`, `mask` FROM `%1bans_old`");
+@@ -390,6 +392,7 @@ ServerDB::ServerDB() {
+ 			SQLDO("DROP TABLE IF EXISTS `%1acl_old`");
+ 			SQLDO("DROP TABLE IF EXISTS `%1channel_links_old`");
+ 			SQLDO("DROP TABLE IF EXISTS `%1bans_old`");
++			SQLDO("DROP TABLE IF EXISTS `%1servers_old`");
+ 
+ 			SQLDO("UPDATE `%1meta` SET `value` = '4' WHERE `keystring` = 'version'");
+ 		}
+-- 
+1.6.4
+

Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=7946&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Sat Jan  9 19:18:13 2010
@@ -1,1 +1,1 @@
-
+0001-Fixed-patch-for-sqlite-syntax.patch