[SCM] freeplane packaging branch, master, updated. debian/1.1.3-2-52-g4b68a3f

[Felix Natter]

The following commit has been merged in the master branch:
commit 11128c6c17256a08961b35c804eacaaf353e055d
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Mar 30 14:15:40 2013 +0100

    add full license texts to debian/copyright

diff --git a/debian/copyright b/debian/copyright
index f6dee4b..17513b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Freeplane
-Source: <http://freeplane.org>
+Source: http://freeplane.org
+Upstream-Contact: Felix Natter <fnatter at gmx.net>
 
 Files: *
 Copyright: 2000-2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry Polivaev <dpolivaev at gmx.de>
@@ -84,14 +85,42 @@ License: GPL-2+
 Files: ./freeplane/src/org/freeplane/core/ui/components/calendar/*
 Copyright: 2004 Kai Toedter <kai at toedter.com>
 License: LGPL-2+
- see `/usr/share/common-licenses/LGPL-2'.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301, USA.
+ 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.kaiser at web.de>
 License: LGPL-2+
- see `/usr/share/common-licenses/LGPL-2'.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301, USA.
+ See `/usr/share/common-licenses/LGPL-2'.
 
 Files: ./freeplane/src/org/freeplane/core/util/XHTMLWriter.java
        ./freeplane/src/org/freeplane/core/util/FixedHTMLWriter.java
@@ -103,18 +132,36 @@ 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
- * independent mapViews, and to copy and distribute the resulting executable
- * under terms of your choice, provided that you also meet, for each linked
- * independent mapView, the terms and conditions of the license of that mapView.
- * An independent mapView is a mapView which is not derived from or based on
- * 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.
+ .
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+ .
+ As a special exception, the copyright holders of this library give
+ you permission to link this library with independent modules to
+ produce an executable, regardless of the license terms of these
+ independent modules, and to copy and distribute the resulting
+ executable under terms of your choice, provided that you also meet,
+ for each linked independent module, the terms and conditions of the
+ license of that module. An independent module is a module which is
+ not derived from or based on 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
+ 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.
  See `/usr/share/common-licenses/Apache-2.0'.

-- 
freeplane packaging