The following commit has been merged in the master branch:
commit 401eef5f244e7a0a08e2fa38b1192ca1529d97fd
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Tue Mar 30 00:01:50 2010 +0200

    Packaging data updated

diff --git a/debian/changelog b/debian/changelog
index 338194f..38e1063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,4 @@
-josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low
-
-  ** DO NOT UPLOAD **
-    There are some copyright issues. Mixed GPL and GPL-2 code being
-    released with GPL-3+ code. There's also an unversioned LGPL.
-    These should be cleared and fixed before upload.
+josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * debian/control:
@@ -14,7 +9,7 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low
   * debian/copyright updated
 
   [ Giovanni Mascellani ]
-  * Updated to revision 18885 (synchronized with josm)
+  * Updated to revision 20358 (closes: #571140)
   * Added plugins:
     + cadastre-fr - A special handler for the French land registry WMS
       server (closes: #555723)
@@ -24,6 +19,10 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low
       very fast
     + lakewalker - Helps vectorizing WMS images
     + routing - Provides routing capabilities
+  * Removed plugins:
+    + agpifoj - Dropped upstream
+    + utilsplugin - Dropped upstream
+    + validator - Bad license
 
  -- David Paleino <da...@debian.org>  Mon, 07 Dec 2009 10:19:10 +0100
 
diff --git a/debian/control b/debian/control
index e7783a9..74b2299 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.
  .
  This package contains the following plugins:
-  * agpifoj            - Creates a new layer with geotagged pictures.
   * colorscheme        - Allows to create different color schemes.
   * livegps            - Supports live GPS input together with gpsd.
   * measurement        - Adds a dialog and a layer to measure length 
@@ -33,8 +32,6 @@ Description: Plugins for JOSM
                          the currently visible screen area.
   * slippymap          - Displays a slippy map grid in JOSM.
   * surveyor           - Allows adding markers/nodes on current gps positions.
-  * utilsplugin        - Several helper utilities.
-  * validator          - Data validator.
   * wmsplugin          - Displays background images from any WMS source.
   * cadastre-fr        - A special handler for the French land registry WMS
                          server.
diff --git a/debian/copyright b/debian/copyright
index 0d4bb26..49a0260 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,38 +7,50 @@ 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'.
 
 Files: debian/*
-Copyright: © 2008-2009 Giovanni Mascellani <g.mascell...@gmail.com>
+Copyright: © 2008-2010 Giovanni Mascellani <g.mascell...@gmail.com>
            © 2008-2009 Andreas Putzo <andr...@putzo.net>
 License: GPL-2+
  The Debian packaging information is under the GPL, version 2 or later.
 
-Files: agpifoj/*
-Copyright: © 2007 Christian Gallioz
-           © Rob Neild
-           © Immanuel Scholz
+Files: cadastre-fr/*
+Copyright: © 2008-2009 Pieren <pier...@gmail.com>
 License: GPL-2+
- License: GPL. Copyright 2007 by Christian Gallioz (aka khris78)
- Parts of code from Geotagged plugin (by Rob Neild)
- and the core JOSM source code (by Immanuel Scholz and others)
 
 Files: colorscheme/*
 Copyright: © 2008-2009 Christof Dallermassl <cdaller...@gmx.at>
 License: GPL-3+
 
+Files: DirectUpload/*
+Copyright: © Subhodip Biswas
+License: GPL
+
+Files: editgpx/*
+Copyright: © 2008, Martin Garbe <l...@running-sheep.com>
+License: GPL
+
+Files: lakewalker/*
+Copyright: © 2000-2007, Rodney Kinney
+ © 2000-2007, Brent Easton
+License: LGPL
+
 Files: livegps/*
-Copyright: © 2007,2008 Frederik Ramm <frede...@remote.org>
-           © 2007,2008 Christof Dallermassl <cdaller...@gmx.at>
+Copyright: © 2007-2008 Frederik Ramm <frede...@remote.org>
+           © 2007-2008 Christof Dallermassl <cdaller...@gmx.at>
 License: PD
  The livegps plugin was put in the public domain by its authors.
 
 Files: measurement/*
-Copyright: © Raphael Mack <o...@raphael-mack.de>
+Copyright: © 2007-2008 Raphael Mack <o...@raphael-mack.de>
 License: GPL-3+
 
 Files: openvisible/*
 Copyright: © 2008-2009 Christof Dallermassl <cdaller...@gmx.at>
 License: GPL-3+
 
+Files: routing/*
+Copyright: © 2008, Innovant
+License: GPL-2+
+
 Files: slippymap/*
 Copyright: © 2007 Hakan Tandogan <ha...@gurkensalat.com>
            © 2007 Frederik Ramm <frede...@remote.org>
@@ -50,70 +62,16 @@ Files: surveyor/*
 Copyright: © 2008-2009 Christof Dallermassl <cdaller...@gmx.at>
 License: GPL-3+
 
-Files: utilsplugin/*
-Copyright: © 2007 Frederik Ramm <frede...@remote.org>
-           © 2007 Gabriel Ebner <g...@gabrielebner.at>
-           © Martijn van Oosterhout <klep...@svana.org>
-License: GPL-2+
-
-Files: validator/*
-Copyright: © 2007 Francisco R. Santos <frsan...@gmail.com>
-           © 2007 Joerg Ostertag <openstreet...@ostertag.name>
-           © 2007,2008 Gabriel Ebner <g...@gabrielebner.at>
-           © 2007 Immanuel Scholz
-License: GPL-2
-
-Files: 
validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java
-Copyright: Copyright 2001-2008 The Apache Software Foundation
-License: Apache-2.0
- This file has been taken from the Commons Lang project. The original license
- follows.
- .
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- .
- On Debian systems the full test of the Apache 2.0 license can be found
- in the `/usr/share/common-licenses/Apache-2.0' file.
+Files: surveyor/src/org/dinopolis/util/io/Tokenizer.java
+Copyright: © 2008-2009 Christof Dallermassl <cdaller...@gmx.at>
+License: LGPL-2.1+
 
 Files: wmsplugin/*
 Copyright: © 2007 Tim Waters <chippy2...@gmail.com>
            © 2007 Frederik Ramm <frede...@remote.org>
            © 2007 Jonathan Stott <jonat...@jstott.me.uk>
            © 2007 Ulf Lamping <ulf.lamp...@web.de>
-           © 2007,2008 Gabriel Ebner <g...@gabrielebner.at>
+           © 2007-2008 Gabriel Ebner <g...@gabrielebner.at>
            © Petr Dlouhý <petr.dlo...@email.cz>
            © Nick Whitelegg <nick.whitel...@solent.ac.uk>
 License: GPL-2+
-
-Files: cadastre-fr/*
-Copyright: © 2008-2009 by Pieren <pier...@gmail.com> and others
-License: GPL-2+
-
-Files: DirectUpload/*
-Copyright: © Subhodip Biswas
-License: GPL-2+
-
-Files: editgpx/*
-Copyright: © 2008, Martin Garbe <l...@running-sheep.com>
-License: GPL
-
-Files: lakewalker/*
-Copyright: © 2000-2007, Rodney Kinney
- © 2000-2007, Brent Easton
-License: LGPL
-
-Files: routing/*
-Copyright: © 2008, Innovant
-License: GPL-2+
diff --git a/debian/rules b/debian/rules
index dd360a0..f7c6e74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DEB_ANT_BUILD_TARGET := build
 DEB_ANT_CLEAN_TARGET := clean
 
 SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := agpifoj cadastre-fr colorscheme DirectUpload editgpx lakewalker 
livegps measurement openvisible routing slippymap surveyor utilsplugin 
validator wmsplugin
+PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps 
measurement openvisible routing slippymap surveyor wmsplugin
 
 DATE := $(shell date +%Y%m%d)
 ifdef SVNREV

-- 
Plugins for josm

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to