The following commit has been merged in the master branch:
commit 0defc73bf93456e111733f02bf849ab1739c593b
Author: Felix Natter <fnat...@gmx.net>
Date: Wed Feb 20 15:38:25 2013 +0100
update debian/copyright to copyright-format/1.0
diff --git a/debian/copyright b/debian/copyright
index 3080326..f6dee4b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,79 +1,108 @@
-This work was packaged for Debian by:
-
- Eric Lavarde <d...@zorglub.s.bawue.de> on Sat, 23 Jan 2010 10:47:53 +0100
- and
- Felix Natter <fnat...@gmx.net> 2013
-
-It was downloaded from <http://freeplane.org/>
-
-Upstream Author(s):
-
- Dimitri Polivaev <dpoliv...@gmx.de>
-
-Copyright:
-
- Copyright (C) 2008 Joerg Mueller, Daniel Polansky, Christian Foltin,
Dimitry Polivaev
- Volker Boerchers, Tamas Eppel, Eric Lavarde (and surely many others)
-
-License:
-
- GNU Public License version 2 or later (for most parts, see below),
- see `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is:
-
- Copyright (C) 2010 Eric Lavarde <d...@zorglub.s.bawue.de>
- Copyright (C) 2013 Felix Natter <fnat...@gmx.net>
-
-and is licensed under the same version as the overwhelming majority of the
-software itself, i.e. GPLv2 or later.
-see `/usr/share/common-licenses/GPL-2'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Freeplane
+Source: <http://freeplane.org>
+
+Files: *
+Copyright: 2000-2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry
Polivaev <dpoliv...@gmx.de>
+ 2008-2013 Dimitry Polivaev <dpoliv...@gmx.de>, Volker Börchers
<boerc...@web.de>
+ 2008-2013 Others
+License: GPL-2+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2010-2012 Eric Lavarde <d...@zorglub.s.bawue.de>
+ 2013 Felix Natter <fnat...@gmx.net>
+License: GPL-2+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
# Files with different license and/or copyright:
Files: ./freeplane/src/org/freeplane/n3/nanoxml/*
- This file is part of NanoXML 2 for Java.
- Copyright (C) 2000-2002 Marc De Scheemaecker, All Rights Reserved. This
- software is provided 'as-is', without any express or implied warranty. In
no
- event will the authors be held liable for any damages arising from the use
of
- this software. Permission is granted to anyone to use this software for any
- purpose, including commercial applications, and to alter it and
redistribute
- it freely, subject to the following restrictions: 1. The origin of this
- software must not be misrepresented; you must not claim that you wrote the
- original software. If you use this software in a product, an acknowledgment
- in the product documentation would be appreciated but is not required. 2.
- Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software. 3. This notice may not be
- removed or altered from any source distribution.
+Copyright: 2000-2002 Marc De Scheemaecker
+License: NanoXML2 License
+ This file is part of NanoXML 2 for Java.
+ Copyright (C) 2000-2002 Marc De Scheemaecker, All Rights Reserved. This
+ software is provided 'as-is', without any express or implied warranty. In no
+ event will the authors be held liable for any damages arising from the use of
+ this software. Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions: 1. The origin of this
+ software must not be misrepresented; you must not claim that you wrote the
+ original software. If you use this software in a product, an acknowledgment
+ in the product documentation would be appreciated but is not required. 2.
+ Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software. 3. This notice may not be
+ removed or altered from any source distribution.
Files: ./JOrtho_0.4_freeplane/src/com/inet/jortho/*
- Copyright (C) 2005-2008 by i-net software
- GNU Public License version 2 or later,
- see `/usr/share/common-licenses/GPL-2'.
-
-Files: ./freeplane/src/org/freeplane/features/common/time/swing/*
- Copyright 2004 Kai Toedter * k...@toedter.com www.toedter.com
- License LGPL (v2 or later)
- see `/usr/share/common-licenses/LGPL-2'.
-
-Files:
-./freeplane/src/org/freeplane/features/controller/print/BrowseAction.java
-./freeplane/src/org/freeplane/features/controller/print/PreviewDialog.java
-./freeplane/src/org/freeplane/features/controller/print/Preview.java
- Copyright 2003 Jens Kaiser <jens.kai...@web.de>
- License LGPL (v2 or later)
- see `/usr/share/common-licenses/LGPL-2'.
-
-Files:
-./freeplane/src/org/freeplane/core/util/XHTMLWriter.java
-./freeplane/src/org/freeplane/core/util/FixedHTMLWriter.java
- (C) 2004 Richard "Shred" Koerber http://www.shredzone.net/
- This is free software. You can modify and use it at will.
-
-File:
./freeplane/src/org/freeplane/features/common/addins/encrypt/Base64Coding.java
- (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
- License GPLv2 or later (with classpath exception, see below)
- see `/usr/share/common-licenses/GPL-2'.
+Copyright: 2005-2008 i-net software
+License: GPL-2+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: ./freeplane/src/org/freeplane/core/ui/components/calendar/*
+Copyright: 2004 Kai Toedter <k...@toedter.com>
+License: LGPL-2+
+ see `/usr/share/common-licenses/LGPL-2'.
+
+Files: ./freeplane/src/org/freeplane/features/print/BrowseAction.java
+ ./freeplane/src/org/freeplane/features/print/PreviewDialog.java
+ ./freeplane/src/org/freeplane/features/print/Preview.java
+Copyright: 2003 Jens Kaiser <jens.kai...@web.de>
+License: LGPL-2+
+ see `/usr/share/common-licenses/LGPL-2'.
+
+Files: ./freeplane/src/org/freeplane/core/util/XHTMLWriter.java
+ ./freeplane/src/org/freeplane/core/util/FixedHTMLWriter.java
+Copyright: 2004 Richard "Shred" Koerber
+License: public-domain
+ This is free software. You can modify and use it at will.
+
+Files: ./freeplane/src/org/freeplane/features/encrypt/Base64Coding.java
+Copyright: 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+License: GPL-2+ with classpath exception
+ see `/usr/share/common-licenses/GPL-2'.
* As a special exception, the copyright holders of
* this library give you permission to link this library with independent
* mapViews to produce an executable, regardless of the license terms of these
@@ -84,3 +113,8 @@ File:
./freeplane/src/org/freeplane/features/common/addins/encrypt/Base64Coding.
* this library. If you modify this library, you may extend this exception to
* your version of the library, but you are not obligated to do so. If you do
* not wish to do so, delete this exception statement from your version.
+
+Files: ./freeplane/src/com/thebuzzmedia/imgscalr/*
+Copyright: 2011 The Buzz Media, LLC
+License: Apache-2
+ See `/usr/share/common-licenses/Apache-2.0'.
--
freeplane packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
