[pkg-java] r15772 - trunk/libapache-poi-java/debian

[Tony Mancill]

Author: tmancill
Date: 2012-02-11 17:27:40 +0000 (Sat, 11 Feb 2012)
New Revision: 15772

Modified:
   trunk/libapache-poi-java/debian/changelog
   trunk/libapache-poi-java/debian/copyright
Log:
convert d/copyright to DEP5; #659067

Modified: trunk/libapache-poi-java/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog	2012-02-10 04:21:27 UTC (rev 15771)
+++ trunk/libapache-poi-java/debian/changelog	2012-02-11 17:27:40 UTC (rev 15772)
@@ -1,3 +1,11 @@
+libapache-poi-java (3.6+dfsg-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Update debian/copyright to DEP5 format; clarify license of 
+    chunks_parse_cmds.tbl.  (Closes: #659067)
+
+ -- tony mancill <tmancill at debian.org>  Sat, 11 Feb 2012 09:25:33 -0800
+
 libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
 
   * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
@@ -173,7 +181,3 @@
   * Initial Release.
 
  -- Christian Bayle <bayle at debian.org>  Sat,  5 Jul 2003 15:42:08 +0200
-
-Local variables:
-mode: debian-changelog
-End:

Modified: trunk/libapache-poi-java/debian/copyright
===================================================================
--- trunk/libapache-poi-java/debian/copyright	2012-02-10 04:21:27 UTC (rev 15771)
+++ trunk/libapache-poi-java/debian/copyright	2012-02-11 17:27:40 UTC (rev 15772)
@@ -1,44 +1,36 @@
-This package was debianized by Christian Bayle <bayle at debian.org>, Sat,  5 Jul 2003 15:42:08 +0200
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Apache POI - the Java API for Microsoft Documents
+Source: http://poi.apache.org
 
-It was downloaded from <http://poi.apache.org>
+Files: *
+Copyright: 2003- The Apache Software Foundation
+  2003- Glen Stampoultzis <glens at apache.org>
+  2003- Nick Burch <nick at apache.org>
+  2003- Rainer Klute <klute at apache.org>
+  2003- Yegor Kozlov <yegor at apache.org>
+License: Apache-2.0
 
-Upstream Authors:
-  Glen Stampoultzis <glens at apache.org>
-  Nick Burch <nick at apache.org>
-  Rainer Klute <klute at apache.org>
-  Yegor Kozlov <yegor at apache.org>
+Files: src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
+Copyright: 2006-2007 Valek Filippov (frob at df.ru)
+License:  Apache-2.0 or GPL-3
 
-Copyright: (C) 2003-2009 The Apache Software Foundation
+Files: debian/*
+Copyright: 2003- Christian Bayle <bayle at debian.org>
+  2005- Wolfgang Baer <WBaer at gmx.de>
+  2006- Arnaud Vandyck <avdyk at debian.org>
+  2007- Michael Koch <konqueror at gmx.de>
+  2007- Rene Engelhard <rene at debian.org>
+  2009- Damien Raude-Morvan <drazzib at debian.org>
+  2009- Torsten Werner <twerner at debian.org>
+  2012- tony mancill <tmancill at debian.org>
+License: Apache-2.0
+X-Comment: It is assumed that package maintainers have licensed their work
+ under terms compatible with upstream licensing terms.
 
-License:
+License: Apache-2.0
+  On Debian GNU/Linux system you can find the complete text of the
+  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
 
-   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
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   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.
-
-The full text of the license can be found at
-`/usr/share/common-licenses/Apache-2.0'.
-
-
-Except "src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl"
-which is licenced under GPLv3:
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 3 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-The full text of the license can be found at
-`/usr/share/common-licenses/GPL-3'.
+License: GPL-3
+  On Debian GNU/Linux system you can find the complete text of the
+  GPL-3 license in '/usr/share/common-licenses/GPL-3'