[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn27676+ds1-1-8-g0d1fefe

Sat Apr 7 18:08:52 UTC 2012

The following commit has been merged in the master branch:
commit 599b03a86c85c5e53f160bcf2427e66606785f99
Author: David Paleino <dapal at debian.org>
Date:   Sat Apr 7 19:46:54 2012 +0200

    Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index a371912..57fca88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm-plugins (0.0.svn28008+ds1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Bump JOSM dependency to >= 5047 (Closes: #666002)
+  * Updated debian/copyright
 
- -- David Paleino <dapal at debian.org>  Sat, 07 Apr 2012 19:40:34 +0200
+ -- David Paleino <dapal at debian.org>  Sat, 07 Apr 2012 19:46:47 +0200
 
 josm-plugins (0.0.svn27676+ds1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 70e577c..206a1e3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,45 @@
-This package was downloaded exporting the single packaged plugins from
-  http://svn.openstreetmap.org/applications/editors/josm/plugins/*
-All .jar files have been removed.
-All other downloaded files have been packaged as GNU zip'ed tarball without further modifications.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public License
-Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Source: http://svn.openstreetmap.org/applications/editors/josm/plugins/
 
 Files: debian/*
-Copyright: © 2008-2010 Giovanni Mascellani <g.mascellani at gmail.com>
-           © 2008-2009 Andreas Putzo <andreas at putzo.net>
+Copyright: © 2010-2012, David Paleino <dapal at debian.org>
+ © 2008-2010, Giovanni Mascellani <g.mascellani at gmail.com>
+ © 2008-2009, Andreas Putzo <andreas at putzo.net>
 License: GPL-2+
- The Debian packaging information is under the GPL, version 2 or later.
 
 Files: cadastre-fr/*
-Copyright: © 2008-2009 Pieren <pieren3 at gmail.com>
+Copyright: © 2008-2009, Pieren <pieren3 at gmail.com>
 License: GPL-2+
 
 Files: colorscheme/*
-Copyright: © 2008-2009 Christof Dallermassl <cdaller.hw at gmx.at>
+Copyright: © 2008-2009, Christof Dallermassl <cdaller.hw at gmx.at>
 License: GPL-3+
 
 Files: DirectUpload/*
 Copyright: © Subhodip Biswas
-License: GPL
+License: GPL-1+
 
 Files: editgpx/*
 Copyright: © 2008, Martin Garbe <leo at running-sheep.com>
-License: GPL
+License: GPL-1+
 
 Files: lakewalker/*
 Copyright: © 2000-2007, Rodney Kinney
  © 2000-2007, Brent Easton
-License: LGPL
+License: LGPL-2.1+
 
 Files: livegps/*
-Copyright: © 2007-2008 Frederik Ramm <frederik at remote.org>
-           © 2007-2008 Christof Dallermassl <cdaller.hw at gmx.at>
+Copyright: © 2007-2008, Frederik Ramm <frederik at remote.org>
+ © 2007-2008, Christof Dallermassl <cdaller.hw at gmx.at>
 License: PD
  The livegps plugin was put in the public domain by its authors.
 
 Files: measurement/*
-Copyright: © 2007-2008 Raphael Mack <osm at raphael-mack.de>
+Copyright: © 2007-2008, Raphael Mack <osm at raphael-mack.de>
 License: GPL-3+
 
 Files: openvisible/*
-Copyright: © 2008-2009 Christof Dallermassl <cdaller.hw at gmx.at>
+Copyright: © 2008-2009, Christof Dallermassl <cdaller.hw at gmx.at>
 License: GPL-3+
 
 Files: routing/*
@@ -52,9 +47,65 @@ Copyright: © 2008, Innovant
 License: GPL-2+
 
 Files: surveyor/*
-Copyright: © 2008-2009 Christof Dallermassl <cdaller.hw at gmx.at>
+Copyright: © 2008-2009, Christof Dallermassl <cdaller.hw at gmx.at>
 License: GPL-3+
 
 Files: surveyor/src/org/dinopolis/util/io/Tokenizer.java
-Copyright: © 2008-2009 Christof Dallermassl <cdaller.hw at gmx.at>
+Copyright: © 2008-2009, Christof Dallermassl <cdaller.hw at gmx.at>
+License: LGPL-2.1+
+
+License: GPL-1+
+ 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; either version 1, or (at your option)
+ any later version.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+License: GPL-2+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+License: GPL-3+
+ 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, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
Plugins for JOSM

