[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/7.4.120.14002+dfsg-44-gb8d9b53

[Jo Shields]

The following commit has been merged in the master branch:
commit 9f7c71676e876d4d765a94f3f05070d6161e1f9d
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Jan 28 21:29:27 2010 +0000

    debian/copyright. not as bad as i expected

diff --git a/debian/changelog b/debian/changelog
index 78817f5..b115681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     debian/rules,
     debian/db4o.pc:
     + CLI Policy 0.7 install location
+  * debian/copyright:
+    + Update for new license & new company name
 
   [ Iain Lane ]
   * debian/patches/01-dos2unix.patch: Regenerate; didn't apply before
diff --git a/debian/copyright b/debian/copyright
index 93d1e66..8d72fc4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,16 +4,12 @@ Sat, 11 Nov 2006 12:15:33 -0400.
 It was downloaded from http://www.db4o.com
 
 Copyright Holder: 
-Copyright (C) 2004 - 2006  db4objects Inc.  http://www.db4o.com
+Copyright (C) 2004 - 2009  Versant Corporation http://www.versant.com
 
 License:
    db4o is free software; you can redistribute it and/or modify it under
-   the terms of version 2 of the GNU General Public License as published
-   by the Free Software Foundation and as clarified by db4objects' GPL
-   interpretation policy, available at
-   http://www.db4o.com/about/company/legalpolicies/gplinterpretation/
-   Alternatively you can write to db4objects, Inc., 1900 S Norfolk Street,
-   Suite 350, San Mateo, CA 94403, USA.
+   the terms of version 3 of the GNU General Public License as published
+   by the Free Software Foundation.
 
    db4o is distributed in the hope that it will be useful, but WITHOUT ANY
    WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -21,11 +17,10 @@ License:
    for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+   with this program.  If not, see http://www.gnu.org/licenses/. 
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-Information above was took from License.html file as found at 
-doc/reference/html in source dir.
+Information above was taken from the boilerplate license text included
+in all source files.

-- 
db4o