[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit 1a5ba67cc78c9574fddda7ae26e4497bde83b253 Author: Giovanni Mascellani Date: Tue Mar 30 11:04:12 2010 +0200 Patches description updated diff --git a/debian/patches/100_surveyor.dpatch b/debian/patches/100_surveyor.dpatch index 2c7087f..3dc1f64 100755 --- a/debian/patches/100_surveyor.dpatch +++ b/debian/patches/100_surveyor.dpatch @@ -1,9 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 100_surveyor.dpatch by +## 100_surveyor.dpatch by Giovanni Mascellani ## ## DP: Patch for plugin surveyor ## DP: * Disable upstream SVN access -## DP: * Backport recent code @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/surveyor/build.xml josm-plugins/surveyor/build.xml diff --git a/debian/patches/10_colorscheme.dpatch b/debian/patches/10_colorscheme.dpatch index ca92c86..839cb0f 100755 --- a/debian/patches/10_colorscheme.dpatch +++ b/debian/patches/10_colorscheme.dpatch @@ -1,9 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 10_colorscheme.dpatch by +## 10_colorscheme.dpatch by Giovanni Mascellani ## ## DP: Patch for plugin colorscheme ## DP: * Disable upstream SVN access -## DP: * Fix wrong classpath and dependencies @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/colorscheme/build.xml josm-plugins/colorscheme/build.xml diff --git a/debian/patches/110_cadastre-fr.dpatch b/debian/patches/110_cadastre-fr.dpatch index 84cfbc1..6cd4174 100755 --- a/debian/patches/110_cadastre-fr.dpatch +++ b/debian/patches/110_cadastre-fr.dpatch @@ -1,8 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 110_cadastre-fr.dpatch by +## 110_cadastre-fr.dpatch by Giovanni Mascellani ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin cadastre-fr +## DP: * Disable upstream SVN access @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/cadastre-fr/build.xml josm-plugins/cadastre-fr/build.xml diff --git a/debian/patches/120_DirectUpload.dpatch b/debian/patches/120_DirectUpload.dpatch index 9251b66..42e4338 100755 --- a/debian/patches/120_DirectUpload.dpatch +++ b/debian/patches/120_DirectUpload.dpatch @@ -1,8 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 120_DirectUpload.dpatch by +## 120_DirectUpload.dpatch by Giovanni Mascellani ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin DirectUpload +## DP: * Disable upstream SVN access @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/DirectUpload/build.xml josm-plugins/DirectUpload/build.xml diff --git a/debian/patches/130_editgpx.dpatch b/debian/patches/130_editgpx.dpatch index daf58a8..4603398 100755 --- a/debian/patches/130_editgpx.dpatch +++ b/debian/patches/130_editgpx.dpatch @@ -1,8 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 130_editgpx.dpatch by +## 130_editgpx.dpatch by Giovanni Mascellani ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin editgpx +## DP: * Disable upstream SVN access @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/editgpx/build.xml josm-plugins/editgpx/build.xml diff --git a/debian/patches/140_lakewalker.dpatch b/debian/patches/140_lakewalker.dpatch index af45832..81f11ca 100755 --- a/debian/patches/140_lakewalker.dpatch +++ b/debian/patches/140_lakewalker.dpatch @@ -1,8 +1,8 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 140_lakewalker.dpatch by +## 140_lakewalker.dpatch by Giovanni Mascellani ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin lakewalker +## DP: * Disable upstream SVN access @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/lakewalker/build.xml josm-plugins/lakewalker/build.xml diff --git a/debian/patches/150_routing.dpatch b/debian/patches/150_routing.dpatch index dcde2d5..06c93a4 100755 --- a/debian/patches/150_routing.dpatch +++ b/debian/patches/150_routing.dpatch @@ -1,8 +1,9 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 150_routing.dpatch by +## 150_routing.dpatch by Giovanni Mascellani ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin routing +## DP: * Disable upstream SVN access +## DP: * Fix
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit eaf934b66bf53de390f5e5d516a3eb97706dd94f Author: Giovanni Mascellani Date: Tue Mar 30 11:07:34 2010 +0200 Std-ver -> 3.8.4 diff --git a/debian/changelog b/debian/changelog index 90ad65a..4b7c246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low + agpifoj - Dropped upstream + utilsplugin - Dropped upstream + validator - Bad license + * Standards-Version bumped to 3.8.4 (no changes required) -- Giovanni Mascellani Tue, 30 Mar 2010 00:03:58 +0200 diff --git a/debian/control b/debian/control index a6246ac..58f1bd8 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), default-jdk, josm (>= 0.0.svn3094), libmetadata-extractor-java, liblog4j1.2-java, libjgrapht0.7-java Build-Conflicts: josm (>= 0.0.svn3095) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://josm.openstreetmap.de/wiki/Plugins Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm-plugins.git -- 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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit decc4ee8a0ae6cfcf0b7c08cc4bdc269ccabb2d2 Author: Giovanni Mascellani Date: Tue Mar 30 10:47:23 2010 +0200 Dpatches updated against new upstream version diff --git a/debian/patches/00list b/debian/patches/00list index 45f7328..25902b9 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,10 +1,7 @@ 10_colorscheme 20_livegps 30_slippymap -40_utilsplugin -50_validator 60_wmsplugin -70_agpifoj 80_measurement 90_openvisible 100_surveyor diff --git a/debian/patches/100_surveyor.dpatch b/debian/patches/100_surveyor.dpatch index 3f03e52..2c7087f 100755 --- a/debian/patches/100_surveyor.dpatch +++ b/debian/patches/100_surveyor.dpatch @@ -6,15 +6,15 @@ ## DP: * Backport recent code @DPATCH@ -diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml trunk~/surveyor/build.xml 2009-08-30 18:28:38.0 +0200 -+++ trunk/surveyor/build.xml 2009-09-14 16:09:57.0 +0200 -@@ -19,7 +19,7 @@ - - - -- -+ - - - +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/surveyor/build.xml josm-plugins/surveyor/build.xml +--- josm-plugins~/surveyor/build.xml 2010-03-30 00:03:05.0 +0200 josm-plugins/surveyor/build.xml2010-03-30 10:53:58.0 +0200 +@@ -55,7 +55,7 @@ + + + +- ++ + + + diff --git a/debian/patches/10_colorscheme.dpatch b/debian/patches/10_colorscheme.dpatch index 984a919..ca92c86 100755 --- a/debian/patches/10_colorscheme.dpatch +++ b/debian/patches/10_colorscheme.dpatch @@ -6,15 +6,15 @@ ## DP: * Fix wrong classpath and dependencies @DPATCH@ -diff -urNad josm-plugins~/colorscheme/build.xml josm-plugins/colorscheme/build.xml josm-plugins~/colorscheme/build.xml2009-07-08 16:40:06.0 +0200 -+++ josm-plugins/colorscheme/build.xml 2009-12-06 21:46:05.0 +0100 -@@ -14,7 +14,7 @@ - - - -- -+ - - - +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/colorscheme/build.xml josm-plugins/colorscheme/build.xml +--- josm-plugins~/colorscheme/build.xml2010-03-30 00:03:05.0 +0200 josm-plugins/colorscheme/build.xml 2010-03-30 10:46:33.0 +0200 +@@ -45,7 +45,7 @@ + + + +- ++ + + + diff --git a/debian/patches/110_cadastre-fr.dpatch b/debian/patches/110_cadastre-fr.dpatch index 0baf826..84cfbc1 100755 --- a/debian/patches/110_cadastre-fr.dpatch +++ b/debian/patches/110_cadastre-fr.dpatch @@ -5,10 +5,10 @@ ## DP: No description. @DPATCH@ -diff -urNad josm-plugins~/cadastre-fr/build.xml josm-plugins/cadastre-fr/build.xml josm-plugins~/cadastre-fr/build.xml2009-12-05 01:01:22.0 +0100 -+++ josm-plugins/cadastre-fr/build.xml 2009-12-06 21:33:05.0 +0100 -@@ -14,7 +14,7 @@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/cadastre-fr/build.xml josm-plugins/cadastre-fr/build.xml +--- josm-plugins~/cadastre-fr/build.xml2010-03-30 00:03:05.0 +0200 josm-plugins/cadastre-fr/build.xml 2010-03-30 10:54:14.0 +0200 +@@ -45,7 +45,7 @@ diff --git a/debian/patches/120_DirectUpload.dpatch b/debian/patches/120_DirectUpload.dpatch index eec7aed..9251b66 100755 --- a/debian/patches/120_DirectUpload.dpatch +++ b/debian/patches/120_DirectUpload.dpatch @@ -5,15 +5,15 @@ ## DP: No description. @DPATCH@ -diff -urNad josm-plugins~/DirectUpload/build.xml josm-plugins/DirectUpload/build.xml josm-plugins~/DirectUpload/build.xml 2009-12-05 01:01:22.0 +0100 -+++ josm-plugins/DirectUpload/build.xml2009-12-06 21:33:54.0 +0100 -@@ -14,7 +14,7 @@ - - - -- -+ - - - +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' josm-plugins~/DirectUpload/build.xml josm-plugins/DirectUpload/build.xml +--- josm-plugins~/DirectUpload/build.xml 2010-03-30 00:03:05.0 +0200 josm-plugins/DirectUpload/build.xml2010-03-30 10:55:01.0 +0200 +@@ -44,7 +44,7 @@ + + + +- ++ + + + diff --git a/debian/patches/130_editgpx.dpatch b/debian/patches/130_editgpx.dpatch index b9a391b..daf58a8 1
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch:
commit b216f09b461ab0e31f0109b640784b3122cf384a
Author: Giovanni Mascellani
Date: Tue Mar 30 10:44:46 2010 +0200
Updated josm version to compile against
diff --git a/debian/control b/debian/control
index 74b2299..a6246ac 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Giovanni Mascellani
,
Andreas Putzo ,
David Paleino
Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), default-jdk,
- josm (>= 0.0.svn2561), libmetadata-extractor-java, liblog4j1.2-java,
+ josm (>= 0.0.svn3094), libmetadata-extractor-java, liblog4j1.2-java,
libjgrapht0.7-java
-Build-Conflicts: josm (>= 0.0.svn2562)
+Build-Conflicts: josm (>= 0.0.svn3095)
Standards-Version: 3.8.3
Homepage: http://josm.openstreetmap.de/wiki/Plugins
Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@ -16,9 +16,9 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-grass/josm-plugins.git
Package: josm-plugins
Architecture: all
-Depends: josm (>= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends},
+Depends: josm (>= 0.0.svn3094), libmetadata-extractor-java, ${misc:Depends},
liblog4j1.2-java, libjgrapht0.7-java
-Conflicts: josm (>= 0.0.svn2562)
+Conflicts: josm (>= 0.0.svn3095)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit d04aea6449be38c36b23c2d28cae256f4f54dc15 Author: Giovanni Mascellani Date: Tue Mar 30 00:04:25 2010 +0200 Changelog updated diff --git a/debian/changelog b/debian/changelog index 38e1063..90ad65a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,7 @@ josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low + utilsplugin - Dropped upstream + validator - Bad license - -- David Paleino Mon, 07 Dec 2009 10:19:10 +0100 + -- Giovanni Mascellani Tue, 30 Mar 2010 00:03:58 +0200 josm-plugins (0.0.svn18009-1) unstable; urgency=low -- 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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit 4f5008bf3def6e1bb863335f76f599575671fa4f Author: Giovanni Mascellani Date: Tue Mar 30 10:42:53 2010 +0200 master.xml updated diff --git a/debian/master.xml b/debian/master.xml index a33c6b6..b0e0821 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -15,10 +15,6 @@ - - - - @@ -63,14 +59,6 @@ - - - - - - - - @@ -79,15 +67,17 @@ - + + + + + - - -- 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
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit 401eef5f244e7a0a08e2fa38b1192ca1529d97fd Author: Giovanni Mascellani 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 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 +Copyright: © 2008-2010 Giovanni Mascellani © 2008-2009 Andreas Putzo 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 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 License: GPL-3+ +Files: DirectUpload/* +Copyright: © Subhodip Biswas +License: GPL + +Files: editgpx/* +Copyright: © 2008, Martin Garbe +License: GPL + +Files: lakewalker/* +Copyright: © 2000-2007, Rodney Kinney + © 2000-2007, Brent Easton +License: LGPL + Files: livegps/* -Copyright: © 2007,2008 Frederik Ramm - © 2007,2008 Christof Dallermassl +Copyright: © 2007-2008 Frederik Ramm + © 2007-2008 Christof Dallermassl License: PD The livegps plugin was put in the public domain by its authors. Files: measurement/* -Copyright: © Raphael Mack +Copyright: © 2007-2008 Raphael Mack License: GPL-3+ Files: openvisible/* Copyright: © 2008-2009 Christof Dallermassl License: GPL-3+ +Files: routing/* +Copyright: © 2008, Innovant +License: GPL-2+ + Files: slippymap/* Copyright: © 2007 Hakan Tandogan © 2007 Frederik Ramm @@ -50,70 +62,16 @@ Files: surveyor/* Copyright: © 2008-2009 Christof Dallermassl License: GPL-3+ -Files: utilsplugin/* -Copyright: © 2007 Frederik Ramm - © 2007 Gabriel Ebner - © Martijn van Oosterhout -License: GPL-2+ - -Files: validator/* -Copyright: © 2007 Francisco R. Santos - © 2007 Joerg Ostertag - © 2007,2008 Gabriel Ebner - © 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 Common
[DebianGIS-dev] [SCM] josm-plugins branch, master, updated. upstream/0.0.svn18009-30-geaf934b
The following commit has been merged in the master branch: commit f660b06c7180acd77d6ed4730e2f97a43e233d8f Merge: 401eef5f244e7a0a08e2fa38b1192ca1529d97fd eb75f53779d2392905b553b52fd0e3e43b059c7d Author: Giovanni Mascellani Date: Tue Mar 30 00:03:05 2010 +0200 Merge commit 'upstream/0.0.svn20358' -- 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
