The following commit has been merged in the master branch:
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Mon Nov 28 09:54:19 2011 +0100
diff --git a/debian/copyright b/debian/copyright
index 70488b9..e4739a0 100644
@@ -1,20 +1,29 @@
+Upstream-Name: Collections with generics support
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
+Copyright: © 2001 - 2004, The Apache Software Foundation
+ © 2003 - 2006, Matt Hall
+ © 2003 - 2006, John Watkinson
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- <Including paragraphs>
+ 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".
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
-Copyright: 2011 Giovanni Mascellani <g...@debian.org>
+Copyright: © 2011, Giovanni Mascellani <g...@debian.org>
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,6 +40,3 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
pkg-java-commits mailing list