[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.11_dfsg-4-4-gd4fafc5

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 4f34cfcc34386d689a643fffa3cb7138cd61ea98
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Fri Nov 30 16:33:33 2012 +0000

    Remove useless debug infos from SQLite patch

diff --git a/debian/patches/1011_fix_sqlite_db_upgrade b/debian/patches/1011_fix_sqlite_db_upgrade
index c0a5bb0..b191fa1 100644
--- a/debian/patches/1011_fix_sqlite_db_upgrade
+++ b/debian/patches/1011_fix_sqlite_db_upgrade
@@ -146,7 +146,7 @@ Last-Update: 2011-11-19
  		    ## Remove temporary DB field
  		    if ($real_struct{$t}{'temporary'}) {
  			unless ($dbh->do("ALTER TABLE $t DROP temporary")) {
-@@ -1285,43 +1300,96 @@
+@@ -1285,43 +1300,93 @@
  			}
  			delete $real_struct{$t}{'temporary'};
  		    }
@@ -200,9 +200,6 @@ Last-Update: 2011-11-19
 +					
 +					}
 +					if ($Conf::Conf{'db_type'} eq 'SQLite') {
-+						# FIXME
-+						print "${t}/${f} -> "; print $real_struct{$t}{$f}; print " => "; print $db_struct{$Conf::Conf{'db_type'}}{$t}{$f}; print "\n";
-+
 +						my @oldfields = ();
 +						foreach my $oldfield (keys %{$real_struct{$t}}) {
 +							if (defined $db_struct{$Conf::Conf{'db_type'}}{${t}}{$oldfield}) {
@@ -273,7 +270,7 @@ Last-Update: 2011-11-19
  	    if ($Conf::Conf{'db_type'} eq 'mysql') {
  		## Check that primary key has the right structure.
  		my $should_update;
-@@ -1460,7 +1528,7 @@
+@@ -1460,7 +1525,7 @@
  		    ## drop previous index
  		    my $success;
  		    foreach my $field (@{$primary{$t}}) {
@@ -282,7 +279,7 @@ Last-Update: 2011-11-19
  			    next;
  			}
  			$success = 1; last;
-@@ -1474,7 +1542,7 @@
+@@ -1474,7 +1539,7 @@
  		    }
  		    
  		    ## Add INDEX

-- 
sympa Debian packaging