[SCM] branch, master, updated. debian/0.44-2-12-g03ed5c3

[gregor herrmann]

The following commit has been merged in the master branch:
commit 8f4ac05f5bdd7b59c53ef422269787f4e656feda
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Sep 23 22:35:19 2011 +0200

    debian/copyright: update formatting, add info about third-party files, add
    Apache-2.0 license stanza.

diff --git a/debian/copyright b/debian/copyright
index 136d3d3..ef0e896 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,55 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Kristina Chodorow <kristina at mongodb.org>
+Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135
+Maintainer:  Kristina Chodorow <kristina at 10gen.com>
 Source: http://search.cpan.org/dist/MongoDB/
-Name: MongoDB - Mongo Driver for Perl
+Name: MongoDB
 
 Files: *
-Copyright: This software is Copyright (c) 2009 by 10Gen.
+Copyright: 2009, 10gen, Inc.
 License: Apache-2.0
 
+Files: inc/Module/*
+Copyright: 2002-2011, Adam Kennedy <adamk at cpan.org>
+ 2002-2011, Audrey Tang <autrijus at autrijus.org>
+ 2002-2011, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
+
+Files: ppport.h
+Copyright: 2004-2010, Marcus Holland-Moritz <mhx-cpan at gmx.net>
+ 2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
+ 1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
+License: Artistic or GPL-1+
+
 Files: debian/*
 Copyright: 2010, Stefan Hornburg (Racke) <racke at linuxia.de>
-License: GPL-2+
+ 2011, Dominic Hargreaves <dom at earth.li>
+ 2011, gregor herrmann <gregoa at debian.org>
+License: unparsable or Artistic or GPL-1+
+
+License: Apache-2.0
+ Licensed under Apache License, Version 2.0 (the "License"). You may not
+ use this file except in compliance with the License. A copy of the
+ License was distributed with this file or you may obtain a copy of the
+ License from http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Files produced as output though the use of this software, shall not be
+ considered Derivative Works, but shall be considered the original work
+ of the Licensor.
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License, Version 2.0
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
 
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
  .
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
  This program is free software; you can redistribute it and/or modify
@@ -24,5 +57,5 @@ License: GPL-1+
  the Free Software Foundation; either version 1, or (at your option)
  any later version.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

--