The following commit has been merged in the master branch:
commit b31452eb0f7bcc1a4c4c7145852786674aae5045
Author: David Paleino <da...@debian.org>
Date:   Thu Apr 19 12:28:49 2012 +0200

    Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 7804d7d..df161b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ josm (0.0.svn5181+dfsg1-1) UNRELEASED; urgency=low
   * New tested snapshot
   * Dropped Andreas Putzo and Petter Reinholdtsen from Uploaders,
     since they've been inactive for long
+  * Updated debian/copyright
 
- -- David Paleino <da...@debian.org>  Thu, 19 Apr 2012 12:10:08 +0200
+ -- David Paleino <da...@debian.org>  Thu, 19 Apr 2012 12:28:43 +0200
 
 josm (0.0.svn5047+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index bffb1e4..09670ea 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,48 +1,34 @@
-This package was debianized by Andreas Putzo <andr...@putzo.net> on
-Mon, 04 Sep 2007 12:16:50 +0200.
-
-It was downloaded using the command svn export
-http://josm.openstreetmap.de/svn/trunk.  All .jar files have been removed.  All
-files in the data/ directory have been removed because they contain (large) 
test
-data that is not used by the program.  The directory styles/standard/icons has
-been removed. It contains icons that are already provided by the
-openstreetmap-map-icons-classic package.  All other downloaded files have been
-packaged as GNU zip'ed tarball without any further modifications.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: JOSM
+Source: http://josm.openstreetmap.de/svn/trunk
 
 Files: *
-Copyright: Copyright (c) 2005-2008 Immanuel Scholz <i...@eigenheimstrasse.de>
-           Copyright (c) 2007-2009 Frederik Ramm <frede...@remote.org>
-           Copyright (c) 2007-2009 Gabriel Ebner <g...@gabrielebner.at>
-           Copyright (c) 2007-2009 David Earl <da...@frankieandshadow.com>
-           Copyright (c) 2007-2009 Ulf Lamping <ulf.lamp...@web.de>
-           Copyright (c) 2007-2009 Raphael Mack <ram...@raphael-mack.de>
-           Copyright (c) 2008-2009 Dirk Stöcker
-           Copyright (c) 2008-2009 Stefan Breunig
-           Copyright (c) 2008-2009 Karl Guggisberg
-           Copyright (c) 2008 Jan Peter Stotz
-License: GPL-3+
- Josm is distributed under the GPL, version 2 or later.  On Debian GNU/Linux
- systems, the complete text of the GNU General Public License Version 3 can be
- found in `/usr/share/common-licenses/GPL-3'.
-
-Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java,
- src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
-Copyright: Copyright (c) 2009 Stefan Zeller
+Copyright: © 2005-2008, Immanuel Scholz <i...@eigenheimstrasse.de>
+ © 2007-2012, Frederik Ramm <frede...@remote.org>
+ © 2007-2009, Gabriel Ebner <g...@gabrielebner.at>
+ © 2007-2009, David Earl <da...@frankieandshadow.com>
+ © 2007-2012, Ulf Lamping <ulf.lamp...@web.de>
+ © 2007-2009, Raphael Mack <ram...@raphael-mack.de>
+ © 2008-2012, Dirk Stöcker <openstreet...@dstoecker.de>
+ © 2008-2009, Stefan Breunig
+ © 2008-2009, Karl Guggisberg
+ © 2008, Jan Peter Stotz
 License: GPL-3+
 
 Files: debian/*
-Copyright: Copyright (c) 2007-2009 Andreas Putzo
-           Copyright (c) 2008 Petter Reinholdtsen
-           Copyright (c) 2008-2011 Giovanni Mascellani
-           Copyright (c) 2009-2011 David Paleino
+Copyright: © 2008-2009, Andreas Putzo <andr...@putzo.net>
+ © 2008, Petter Reinholdtsen <p...@debian.org>
+ © 2009-2011, Giovanni Mascellani <g...@debian.org>
+ © 2010-2012, David Paleino <da...@debian.org>
+License: GPL-3+
+
+Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+ src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
+Copyright: © 2009, Stefan Zeller
 License: GPL-3+
- The Debian packaging information is under the GPL, version 2 or later.  On
- Debian GNU/Linux systems, the complete text of the GNU General Public License
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
-Copyright: Copyright (c) 1994-2007 Sun Microsystems, Inc.
+Copyright: © 1994-2007, Sun Microsystems, Inc.
 License: other
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -75,7 +61,7 @@ License: other
  facility.
 
 Files: images/world.jpg
-Copyright: Courtesy NASA/JPL-Caltech
+Copyright: NASA/JPL-Caltech
 License: other
  (Copied from http://www.jpl.nasa.gov/images/policy/index.cfm)
  .
@@ -102,28 +88,29 @@ License: other
  not be claimed or implied.
 
 Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java
-       src/org/openstreetmap/josm/data/projection/LambertEST.java
-       src/org/openstreetmap/josm/data/projection/Lambert.java
-Copyright: Copyright (c) 2002 Johan Montagnat <jo...@creatis.insa-lyon.fr>
+ src/org/openstreetmap/josm/data/projection/LambertEST.java
+ src/org/openstreetmap/josm/data/projection/Lambert.java
+Copyright: © 2002, Johan Montagnat <jo...@creatis.insa-lyon.fr>
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/io/NmeaReader.java
-Copyright: Copyright (c) 2008 Christoph Brill
+Copyright: © 2008, Christoph Brill
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/data/osm/Changeset.java
-Copyright: Copyright (c) 2007 Martijn van Oosterhout
+Copyright: © 2007, Martijn van Oosterhout
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
-Copyright: Copyright (c) 2007 David Hansen
+Copyright: © 2007, David Hansen
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/gui/ScrollViewport.java
-Copyright: Copyright (c) 2007 Christian Gallioz
+Copyright: © 2007, Christian Gallioz
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/gui/FileDrop.java
+Copyright: Robert Harder
 License: PD
  code from: http://iharder.sourceforge.net/current/java/filedrop/
  (public domain) with only very small additions
@@ -134,86 +121,134 @@ License: PD
  up with any other open source license - just use it. You can rename
  the files, move the Java packages, whatever you want.
 
-Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java,
- src/org/openstreetmap/josm/gui/download/OsmMapControl.java,
- src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java,
+Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
+ src/org/openstreetmap/josm/gui/download/OsmMapControl.java
+ src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
  src/org/openstreetmap/josm/gui/download/SizeButton.java
-Copyright: Copyright (c) 2007 Tim Haussmann
+Copyright: © 2007, Tim Haussmann
 License: GPL-3+
 
-Files: src/org/openstreetmap/josm/gui/MultiSplitLayout.java,
+Files: src/org/openstreetmap/josm/gui/MultiSplitLayout.java
  src/org/openstreetmap/josm/gui/MultiSplitPane.java
-Copyright: Copyright 2004 Sun Microsystems, Inc., 4150 Network Circle,
- Santa Clara, California 95054, U.S.A.
+Copyright: © 2004, Sun Microsystems, Inc.
 License: LGPL-2.1+
 
-Files: src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java,
+Files: src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java
  src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
-Copyright: Copyright (c) 2008, Henrik Niehaus
-License: BSD
+Copyright: © 2008, Henrik Niehaus
+License: BSD-3
 
-Files: src/org/openstreetmap/josm/tools/CopyList.java,
- src/org/openstreetmap/josm/tools/DateUtils.java,
- src/org/openstreetmap/josm/data/osm/Storage.java,
- src/org/openstreetmap/josm/data/osm/Hash.java,
+Files: src/org/openstreetmap/josm/tools/CopyList.java
+ src/org/openstreetmap/josm/tools/DateUtils.java
+ src/org/openstreetmap/josm/data/osm/Storage.java
+ src/org/openstreetmap/josm/data/osm/Hash.java
  src/org/openstreetmap/josm/data/osm/DataSetListener.java
-Copyright: Copyright (c) 2008 Petr Nejedly <p.neje...@sh.cvut.cz>
+Copyright: © 2008, Petr Nejedly <p.neje...@sh.cvut.cz>
 License: GPL-3+
 
 Files: src/org/openstreetmap/josm/data/coor/QuadTiling.java
-Copyright: Copyright (c) 2009 Dave Hansen
+Copyright: © 2009, Dave Hansen
 License: GPL-3+
 
-Files: src/org/openstreetmap/josm/data/projection/NTV2SubGrid.java,
- src/org/openstreetmap/josm/data/projection/NTV2Util.java,
- src/org/openstreetmap/josm/data/projection/NTV2GridShiftFile.java,
- src/org/openstreetmap/josm/data/projection/NTV2GridShift.java
-Copyright: Copyright (c) 2003 Objectix Pty Ltd
-License: LGPL
-
 Files: src/org/openstreetmap/josm/data/projection/Puwg.java
-Copyright: Copyright (c) 2007 by Immanuel Scholz and others
-           Copyright (c) 2009 by Łukasz Stelmach
+Copyright: © 2007, Immanuel Scholz
+ © 2009, Łukasz Stelmach
 License: GPL-3+
 
 Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
-Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
+Copyright: © 2009, Rosetta Contributers and Canonical Ltd 2009
 License: GPL-3+
- This file is distributed under the same license as the josm package.
 
 Files: i18n/po/de.po
-Copyright: Copyright (c) 2006,2007 Sven Anders <s...@anders-hamburg.de>
-           Copyright (c) 2008 Matthias Merz <openstreet...@merz.inka.de>
-           Copyright (c) 2008, 2009 Dirk Stöcker <openstreet...@dstoecker.de>
+Copyright: © 2006-2007, Sven Anders <s...@anders-hamburg.de>
+ © 2008, Matthias Merz <openstreet...@merz.inka.de>
+ © 2008-2009, Dirk Stöcker <openstreet...@dstoecker.de>
 License: GPL-3+
 
 Files: i18n/po/en_GB.po
-Copyright: Copyright (c) 2006 Immanuel Scholz
+Copyright: © 2006, Immanuel Scholz
 License: GPL-3+
- This file is distributed under the same license as the josm package.
 
 Files: i18n/po/fr.po
-Copyright: Copyright (c) 2006 Frederic Bonifas <fredericboni...@gmail.com>
+Copyright: © 2006, Frederic Bonifas <fredericboni...@gmail.com>
 License: GPL-3+
 
 Files: i18n/po/it.po
-Copyright: Copyright (c) 2009 Davide Prade <dav...@alice.it> and others
+Copyright: © 2009, Davide Prade <dav...@alice.it> and others
 License: GPL-3+
 
 Files: i18n/po/pl.po
-Copyright: Copyright (c) 2008 PAWEŁ MADEJ <nysan...@quanteam.pl>
-           Copyright (c) 2008 Nabuchodonozor <nabuchodonozor....@gmail.com>
-           Copyright (c) 2008 MARCIN FLORYAN <mflor...@mmsqaure.com>
+Copyright: © 2008, Paweł Madej <nysan...@quanteam.pl>
+ © 2008, Nabuchodonozor <nabuchodonozor....@gmail.com>
+ © 2008, Marcin Floryan <mflor...@mmsqaure.com>
 License: GPL-3+
 
 Files: i18n/po/tr.po
-Copyright: Copyright (c) 2009 ikinokta
-           Copyright (c) 2009 Cezmi Topaloğlu <cezmi.topalo...@ikinokta.com>
+Copyright: © 2009, ikinokta
+ © 2009, Cezmi Topaloğlu <cezmi.topalo...@ikinokta.com>
 License: GPL-3+
 
 Files: i18n/po/zh_TW.po
-Copyright: Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-           Copyright (c) 2009 Chao-Hsiung Liao <j_h_l...@yahoo.com.tw>
+Copyright: © 2009, Rosetta Contributors and Canonical Ltd 2009
+ © 2009, Chao-Hsiung Liao <j_h_l...@yahoo.com.tw>
 License: GPL-3+
- This file is distributed under the same license as the josm package.
+
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ 3. Neither the name of the project nor the names of its
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3'.
+
+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/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1'.
 

-- 
Editor for OpenStreetMap

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to