[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. debian/7.4.121.14026+dfsg-3-3-g489079c

Jo Shields directhex at apebox.org
Sun Aug 14 14:23:59 UTC 2011 

The following commit has been merged in the master branch:
commit 489079c46b13286523283afb6c64b1cbf4b29dd2
Merge: 21891d946b38535f405fb088f3698d5a04b155aa 12bbf3371e6544a8e3362cc8601390c970529535
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Aug 14 15:17:56 2011 +0100

    Merge branch 'upstream'

diff --combined src/Db4oBench/Properties/AssemblyInfo.cs
index 612b5e0,2f71c4d..6058059
--- a/src/Db4oBench/Properties/AssemblyInfo.cs
+++ b/src/Db4oBench/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -18,14 -18,14 +18,14 @@@ using System.Runtime.CompilerServices
  using System.Runtime.InteropServices;
  
  [assembly: AssemblyTitle("Db4oBench")]
- [assembly: AssemblyDescription("Db4oBench 7.4.121.14026 (.NET)")]
+ [assembly: AssemblyDescription("Db4oBench 8.0.184.15484 (.NET)")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  
  [assembly: ComVisible (false)]
  
- [assembly: AssemblyVersion("7.4.121.14026")]
 -[assembly: AssemblyVersion("8.0.184.15484")]
++[assembly: AssemblyVersion("8.0.184.15484")]
diff --combined src/Db4oUnit.Extensions/Properties/AssemblyInfo.cs
index 6558221,b7e5040..72b8cd0
--- a/src/Db4oUnit.Extensions/Properties/AssemblyInfo.cs
+++ b/src/Db4oUnit.Extensions/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -18,16 -18,16 +18,16 @@@ using System.Runtime.CompilerServices
  using System.Security;
  
  [assembly: AssemblyTitle("db4o - database for objects")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  [assembly: AssemblyDelaySign(false)]
  [assembly: AssemblyKeyName("")]
  
  // attributes are automatically set by the build
- [assembly: AssemblyVersion("7.4.121.14026")]
+ [assembly: AssemblyVersion("8.0.184.15484")]
  [assembly: AssemblyKeyFile("")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyDescription("Db4oUnit.Extensions 7.4.121.14026 (.NET)")]
 -[assembly: AssemblyDescription("Db4oUnit.Extensions 8.0.184.15484 (.NET)")]
++[assembly: AssemblyDescription("Db4oUnit.Extensions 8.0.184.15484 (.NET)")]
diff --combined src/Db4oUnit/Properties/AssemblyInfo.cs
index 5302ade,d1e25ed..15100f9
--- a/src/Db4oUnit/Properties/AssemblyInfo.cs
+++ b/src/Db4oUnit/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -18,16 -18,16 +18,16 @@@ using System.Runtime.CompilerServices
  using System.Security;
  
  [assembly: AssemblyTitle("db4o - database for objects")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  [assembly: AssemblyDelaySign(false)]
  [assembly: AssemblyKeyName("")]
  
  // attributes are automatically set by the build
- [assembly: AssemblyVersion("7.4.121.14026")]
+ [assembly: AssemblyVersion("8.0.184.15484")]
  [assembly: AssemblyKeyFile("")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyDescription("Db4oUnit 7.4.121.14026 (.NET)")]
 -[assembly: AssemblyDescription("Db4oUnit 8.0.184.15484 (.NET)")]
++[assembly: AssemblyDescription("Db4oUnit 8.0.184.15484 (.NET)")]
diff --combined src/Db4objects.Db4o.Instrumentation/Properties/AssemblyInfo.cs
index 119fed8,11160f7..eb1359a
--- a/src/Db4objects.Db4o.Instrumentation/Properties/AssemblyInfo.cs
+++ b/src/Db4objects.Db4o.Instrumentation/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -13,23 -13,25 +13,25 @@@ for more details
  
  You should have received a copy of the GNU General Public License along
  with this program.  If not, see http://www.gnu.org/licenses/. */
+ using System;
  using System.Reflection;
  using System.Security;
  
  [assembly: AssemblyTitle("db4o - instrumentation layer")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  
  // attributes are automatically set by the build
- [assembly: AssemblyVersion("7.4.121.14026")]
+ [assembly: AssemblyVersion("8.0.184.15484")]
  [assembly: AssemblyKeyFile("")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyDescription("Db4objects.Db4o.Instrumentation 7.4.121.14026 (.NET)")]
+ [assembly: AssemblyDescription("Db4objects.Db4o.Instrumentation 8.0.184.15484 (.NET)")]
  
  #if !CF
  [assembly: AllowPartiallyTrustedCallers]
- #endif
+ #endif
+ 
 -[assembly: CLSCompliant(true)]
++[assembly: CLSCompliant(true)]
diff --combined src/Db4objects.Db4o/Properties/AssemblyInfo.cs
index 72bba75,20e2704..1536406
--- a/src/Db4objects.Db4o/Properties/AssemblyInfo.cs
+++ b/src/Db4objects.Db4o/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -13,25 -13,31 +13,31 @@@ for more details
  
  You should have received a copy of the GNU General Public License along
  with this program.  If not, see http://www.gnu.org/licenses/. */
+ using System;
  using System.Reflection;
  using System.Security;
  
  [assembly: AssemblyTitle("db4o - database for objects")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  [assembly: AssemblyDelaySign(false)]
  [assembly: AssemblyKeyName("")]
  
  // attributes are automatically set by the build
- [assembly: AssemblyVersion("7.4.121.14026")]
+ [assembly: AssemblyVersion("8.0.184.15484")]
  [assembly: AssemblyKeyFile("")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyDescription("Db4objects.Db4o 7.4.121.14026 (.NET)")]
+ [assembly: AssemblyDescription("Db4objects.Db4o 8.0.184.15484 (.NET)")]
  
- #if !CF
+ #if !CF && !SILVERLIGHT
  [assembly: AllowPartiallyTrustedCallers]
- #endif
+ #endif
+ 
+ #if NET_4_0
+ [assembly: SecurityRules(SecurityRuleSet.Level1)]
+ #endif
+ 
 -[assembly: CLSCompliant(true)]
++[assembly: CLSCompliant(true)]
diff --combined src/drs/Db4objects.Drs/Properties/AssemblyInfo.cs
index 8948c31,a4510d2..a89837a
--- a/src/drs/Db4objects.Drs/Properties/AssemblyInfo.cs
+++ b/src/drs/Db4objects.Drs/Properties/AssemblyInfo.cs
@@@ -1,6 -1,6 +1,6 @@@
  /* This file is part of the db4o object database http://www.db4o.com
  
- Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
+ Copyright (C) 2004 - 2010  Versant Corporation http://www.versant.com
  
  db4o is free software; you can redistribute it and/or modify it under
  the terms of version 3 of the GNU General Public License as published
@@@ -13,19 -13,21 +13,21 @@@ for more details
  
  You should have received a copy of the GNU General Public License along
  with this program.  If not, see http://www.gnu.org/licenses/. */
+ using System;
  using System.Reflection;
  using System.Runtime.InteropServices;
  
  [assembly: AssemblyTitle("dRS")]
- [assembly: AssemblyDescription("Db4objects.Drs 7.4.121.14026 (.NET)")]
+ [assembly: AssemblyDescription("Db4objects.Drs 8.0.184.15484 (.NET)")]
  [assembly: AssemblyConfiguration(".NET")]
- [assembly: AssemblyCompany("db4objects Inc., San Mateo, CA, USA")]
+ [assembly: AssemblyCompany("Versant Corp., Redwood City, CA, USA")]
  [assembly: AssemblyProduct("db4o - database for objects")]
- [assembly: AssemblyCopyright("db4o 2005 - 2009")]
+ [assembly: AssemblyCopyright("Versant Corp. 2000 - 2011")]
  [assembly: AssemblyTrademark("")]
  [assembly: AssemblyCulture("")]
  
  [assembly: ComVisible(false)]
  
- [assembly: AssemblyVersion("7.4.121.14026")]
+ [assembly: AssemblyVersion("8.0.184.15484")]
+ 
 -[assembly: CLSCompliant(true)]
++[assembly: CLSCompliant(true)]

-- 
db4o

More information about the Pkg-cli-libs-commits mailing list