This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository freeplane.
commit 68c6d36c041a60186ca921c49c09237ee4cfee16 Author: Felix Natter <[email protected]> Date: Fri Oct 16 20:34:20 2015 +0200 fix lintians in debian/copyright --- debian/changelog | 3 +- debian/copyright | 109 +++++++++++++++++-------------------------------------- 2 files changed, 36 insertions(+), 76 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b2e6be..1b6265c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ freeplane (1.3.15-3) experimental; urgency=medium * Upgrade JMapViewer to 1.11 (Closes: #801475) * Remove freeplane.menu because freeplane.desktop exists * Upgrade to debhelper 9 + * Fix debian/copyright (dep5-copyright-license-name-not-unique) - -- Felix Natter <[email protected]> Thu, 15 Oct 2015 15:47:58 +0200 + -- Felix Natter <[email protected]> Fri, 16 Oct 2015 20:07:34 +0200 freeplane (1.3.15-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 9145ded..2e9a0c1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,41 +8,11 @@ Copyright: 2000-2008 Joerg Mueller, Daniel Polansky, Christian Foltin, Dimitry P 2008-2015 Dimitry Polivaev <[email protected]>, Volker Börchers <[email protected]>, Felix Natter <[email protected]> 2008-2015 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 <[email protected]> 2013-2015 Felix Natter <[email protected]> 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/resources/html/deployJava.js freeplane/resources/html/deployJava.txt @@ -475,61 +445,16 @@ License: NanoXML2 Files: ./JOrtho_0.4_freeplane/src/com/inet/jortho/* 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 <[email protected]> License: 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 <[email protected]> License: 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 @@ -574,3 +499,37 @@ License: Apache-2 See the License for the specific language governing permissions and limitations under the License. See `/usr/share/common-licenses/Apache-2.0'. + +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". + +License: 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'. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
