[josm-plugins] 68/369: Backporting recent code for pluing surveyor
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 93a88ae8a0b855aedcc88a433399f30d340b227d
Author: Giovanni Mascellani
Date: Sun Jun 7 13:32:22 2009 +
Backporting recent code for pluing surveyor
---
debian/patches/100_surveyor.dpatch | 33 +
1 file changed, 33 insertions(+)
diff --git a/debian/patches/100_surveyor.dpatch
b/debian/patches/100_surveyor.dpatch
index 526fb35..d38522a 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -3,6 +3,7 @@
##
## DP: Patch for plugin surveyor
## DP: * Disable upstream SVN access
+## DP: * Backport recent code
@DPATCH@
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
@@ -17,3 +18,35 @@ diff -urNad trunk~/surveyor/build.xml
trunk/surveyor/build.xml
+diff -urNad
trunk~/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
trunk/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
+---
trunk~/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
2009-02-01 21:50:42.0 +0100
trunk/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
2009-05-21 16:21:51.0 +0200
+@@ -7,10 +7,11 @@
+ import static org.openstreetmap.josm.tools.I18n.tr;
+
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
++import java.io.PrintWriter;
+ import java.util.TimerTask;
+
+ import javax.swing.JOptionPane;
+
+ import livegps.LiveGpsLock;
+@@ -51,11 +52,15 @@
+
+ // write to temporary file, on success, rename tmp file to target
file:
+ File tmpFile = new File(file.getAbsoluteFile()+".tmp");
+ System.out.println("AutoSaving osm data to file " +
file.getAbsolutePath());
+ synchronized(LiveGpsLock.class) {
+-XmlWriter.output(new FileOutputStream(tmpFile), new
OsmWriter.All(dataset, false));
++OsmWriter w = new OsmWriter(new PrintWriter(new
FileOutputStream(tmpFile)), false, dataset.version);
++w.header();
++w.writeDataSources(dataset);
++w.writeContent(dataset);
++w.footer();
+ }
+ tmpFile.renameTo(file);
+ System.out.println("AutoSaving finished");
+ } catch (IOException x) {
+ x.printStackTrace();
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 55/369: * Removed plugin usertools because of unspecified license (author not responding) * Forcing josm-plugins to be installed with the correct josm version
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit f649d03381b833947c5ec636b950bde412cbf373
Author: Giovanni Mascellani
Date: Sat Apr 4 23:13:59 2009 +
* Removed plugin usertools because of unspecified license (author not
responding)
* Forcing josm-plugins to be installed with the correct josm version
---
debian/control | 8
debian/copyright | 8 ++--
debian/rules | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index 573adc1..b3773e8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
- josm (>= 0.0.svn1387), libmetadata-extractor-java
+ josm (>= 0.0.svn1515), libmetadata-extractor-java
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,8 +12,9 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (>= 0.0.svn1387), libmetadata-extractor-java, ${misc:Depends}
-Suggests: gpsd, iceweasel
+Depends: josm (>= 0.0.svn1515), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (>> 0.0.svn1515)
+Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
.
@@ -27,7 +28,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.
- * usertools - Tools to help work with other authors/users.
* utilsplugin- Several helper utilities.
* validator - Data validator.
* wmsplugin - Displays background images from any WMS source.
diff --git a/debian/copyright b/debian/copyright
index ad1e216..59fea09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,8 +36,8 @@ Copyright: © Raphael Mack
License: GPL-3+
Files: openvisible/*
-Copyright: © Dallermassl (???)
-License: ???
+Copyright: © Christof Dallermassl
+License: GPL-2+
Files: slippymap/*
Copyright: © 2007 Hakan Tandogan
@@ -50,10 +50,6 @@ Files: surveyor/*
Copyright: © Christof Dallermassl
License: GPL-2+
-Files: usertools/*
-Copyright: ???
-License: ???
-
Files: utilsplugin/*
Copyright: © 2007 Frederik Ramm
© 2007 Gabriel Ebner
diff --git a/debian/rules b/debian/rules
index d4188eb..862b2dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ DEB_ANT_BUILD_TARGET := build
DEB_ANT_CLEAN_TARGET := clean
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := agpifoj colorscheme livegps measurement openvisible slippymap
surveyor usertools utilsplugin validator wmsplugin
+PLUGINS := agpifoj colorscheme livegps measurement openvisible slippymap
surveyor utilsplugin validator wmsplugin
DATE := $(shell date +%Y%m%d)
ifdef SVNREV
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 60/369: Deleted usertools from master.xml
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 8e0ec82faabe24b0773b1b3d0e62b32c80a9a24b Author: Giovanni Mascellani Date: Sat Apr 4 23:34:35 2009 + Deleted usertools from master.xml --- debian/master.xml | 4 1 file changed, 4 deletions(-) diff --git a/debian/master.xml b/debian/master.xml index 9645f93..d21f58c 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -44,10 +44,6 @@ - - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 53/369: License for plugin measurement (stated in a more recent SVN revision)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 37f21669c7cf66cca732677b9ab37ed1e5d16ebd Author: Giovanni Mascellani Date: Tue Mar 3 16:55:18 2009 + License for plugin measurement (stated in a more recent SVN revision) --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 9e74303..ad1e216 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,7 +33,7 @@ License: PD Files: measurement/* Copyright: © Raphael Mack -License: ??? +License: GPL-3+ Files: openvisible/* Copyright: © Dallermassl (???) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 57/369: Removed .rej file from patch
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 78559b844d6b1cf35ac854da36561e4443cbd02b Author: Giovanni Mascellani Date: Sat Apr 4 23:14:36 2009 + Removed .rej file from patch --- debian/patches/10_colorscheme.dpatch | 44 1 file changed, 44 deletions(-) diff --git a/debian/patches/10_colorscheme.dpatch b/debian/patches/10_colorscheme.dpatch index f828f7c..fd512f3 100755 --- a/debian/patches/10_colorscheme.dpatch +++ b/debian/patches/10_colorscheme.dpatch @@ -6,47 +6,3 @@ ## DP: * Fix wrong classpath and dependencies @DPATCH@ -diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml trunk~/colorscheme/build.xml 2009-01-01 18:55:45.0 +0100 -+++ trunk/colorscheme/build.xml2009-02-15 19:57:22.0 +0100 -@@ -15,7 +15,7 @@ - http://www.tegmento.org/~cdaller/josm/colorscheme/"/> - - -- -+ - - - - - -@@ -48,14 +40,11 @@ - - - -- -+ - - - -- -- -- -- -+ - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 62/369: usertools needs not to be cleaned (as it doesn't exist!)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 4e94cf12577d1bcba5d22951d8feaa4609fbbafd Author: Giovanni Mascellani Date: Fri Apr 17 20:25:58 2009 + usertools needs not to be cleaned (as it doesn't exist!) --- debian/master.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/master.xml b/debian/master.xml index d21f58c..734d92a 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -66,7 +66,6 @@ - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 64/369: Added TODO for next plugins to add
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 1129144c519536f8c7390364196b563910e95ad7 Author: Giovanni Mascellani Date: Thu May 21 16:01:26 2009 + Added TODO for next plugins to add --- debian/TODO.Debian | 18 ++ 1 file changed, 18 insertions(+) diff --git a/debian/TODO.Debian b/debian/TODO.Debian new file mode 100644 index 000..c01d298 --- /dev/null +++ b/debian/TODO.Debian @@ -0,0 +1,18 @@ +* Add more plugins: which are the problems? + + editgpx +- license: OK, GPL (Copyright 2008. Martin Garbe (leo at running-sheep dot com)) +- build.xml: OK, needs anti-SVN patch + + grid +- license: unknown, copyright holder too +- build.xml: OK, needs anti-SVN patch + + openstreetbugs +- license: OK, seems to be 3-clause BSD or something like (Copyright (c) 2008, Henrik Niehaus) +- build.xml: OK, needs anti-SVN patch + + routing +- license: MAYBE: GPL-2+ text is clearly stated, but copyright string + (Copyright (C) 2008 Innovant) is not very precise. Is it enough? +- build.xml: OK, needs anti-SVN patch and specification of build dependencies +- dependencies: depends on jgraph and log4j, which are both in Debian + + usertools +- license: unknown, copyright holder too +- build.xml: OK, needs anti-SVN patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 66/369: Updated changelog
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit a9056d5ba325cc580f242bd250de9305881a65b4 Author: Giovanni Mascellani Date: Sun May 24 09:46:03 2009 + Updated changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index abf7cee..4eab62c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,13 +16,15 @@ josm-plugins (0.0.svn14400-1) UNRELEASED; urgency=low (integrated in josm or in other plugins, not more maintained on upstream SVN) * dpatches updated consequently + * Added both build and binary dependencies on the exact version of josm +(closes #530305) [ Andreas Putzo ] * Update packaging copyright year. * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani Sat, 04 Apr 2009 20:42:13 +0200 + -- Giovanni Mascellani Sun, 24 May 2009 11:45:31 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 54/369: Removed patch for usertools
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit d1780738d3b0e5210486f5a7512f315b4cda60db Author: Giovanni Mascellani Date: Sat Apr 4 23:12:49 2009 + Removed patch for usertools --- debian/patches/00list | 1 - debian/patches/110_usertools.dpatch | 25 - 2 files changed, 26 deletions(-) diff --git a/debian/patches/00list b/debian/patches/00list index 92f346c..cef8d16 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,4 +8,3 @@ 80_measurement 90_openvisible 100_surveyor -110_usertools diff --git a/debian/patches/110_usertools.dpatch b/debian/patches/110_usertools.dpatch deleted file mode 100755 index 1d8d954..000 --- a/debian/patches/110_usertools.dpatch +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 110_usertools.dpatch by -## -## DP: Patch for plugin usertools -## DP: * Disable upstream SVN access - -@DPATCH@ -diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml trunk~/usertools/build.xml 2009-01-09 10:04:33.0 +0100 -+++ trunk/usertools/build.xml 2009-02-16 11:08:10.0 +0100 -@@ -16,14 +16,6 @@ - - - -- -- -- -- -- -- -- -- - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 48/369: Fixing things in d/copyright
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 994a0c5427ba00b573231c072358a60dfaccfad1 Author: Giovanni Mascellani Date: Mon Feb 16 13:23:49 2009 + Fixing things in d/copyright --- debian/copyright | 28 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/debian/copyright b/debian/copyright index 478d704..4ce013e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,5 @@ -This package was downloaded using the command svn export http://svn.openstreetmap.org/applications/editors/josm/plugins/. +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. @@ -6,18 +7,14 @@ 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 Giovanni Mascellani +Copyright: © 2008-2009 Giovanni Mascellani © 2008 Andreas Putzo License: GPL-2+ - The Debian packaging information is under the GPL, version 3 or later. - 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'. + The Debian packaging information is under the GPL, version 2 or later. Files: colorscheme/* Copyright: © 2007,2008 Christof Dallermassl License: GPL-2 - 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: livegps/* Copyright: © 2007,2008 Frederik Ramm @@ -25,11 +22,6 @@ Copyright: © 2007,2008 Frederik Ramm License: PD The livegps plugin was put in the public domain by its authors. -Files: namefinder/* -Copyright: © 2007,2008 Frederik Ramm -License: PD - The namefinder plugin was put in the public domain by Frederik Ramm. - Files: slippymap/* Copyright: © 2007 Hakan Tandogan © 2007 Frederik Ramm @@ -54,15 +46,3 @@ Copyright: © 2007 Tim Waters © 2007 Ulf Lamping © 2007,2008 Gabriel Ebner License: GPL-2+ - -Files: ywms/* -Copyright: © 2007 Francisco R. Santos - © 2007 Frederik Ramm - © 2007 Gabriel Ebner - © 2007 Joerg Ostertag -License: GPL-2 - -Files: slippy_map_chooser/* -Copyright: © 2007 Immanuel Scholz - © 2007 Tim Haussmann -License: GPL-2+ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 49/369: d/copyright partially fixed, but still requiring love
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 9274519cf4e99490ab6ffd60c21e7cdd5fdebd05 Author: Giovanni Mascellani Date: Mon Feb 16 14:00:13 2009 + d/copyright partially fixed, but still requiring love --- debian/copyright | 50 ++ 1 file changed, 50 insertions(+) diff --git a/debian/copyright b/debian/copyright index 4ce013e..04eba27 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,6 +12,15 @@ Copyright: © 2008-2009 Giovanni Mascellani 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 +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: © 2007,2008 Christof Dallermassl License: GPL-2 @@ -22,15 +31,33 @@ Copyright: © 2007,2008 Frederik Ramm License: PD The livegps plugin was put in the public domain by its authors. +Files: measurement/* +Copyright: © Raphael Mack +License: ??? + +Files: openvisible/* +Copyright: © Dallermassl (???) +License: ??? + Files: slippymap/* Copyright: © 2007 Hakan Tandogan © 2007 Frederik Ramm + © LuVar License: PD The slippymap plugin was put in the public domain by its authors. +Files: surveyor/* +Copyright: © Christof Dallermassl +License: GPL-2+ + +Files: usertools/* +Copyright: ??? +License: ??? + Files: utilsplugin/* Copyright: © 2007 Frederik Ramm © 2007 Gabriel Ebner + © Martijn van Oosterhout License: GPL-2+ Files: validator/* @@ -39,10 +66,33 @@ Copyright: © 2007 Francisco R. Santos © 2007,2008 Gabriel Ebner License: GPL-2 +Files: validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java +Copyright: Licensed to the Apache Software Foundation +License: Apache-2.0 + 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: wmsplugin/* Copyright: © 2007 Tim Waters © 2007 Frederik Ramm © 2007 Jonathan Stott © 2007 Ulf Lamping © 2007,2008 Gabriel Ebner + © Petr Dlouhý + © Nick Whitelegg License: GPL-2+ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 52/369: License checked on upstream NOTICE file
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 248c6a1e5515842598bf4adefeb37aa39d5e32a4 Author: Giovanni Mascellani Date: Tue Mar 3 13:32:22 2009 + License checked on upstream NOTICE file --- debian/copyright | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 5695960..9e74303 100644 --- a/debian/copyright +++ b/debian/copyright @@ -67,8 +67,11 @@ Copyright: © 2007 Francisco R. Santos License: GPL-2 Files: validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java -Copyright: Licensed to the Apache Software Foundation +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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 46/369: Added libmetadata-extractor-java in compilation and as dependency (used by agpifoj)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit b40f16cc268a6d32b35dacba356c68b2a70afa9f Author: Giovanni Mascellani Date: Mon Feb 16 10:26:40 2009 + Added libmetadata-extractor-java in compilation and as dependency (used by agpifoj) --- debian/control | 4 ++-- debian/patches/70_agpifoj.dpatch | 13 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 3cd83e2..cfceb08 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, - josm (>= 0.0.svn1387) + josm (>= 0.0.svn1387), libmetadata-extractor-java Standards-Version: 3.8.0 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ @@ -12,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ Package: josm-plugins Architecture: all -Depends: josm (>= 0.0.svn1387) +Depends: josm (>= 0.0.svn1387), libmetadata-extractor-java Suggests: gpsd, iceweasel Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. diff --git a/debian/patches/70_agpifoj.dpatch b/debian/patches/70_agpifoj.dpatch index 0e360b0..3225ee0 100755 --- a/debian/patches/70_agpifoj.dpatch +++ b/debian/patches/70_agpifoj.dpatch @@ -7,7 +7,7 @@ @DPATCH@ diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml --- trunk~/agpifoj/build.xml 2009-01-01 18:55:45.0 +0100 -+++ trunk/agpifoj/build.xml2009-02-16 11:08:56.0 +0100 trunk/agpifoj/build.xml2009-02-16 11:23:37.0 +0100 @@ -27,14 +27,6 @@ @@ -23,3 +23,14 @@ diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml +@@ -50,6 +42,10 @@ + + + ++ ++ ++ ++ + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 47/369: Fixed lintian messages: * added ${misc:Depends} to dependencies * added patch descriptions
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit a006b1acc916655a6a53c977c634bc9ee26d8466
Author: Giovanni Mascellani
Date: Mon Feb 16 13:18:38 2009 +
Fixed lintian messages:
* added ${misc:Depends} to dependencies
* added patch descriptions
---
debian/control | 2 +-
debian/patches/100_surveyor.dpatch | 4 ++--
debian/patches/10_colorscheme.dpatch | 5 +++--
debian/patches/110_usertools.dpatch | 4 ++--
debian/patches/20_livegps.dpatch | 5 +++--
debian/patches/30_slippymap.dpatch | 5 +++--
debian/patches/40_utilsplugin.dpatch | 4 ++--
debian/patches/50_validator.dpatch | 4 ++--
debian/patches/60_wmsplugin.dpatch | 4 ++--
debian/patches/70_agpifoj.dpatch | 5 +++--
debian/patches/80_measurement.dpatch | 4 ++--
debian/patches/90_openvisible.dpatch | 5 +++--
12 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/debian/control b/debian/control
index cfceb08..62b5592 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (>= 0.0.svn1387), libmetadata-extractor-java
+Depends: josm (>= 0.0.svn1387), libmetadata-extractor-java, ${misc:Depends}
Suggests: gpsd, iceweasel
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
diff --git a/debian/patches/100_surveyor.dpatch
b/debian/patches/100_surveyor.dpatch
index 02ec947..98c4329 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100_surveyor.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin surveyor
+## DP: * Disable upstream SVN access
@DPATCH@
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
diff --git a/debian/patches/10_colorscheme.dpatch
b/debian/patches/10_colorscheme.dpatch
index 6cff643..f828f7c 100755
--- a/debian/patches/10_colorscheme.dpatch
+++ b/debian/patches/10_colorscheme.dpatch
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_colorscheme.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin colorscheme
+## DP: * Disable upstream SVN access
+## DP: * Fix wrong classpath and dependencies
@DPATCH@
diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
diff --git a/debian/patches/110_usertools.dpatch
b/debian/patches/110_usertools.dpatch
index 64085db..1d8d954 100755
--- a/debian/patches/110_usertools.dpatch
+++ b/debian/patches/110_usertools.dpatch
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110_usertools.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin usertools
+## DP: * Disable upstream SVN access
@DPATCH@
diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml
diff --git a/debian/patches/20_livegps.dpatch b/debian/patches/20_livegps.dpatch
index e7b9e13..757a505 100755
--- a/debian/patches/20_livegps.dpatch
+++ b/debian/patches/20_livegps.dpatch
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_livegps.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin livegps
+## DP: * Disable upstream SVN access
+## DP: * Fix wrong classpath
@DPATCH@
diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
diff --git a/debian/patches/30_slippymap.dpatch
b/debian/patches/30_slippymap.dpatch
index 65651e7..1c0ff5f 100755
--- a/debian/patches/30_slippymap.dpatch
+++ b/debian/patches/30_slippymap.dpatch
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_slippymap.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin slippymap
+## DP: * Disable upstream SVN access
+## DP: * Fix wrong classpath
@DPATCH@
diff -urNad trunk~/slippymap/build.xml trunk/slippymap/build.xml
diff --git a/debian/patches/40_utilsplugin.dpatch
b/debian/patches/40_utilsplugin.dpatch
index 0d8782c..a476956 100755
--- a/debian/patches/40_utilsplugin.dpatch
+++ b/debian/patches/40_utilsplugin.dpatch
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 40_utilsplugin.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin utilsplugin
+## DP: * Disable upstream SVN access
@DPATCH@
diff -urNad trunk~/utilsplugin/build.xml trunk/utilsplugin/build.xml
diff --git a/debian/patches/50_validator.dpatch
b/debian/patches/50_validator.dpatch
index 42cca63..e7fe497 100755
--- a/debian/patches/50_validator.dpatch
+++ b/debian/patches/
[josm-plugins] 50/369: update long description use openjdk instead of gcj
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit ada5e59ca6f3fb506756097944a65ca1f7e48b14 Author: Andreas Putzo Date: Wed Feb 25 21:47:03 2009 + update long description use openjdk instead of gcj --- debian/changelog | 8 +++- debian/control | 7 +++ debian/copyright | 2 +- debian/rules | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13e9181..50c8c2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low + [ Giovanni Mascellani ] * New upstream revision - -- Giovanni Mascellani Sun, 15 Feb 2009 19:34:54 +0100 + [ Andreas Putzo ] + * Update packaging copyright year. + * Mention added plugins in long description. + * Use openjdk in debian/rules to be consistent with build dependency. + + -- Andreas Putzo Wed, 25 Feb 2009 21:43:30 + josm-plugins (0.0.0.20080518-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 62b5592..b96c6e2 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,16 @@ 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 and angle of + segments and create measurement paths.. + * openvisible- Allows opening gpx and osm files that intersect the currently + visible screen area. * slippymap - Displays a slippy map grid in JOSM. + * surveyor - Allows adding markers/nodes on current gps positions. + * usertools - Tools to help work with other authors/users. * utilsplugin- Several helper utilities. * validator - Data validator. * wmsplugin - Displays background images from any WMS source. diff --git a/debian/copyright b/debian/copyright index 04eba27..5695960 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ Version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: debian/* Copyright: © 2008-2009 Giovanni Mascellani - © 2008 Andreas Putzo + © 2008-2009 Andreas Putzo License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later. diff --git a/debian/rules b/debian/rules index f3aba71..d4188eb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME := /usr/lib/jvm/java-gcj/ +JAVA_HOME := /usr/lib/jvm/java-6-openjdk ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 51/369: add newlines to make lintian happy
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 23d2caf546f54900118f79addbe132f1a21fe0a7 Author: Andreas Putzo Date: Wed Feb 25 21:52:05 2009 + add newlines to make lintian happy --- debian/control | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index b96c6e2..573adc1 100644 --- a/debian/control +++ b/debian/control @@ -21,10 +21,10 @@ Description: Plugins for JOSM * 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 and angle of - segments and create measurement paths.. - * openvisible- Allows opening gpx and osm files that intersect the currently - visible screen area. + * measurement- Adds a dialog and a layer to measure length + and angle of segments and create measurement paths. + * openvisible- Allows opening gpx and osm files that intersect + the currently visible screen area. * slippymap - Displays a slippy map grid in JOSM. * surveyor - Allows adding markers/nodes on current gps positions. * usertools - Tools to help work with other authors/users. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 40/369: Bumped Standards-Version to 3.8.0 (no changes needed)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit bd7b9437a83e228596a7068a96ddbadd10f69c13 Author: Giovanni Mascellani Date: Fri Jun 27 16:53:46 2008 + Bumped Standards-Version to 3.8.0 (no changes needed) --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8965df4..559be52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low * Enables plugin slippy_map_chooser * Moved to package license GPL-2+, after having cleared it with Andreas Putzo + * Bumped Standards-Version to 3.8.0 (no changes needed) -- Giovanni Mascellani Sun, 18 May 2008 15:54:49 +0200 diff --git a/debian/control b/debian/control index 8612567..ba25466 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, josm (>= 0.0.0.20080512) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 27/369: Add plugin description to the long description. Removing build-dep on gettext again, because the lang* plugin is currently not included.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 212b9d3954a7acb10f333ab9974459acaed7f928 Author: Andreas Putzo Date: Sun Apr 13 10:13:19 2008 + Add plugin description to the long description. Removing build-dep on gettext again, because the lang* plugin is currently not included. --- debian/control | 12 +++- debian/rules | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 753d85a..9331500 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: extra Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo -Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, java-gcj-compat-dev, josm, libgettext-commons-java +Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, josm Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de @@ -14,6 +14,16 @@ Suggests: gpsd, iceweasel Description: JOSM plugins JOSM (Java OpenStreetMap) plugin collection. . + This package contains the following plugins: + * colorscheme - Allows to create different color schemes. + * livegps - Supports live GPS input together with gpsd. + * namefinder - Allows input of place names in JOSM download dialog. + * slippymap - Displays a slippy map grid in JOSM. + * utilsplugin - Several helper utilities. + * validator - Data validator. + * wmsplugin - Displays backround images from any WMS source. + * ywms- WMS server for Yahoo imagery. + . JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data from OSM database and existing nodes, line segments and metadata tags diff --git a/debian/rules b/debian/rules index b3627ab..eef52ea 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -PLUGINS = validator colorscheme livegps namefinder slippymap utilsplugin wmsplugin ywms +PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator wmsplugin ywms DATE := $(shell date +%Y%m%d) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 45/369: * Added new plugins: agpifoj, measurement, openvisible, surveyor, usertools * d/rules: HEAD was checked out instead of specified version
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 46c48016672971886224b75da4818935e0ffda7a Author: Giovanni Mascellani Date: Mon Feb 16 10:13:35 2009 + * Added new plugins: agpifoj, measurement, openvisible, surveyor, usertools * d/rules: HEAD was checked out instead of specified version --- debian/master.xml| 27 + debian/patches/00list| 5 debian/patches/100_surveyor.dpatch | 25 debian/patches/110_usertools.dpatch | 25 debian/patches/70_agpifoj.dpatch | 25 debian/patches/80_measurement.dpatch | 25 debian/patches/90_openvisible.dpatch | 58 debian/rules | 4 +-- 8 files changed, 192 insertions(+), 2 deletions(-) diff --git a/debian/master.xml b/debian/master.xml index d1ff386..9645f93 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -15,6 +15,10 @@ + + + + @@ -22,10 +26,27 @@ + + + + + + + + + + + + + + + + + @@ -40,10 +61,16 @@ + + + + + + diff --git a/debian/patches/00list b/debian/patches/00list index a42155c..92f346c 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -4,3 +4,8 @@ 40_utilsplugin 50_validator 60_wmsplugin +70_agpifoj +80_measurement +90_openvisible +100_surveyor +110_usertools diff --git a/debian/patches/100_surveyor.dpatch b/debian/patches/100_surveyor.dpatch new file mode 100755 index 000..02ec947 --- /dev/null +++ b/debian/patches/100_surveyor.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_surveyor.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml +--- trunk~/surveyor/build.xml 2009-01-23 22:36:04.0 +0100 trunk/surveyor/build.xml 2009-02-16 11:06:30.0 +0100 +@@ -20,14 +20,6 @@ + + + +- +- +- +- +- +- +- +- + + + diff --git a/debian/patches/110_usertools.dpatch b/debian/patches/110_usertools.dpatch new file mode 100755 index 000..64085db --- /dev/null +++ b/debian/patches/110_usertools.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 110_usertools.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml +--- trunk~/usertools/build.xml 2009-01-09 10:04:33.0 +0100 trunk/usertools/build.xml 2009-02-16 11:08:10.0 +0100 +@@ -16,14 +16,6 @@ + + + +- +- +- +- +- +- +- +- + + + diff --git a/debian/patches/70_agpifoj.dpatch b/debian/patches/70_agpifoj.dpatch new file mode 100755 index 000..0e360b0 --- /dev/null +++ b/debian/patches/70_agpifoj.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_agpifoj.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml +--- trunk~/agpifoj/build.xml 2009-01-01 18:55:45.0 +0100 trunk/agpifoj/build.xml2009-02-16 11:08:56.0 +0100 +@@ -27,14 +27,6 @@ + + + +- +- +- +- +- +- +- +- + + + diff --git a/debian/patches/80_measurement.dpatch b/debian/patches/80_measurement.dpatch new file mode 100755 index 000..0fa6f62 --- /dev/null +++ b/debian/patches/80_measurement.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_measurement.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad trunk~/measurement/build.xml trunk/measurement/build.xml +--- trunk~/measurement/build.xml 2009-01-01 18:55:45.0 +0100 trunk/measurement/build.xml2009-02-16 10:57:20.0 +0100 +@@ -20,14 +20,6 @@ + + + +- +- +- +- +- +- +- +-
[josm-plugins] 29/369: Remove plugin version (svn revision) information for the validator and ywms plugin because we don't know them at build time.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit d3335abd8d6b80957b67ff2948cdb65c773e05e0 Author: Andreas Putzo Date: Sun Apr 13 10:31:15 2008 + Remove plugin version (svn revision) information for the validator and ywms plugin because we don't know them at build time. --- debian/patches/30_build.dpatch | 36 ++-- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch index c2f34ac..8ac7786 100755 --- a/debian/patches/30_build.dpatch +++ b/debian/patches/30_build.dpatch @@ -4,9 +4,9 @@ ## DP: Fix mistage in clean targets of the colorscheme and livegps plugin. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080412~/colorscheme/build.xml josm-plugins-0.0.0.20080412/colorscheme/build.xml josm-plugins-0.0.0.20080412~/colorscheme/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080412/colorscheme/build.xml 2008-04-12 23:35:00.0 + +diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0.0.20080413/colorscheme/build.xml +--- josm-plugins-0.0.0.20080413~/colorscheme/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080413/colorscheme/build.xml 2008-04-13 10:27:25.0 + @@ -69,7 +69,7 @@ @@ -16,9 +16,9 @@ diff -urNad josm-plugins-0.0.0.20080412~/colorscheme/build.xml josm-plugins-0.0. -diff -urNad josm-plugins-0.0.0.20080412~/livegps/build.xml josm-plugins-0.0.0.20080412/livegps/build.xml josm-plugins-0.0.0.20080412~/livegps/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080412/livegps/build.xml 2008-04-12 23:35:19.0 + +diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20080413/livegps/build.xml +--- josm-plugins-0.0.0.20080413~/livegps/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080413/livegps/build.xml 2008-04-13 10:27:25.0 + @@ -79,7 +79,7 @@ @@ -28,3 +28,27 @@ diff -urNad josm-plugins-0.0.0.20080412~/livegps/build.xml josm-plugins-0.0.0.20 +diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml +--- josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-13 10:27:23.0 + josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 10:28:09.0 + +@@ -33,8 +33,6 @@ + + + +- +- + + + +diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml +--- josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-13 10:27:23.0 + josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:28:16.0 + +@@ -33,8 +33,6 @@ + + + +- +- + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 33/369: Update to reflect the version uploaded to unstable.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit cc6c52c40a17793a8d71952ee501254535a770bf Author: Petter Reinholdtsen Date: Sun Apr 13 12:43:03 2008 + Update to reflect the version uploaded to unstable. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8950f42..359ad12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,6 @@ josm-plugins (0.0.0.20080413-1) unstable; urgency=low * Initial release (Closes: #471846) + * Upload sponsored by Petter Reinholdtsen. + -- Andreas Putzo Sun, 13 Apr 2008 10:02:59 + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 32/369: fix typo
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 29cf82649202f4a7cd4f72006104c75a7b758ed8 Author: Andreas Putzo Date: Sun Apr 13 12:05:31 2008 + fix typo --- debian/patches/30_build.dpatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch index d159ce4..505ac20 100755 --- a/debian/patches/30_build.dpatch +++ b/debian/patches/30_build.dpatch @@ -1,7 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 30_build.dpatch by Andreas Putzo ## -## DP: Fix mistage in clean targets of the colorscheme and livegps plugin. +## DP: Fix mistake in clean targets of the colorscheme and livegps plugin. @DPATCH@ diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0.0.20080413/colorscheme/build.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 28/369: Add a readme explaining how josm handles plugins.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 2cbb2ef3cc1016a022e91c55a0352361ce9fc3ce Author: Andreas Putzo Date: Sun Apr 13 10:20:15 2008 + Add a readme explaining how josm handles plugins. --- debian/README.Debian | 13 + 1 file changed, 13 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000..8003705 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,13 @@ +Josm-plugins for Debian +--- + +This package contains various plugins that can be used together with JOSM. +Before using these plugins they need to be enabled individually via the +JOSM preferences dialog. + +Please note, that JOSM is able to download these (and other) plugins by itself +that get stored in your ~/.josm/plugins/ directory. +Plugins that resides in your HOME directory take always precedence and will be +used in favour of the plugins included in this package. + + -- Andreas Putzo So, 13 Apr 2008 12:10:12 + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 44/369: Patches updated to last SVN release
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 477a852d415967124f154a0154c685338ee8c3a9
Author: Giovanni Mascellani
Date: Sun Feb 15 19:07:30 2009 +
Patches updated to last SVN release
---
debian/patches/00list| 9 --
debian/patches/10_colorscheme.dpatch | 51 ++
debian/patches/10_validator.dpatch | 19 ---
debian/patches/20_disable_svn.dpatch | 61
debian/patches/20_livegps.dpatch | 39 +++
debian/patches/30_build.dpatch | 43 -
debian/patches/30_slippymap.dpatch | 34
debian/patches/40_utilsplugin.dpatch | 25 +++
debian/patches/50_validator.dpatch | 25 +++
debian/patches/60_wmsplugin.dpatch | 25 +++
10 files changed, 205 insertions(+), 126 deletions(-)
diff --git a/debian/patches/00list b/debian/patches/00list
index 53f8d89..a42155c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,6 @@
-10_validator
-20_disable_svn
-30_build
+10_colorscheme
+20_livegps
+30_slippymap
+40_utilsplugin
+50_validator
+60_wmsplugin
diff --git a/debian/patches/10_colorscheme.dpatch
b/debian/patches/10_colorscheme.dpatch
new file mode 100755
index 000..6cff643
--- /dev/null
+++ b/debian/patches/10_colorscheme.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_colorscheme.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
+--- trunk~/colorscheme/build.xml 2009-01-01 18:55:45.0 +0100
trunk/colorscheme/build.xml2009-02-15 19:57:22.0 +0100
+@@ -15,7 +15,7 @@
+ http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
+
+
+-
++
+
+
+
+
+
+@@ -48,14 +40,11 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
+-
++
+
+
+
diff --git a/debian/patches/10_validator.dpatch
b/debian/patches/10_validator.dpatch
deleted file mode 100755
index 5083da6..000
--- a/debian/patches/10_validator.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_validator.dpatch by Andreas Putzo
-##
-## DP: Add cast operator for OsmPrimitive.
-## DP: This is necessary to compile with gcj.
-
-@DPATCH@
-diff -urNad
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-01-14 11:16:12.0 +
-+++
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-03-27 18:26:55.0 +
-@@ -504,7 +504,7 @@
- String key = prop.getKey();
- String value = prop.getValue();
- if( value == null || value.trim().length() == 0
)
-- commands.add( new
ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, null) );
-+ commands.add( new
ChangePropertyCommand(Collections.singleton((OsmPrimitive)primitives.get(i)),
key, null) );
- else
- {
- String replacementKey =
spellCheckKeyData.get(key);
diff --git a/debian/patches/20_disable_svn.dpatch
b/debian/patches/20_disable_svn.dpatch
deleted file mode 100755
index 125da7c..000
--- a/debian/patches/20_disable_svn.dpatch
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_disable_svn.dpatch by Andreas Putzo
-##
-## DP: The validator and ywms plugins try to execute the svn command during
build.
-## DP: This patch disables this behaviour.
-
-@DPATCH@
-diff -urNad josm-plugins-0.0.0.20080518~/slippymap/build.xml
josm-plugins-0.0.0.20080518/slippymap/build.xml
josm-plugins-0.0.0.20080518~/slippymap/build.xml 2008-05-14
17:40:22.0 +0200
-+++ josm-plugins-0.0.0.20080518/slippymap/build.xml2008-06-30
19:46:28.0 +0200
-@@ -26,14 +26,6 @@
-
-
-
--
--
--
--
--
--
--
--
-
-
-
-diff -urNad josm-plugins-0.0.0.20080518~/validator/build.xml
josm-plugins-0.0.0.20080518/validator/build.xml
josm-plugins-0.0.0.20080518~/validator/build.xml 2008-06-30
19:42:26.0 +0200
-+++ josm-plugins-0.0.0.20080518/validat
[josm-plugins] 37/369: Enabled plugin slippy_map_chooser
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 287c93c6b56e91fd36dc05d961b0884cd41166f0 Author: Giovanni Mascellani Date: Sun May 18 16:00:50 2008 + Enabled plugin slippy_map_chooser --- debian/changelog | 3 ++- debian/control | 5 +++-- debian/master.xml | 21 + debian/patches/30_build.dpatch | 28 +--- debian/rules | 2 +- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3378fd8..bf52990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -josm-plugins (0.0.0.20080413-2) UNRELEASED; urgency=low +josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low * Upstream SVN revision number again available for plugins ywms and validator. * Added Vcs-* fields in debian/control + * Enables plugin slippy_map_chooser -- Giovanni Mascellani Sun, 18 May 2008 15:54:49 +0200 diff --git a/debian/control b/debian/control index d9d2364..4d3d82f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: utils Priority: extra Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo -Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, josm +Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, + josm (>= 0.0.0.20080512) Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ @@ -11,7 +12,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ Package: josm-plugins Architecture: all -Depends: josm +Depends: josm (>= 0.0.0.20080512) Suggests: gpsd, iceweasel Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. diff --git a/debian/master.xml b/debian/master.xml index e1e2310..019164a 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -51,16 +51,21 @@ + + + + - - - - - - - - + + + + + + + + + diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch index 505ac20..e784a95 100755 --- a/debian/patches/30_build.dpatch +++ b/debian/patches/30_build.dpatch @@ -1,12 +1,13 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 30_build.dpatch by Andreas Putzo ## -## DP: Fix mistake in clean targets of the colorscheme and livegps plugin. +## DP: Fix mistake in clean targets of the colorscheme and livegps plugin +## DP: and in compile target of the slippy_map_chooser plugin. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0.0.20080413/colorscheme/build.xml josm-plugins-0.0.0.20080413~/colorscheme/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080413/colorscheme/build.xml 2008-04-13 10:27:25.0 + +diff -urNad josm-plugins-0.0.0.20080518~/colorscheme/build.xml josm-plugins-0.0.0.20080518/colorscheme/build.xml +--- josm-plugins-0.0.0.20080518~/colorscheme/build.xml 2008-04-06 21:10:11.0 +0200 josm-plugins-0.0.0.20080518/colorscheme/build.xml 2008-05-18 16:09:07.0 +0200 @@ -69,7 +69,7 @@ @@ -16,9 +17,9 @@ diff -urNad josm-plugins-0.0.0.20080413~/colorscheme/build.xml josm-plugins-0.0. -diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20080413/livegps/build.xml josm-plugins-0.0.0.20080413~/livegps/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080413/livegps/build.xml 2008-04-13 10:27:25.0 + +diff -urNad josm-plugins-0.0.0.20080518~/livegps/build.xml josm-plugins-0.0.0.20080518/livegps/build.xml +--- josm-plugins-0.0.0.20080518~/livegps/build.xml 2008-04-06 21:10:11.0 +0200 josm-plugins-0.0.0.20080518/livegps/build.xml 2008-05-18 16:09:07.0 +0200 @@ -79,7 +79,7 @@ @@ -27,3 +28,16 @@ diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20 + + +diff -urNad josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml +--- josm-plugins-0.0.0.20080518~/slippy_map_chooser/build.xml 2008-04-06 21:10:11.0 +0200 josm-plugins-0.0.0.20080518/slippy_map_chooser/build.xml 2008-05-18 16:09:39.0 +0200 +@@ -38,7 +38,7 @@ + + + +- ++ + + + diff --git a/debian/rules b/debian/rules index eef52ea..8dc968f 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/application
[josm-plugins] 42/369: Releasing (if someone will sponsor me)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit e7a31e791b12d5b7231b778291a68e0c274626c7 Author: Giovanni Mascellani Date: Tue Jul 8 14:31:28 2008 + Releasing (if someone will sponsor me) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 559be52..7734533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low +josm-plugins (0.0.0.20080518-1) unstable; urgency=low * Upstream SVN revision number again available for plugins ywms and validator. @@ -8,7 +8,7 @@ josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low Putzo * Bumped Standards-Version to 3.8.0 (no changes needed) - -- Giovanni Mascellani Sun, 18 May 2008 15:54:49 +0200 + -- Giovanni Mascellani Mon, 07 Jul 2008 09:10:01 +0200 josm-plugins (0.0.0.20080413-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 26/369: Add patch to correct mistakes in clean targets.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 703bb43d1f12c3c0e6f3d92fbe4c3e72ea91141e Author: Andreas Putzo Date: Sat Apr 12 23:38:42 2008 + Add patch to correct mistakes in clean targets. --- debian/patches/00list | 1 + debian/patches/30_build.dpatch | 30 ++ 2 files changed, 31 insertions(+) diff --git a/debian/patches/00list b/debian/patches/00list index 80eaec1..53f8d89 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ 10_validator 20_disable_svn +30_build diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch new file mode 100755 index 000..c2f34ac --- /dev/null +++ b/debian/patches/30_build.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_build.dpatch by Andreas Putzo +## +## DP: Fix mistage in clean targets of the colorscheme and livegps plugin. + +@DPATCH@ +diff -urNad josm-plugins-0.0.0.20080412~/colorscheme/build.xml josm-plugins-0.0.0.20080412/colorscheme/build.xml +--- josm-plugins-0.0.0.20080412~/colorscheme/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080412/colorscheme/build.xml 2008-04-12 23:35:00.0 + +@@ -69,7 +69,7 @@ + + + +- ++ + + + +diff -urNad josm-plugins-0.0.0.20080412~/livegps/build.xml josm-plugins-0.0.0.20080412/livegps/build.xml +--- josm-plugins-0.0.0.20080412~/livegps/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080412/livegps/build.xml 2008-04-12 23:35:19.0 + +@@ -79,7 +79,7 @@ + + + +- ++ + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 36/369: Added Vcs-* fields in debian/control
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 836dee0553010746f832a916ee0d0335b2b825b0 Author: Giovanni Mascellani Date: Sun May 18 13:57:30 2008 + Added Vcs-* fields in debian/control --- debian/changelog | 5 +++-- debian/control | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2381033..3378fd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -josm-plugins (0.0.0.20080413-2) unstable; urgency=low +josm-plugins (0.0.0.20080413-2) UNRELEASED; urgency=low * Upstream SVN revision number again available for plugins ywms and validator. + * Added Vcs-* fields in debian/control - -- Giovanni Mascellani Mon, 14 Apr 2008 18:13:49 +0200 + -- Giovanni Mascellani Sun, 18 May 2008 15:54:49 +0200 josm-plugins (0.0.0.20080413-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a869d19..d9d2364 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,8 @@ Uploaders: Giovanni Mascellani , Andreas Putzo = 5), java-gcj-compat-dev, josm Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ Package: josm-plugins Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 31/369: Move plugin version changes to the patch where it belongs to.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit be13c5dd1211168a78350d14b9b913564f3d9ba0 Author: Andreas Putzo Date: Sun Apr 13 10:45:11 2008 + Move plugin version changes to the patch where it belongs to. --- debian/changelog | 4 ++-- debian/patches/20_disable_svn.dpatch | 28 debian/patches/30_build.dpatch | 25 - 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09a403c..8950f42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -josm-plugins (0.0.0.20080412-1) unstable; urgency=low +josm-plugins (0.0.0.20080413-1) unstable; urgency=low * Initial release (Closes: #471846) - -- Andreas Putzo Sat, 12 Apr 2008 22:15:24 + + -- Andreas Putzo Sun, 13 Apr 2008 10:02:59 + diff --git a/debian/patches/20_disable_svn.dpatch b/debian/patches/20_disable_svn.dpatch index 169679c..ab482d0 100755 --- a/debian/patches/20_disable_svn.dpatch +++ b/debian/patches/20_disable_svn.dpatch @@ -5,10 +5,10 @@ ## DP: This patch disables this behaviour. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080412~/validator/build.xml josm-plugins-0.0.0.20080412/validator/build.xml josm-plugins-0.0.0.20080412~/validator/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080412/validator/build.xml2008-04-12 22:22:06.0 + -@@ -29,14 +29,6 @@ +diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml +--- josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 10:42:15.0 + +@@ -29,20 +29,10 @@ @@ -23,10 +23,16 @@ diff -urNad josm-plugins-0.0.0.20080412~/validator/build.xml josm-plugins-0.0.0. -diff -urNad josm-plugins-0.0.0.20080412~/ywms/build.xml josm-plugins-0.0.0.20080412/ywms/build.xml josm-plugins-0.0.0.20080412~/ywms/build.xml2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080412/ywms/build.xml 2008-04-12 22:22:23.0 + -@@ -29,14 +29,6 @@ + +- +- + + + +diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml +--- josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:42:23.0 + +@@ -29,20 +29,10 @@ @@ -41,3 +47,9 @@ diff -urNad josm-plugins-0.0.0.20080412~/ywms/build.xml josm-plugins-0.0.0.20080 + +- +- + + + diff --git a/debian/patches/30_build.dpatch b/debian/patches/30_build.dpatch index 8ac7786..d159ce4 100755 --- a/debian/patches/30_build.dpatch +++ b/debian/patches/30_build.dpatch @@ -27,28 +27,3 @@ diff -urNad josm-plugins-0.0.0.20080413~/livegps/build.xml josm-plugins-0.0.0.20 + - -diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-13 10:27:23.0 + -+++ josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 10:28:09.0 + -@@ -33,8 +33,6 @@ - - - -- -- - - - -diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-13 10:27:23.0 + -+++ josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:28:16.0 + -@@ -33,8 +33,6 @@ - - - -- -- - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 38/369: Added slippy_map_chooser plugin description
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 40390182f6e1080f34ac02ffd1a913ee4eb67467 Author: Giovanni Mascellani Date: Mon May 19 15:27:27 2008 + Added slippy_map_chooser plugin description --- debian/control | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 4d3d82f..8612567 100644 --- a/debian/control +++ b/debian/control @@ -18,14 +18,15 @@ Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. . This package contains the following plugins: - * colorscheme - Allows to create different color schemes. - * livegps - Supports live GPS input together with gpsd. - * namefinder - Allows input of place names in JOSM download dialog. - * slippymap - Displays a slippy map grid in JOSM. - * utilsplugin - Several helper utilities. - * validator - Data validator. - * wmsplugin - Displays background images from any WMS source. - * ywms- WMS server for Yahoo imagery. + * colorscheme- Allows to create different color schemes. + * livegps- Supports live GPS input together with gpsd. + * namefinder - Allows input of place names in JOSM download dialog. + * slippymap - Displays a slippy map grid in JOSM. + * utilsplugin- Several helper utilities. + * validator - Data validator. + * wmsplugin - Displays background images from any WMS source. + * ywms - WMS server for Yahoo imagery. + * slippy_map_chooser - Displays a slippy map grid in JOSM download dialog. . JOSM is an editor for OpenStreetMap (OSM) written in Java. The current version supports stand alone GPX tracks, GPX track data -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 41/369: Updated 20_disable_svn.path for plugin slippymap
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 43a3536a9ae7d37668cd02ce456daf7228ee18bc Author: Giovanni Mascellani Date: Mon Jun 30 17:51:23 2008 + Updated 20_disable_svn.path for plugin slippymap --- debian/patches/20_disable_svn.dpatch | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/debian/patches/20_disable_svn.dpatch b/debian/patches/20_disable_svn.dpatch index 1fa91a1..125da7c 100755 --- a/debian/patches/20_disable_svn.dpatch +++ b/debian/patches/20_disable_svn.dpatch @@ -5,9 +5,27 @@ ## DP: This patch disables this behaviour. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-06 21:10:11.0 +0200 -+++ josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 13:15:38.0 +0200 +diff -urNad josm-plugins-0.0.0.20080518~/slippymap/build.xml josm-plugins-0.0.0.20080518/slippymap/build.xml +--- josm-plugins-0.0.0.20080518~/slippymap/build.xml 2008-05-14 17:40:22.0 +0200 josm-plugins-0.0.0.20080518/slippymap/build.xml2008-06-30 19:46:28.0 +0200 +@@ -26,14 +26,6 @@ + + + +- +- +- +- +- +- +- +- + + + +diff -urNad josm-plugins-0.0.0.20080518~/validator/build.xml josm-plugins-0.0.0.20080518/validator/build.xml +--- josm-plugins-0.0.0.20080518~/validator/build.xml 2008-06-30 19:42:26.0 +0200 josm-plugins-0.0.0.20080518/validator/build.xml2008-06-30 19:45:22.0 +0200 @@ -29,14 +29,6 @@ @@ -23,9 +41,9 @@ diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0. -diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-06 21:10:11.0 +0200 -+++ josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 13:15:11.0 +0200 +diff -urNad josm-plugins-0.0.0.20080518~/ywms/build.xml josm-plugins-0.0.0.20080518/ywms/build.xml +--- josm-plugins-0.0.0.20080518~/ywms/build.xml2008-06-30 19:42:26.0 +0200 josm-plugins-0.0.0.20080518/ywms/build.xml 2008-06-30 19:45:22.0 +0200 @@ -29,14 +29,6 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 34/369: Making again revision number available also at build time for ywms and validator
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 8c711f6bc0b55726b82147a243d6a9dc25c89060 Author: Giovanni Mascellani Date: Sun Apr 13 13:12:04 2008 + Making again revision number available also at build time for ywms and validator --- debian/master.xml| 2 ++ debian/patches/20_disable_svn.dpatch | 24 ++-- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/debian/master.xml b/debian/master.xml index 836ff66..e1e2310 100644 --- a/debian/master.xml +++ b/debian/master.xml @@ -5,6 +5,8 @@ + + diff --git a/debian/patches/20_disable_svn.dpatch b/debian/patches/20_disable_svn.dpatch index ab482d0..1fa91a1 100755 --- a/debian/patches/20_disable_svn.dpatch +++ b/debian/patches/20_disable_svn.dpatch @@ -6,9 +6,9 @@ @DPATCH@ diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.20080413/validator/build.xml josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 10:42:15.0 + -@@ -29,20 +29,10 @@ +--- josm-plugins-0.0.0.20080413~/validator/build.xml 2008-04-06 21:10:11.0 +0200 josm-plugins-0.0.0.20080413/validator/build.xml2008-04-13 13:15:38.0 +0200 +@@ -29,14 +29,6 @@ @@ -23,16 +23,10 @@ diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0. - -- -- - - - diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080413/ywms/build.xml josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-06 19:10:11.0 + -+++ josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 10:42:23.0 + -@@ -29,20 +29,10 @@ +--- josm-plugins-0.0.0.20080413~/ywms/build.xml2008-04-06 21:10:11.0 +0200 josm-plugins-0.0.0.20080413/ywms/build.xml 2008-04-13 13:15:11.0 +0200 +@@ -29,14 +29,6 @@ @@ -47,9 +41,3 @@ diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml josm-plugins-0.0.0.20080 - -- -- - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 35/369: Added changelog entry about enabling SVN revision number in ywms and validator
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 8deee3bf1038b635f314bb979c28a95809d8a5e7 Author: Giovanni Mascellani Date: Mon Apr 14 16:23:17 2008 + Added changelog entry about enabling SVN revision number in ywms and validator --- debian/changelog | 7 +++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 359ad12..2381033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +josm-plugins (0.0.0.20080413-2) unstable; urgency=low + + * Upstream SVN revision number again available for plugins ywms and +validator. + + -- Giovanni Mascellani Mon, 14 Apr 2008 18:13:49 +0200 + josm-plugins (0.0.0.20080413-1) unstable; urgency=low * Initial release (Closes: #471846) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 39/369: * Setting package license to GPL-2+ * Inserting slippy_map_chooser copyright stanza
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit ca3d9614d8baefdceeaa2fc46da7ef9165cad748 Author: Giovanni Mascellani Date: Mon May 19 15:35:58 2008 + * Setting package license to GPL-2+ * Inserting slippy_map_chooser copyright stanza --- debian/changelog | 2 ++ debian/copyright | 12 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf52990..8965df4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ josm-plugins (0.0.0.20080518-1) UNRELEASED; urgency=low validator. * Added Vcs-* fields in debian/control * Enables plugin slippy_map_chooser + * Moved to package license GPL-2+, after having cleared it with Andreas +Putzo -- Giovanni Mascellani Sun, 18 May 2008 15:54:49 +0200 diff --git a/debian/copyright b/debian/copyright index 100d46f..478d704 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,13 +2,16 @@ This package was downloaded using the command svn export http://svn.openstreetma 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'. + Files: debian/* Copyright: © 2008 Giovanni Mascellani © 2008 Andreas Putzo -License: GPL +License: GPL-2+ The Debian packaging information is under the GPL, version 3 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'. + Version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: colorscheme/* Copyright: © 2007,2008 Christof Dallermassl @@ -58,3 +61,8 @@ Copyright: © 2007 Francisco R. Santos © 2007 Gabriel Ebner © 2007 Joerg Ostertag License: GPL-2 + +Files: slippy_map_chooser/* +Copyright: © 2007 Immanuel Scholz + © 2007 Tim Haussmann +License: GPL-2+ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 43/369: Bumping to last SVN release
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 1cc7731def6923b6a950ab69723edb3f0fb7ecc1
Author: Giovanni Mascellani
Date: Sun Feb 15 19:05:56 2009 +
Bumping to last SVN release
---
debian/changelog | 6 ++
debian/control| 9 +++--
debian/master.xml | 53 +
debian/rules | 23 +++
4 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7734533..13e9181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low
+
+ * New upstream revision
+
+ -- Giovanni Mascellani Sun, 15 Feb 2009 19:34:54
+0100
+
josm-plugins (0.0.0.20080518-1) unstable; urgency=low
* Upstream SVN revision number again available for plugins ywms and
diff --git a/debian/control b/debian/control
index ba25466..3cd83e2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
Priority: extra
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev,
- josm (>= 0.0.0.20080512)
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
+ josm (>= 0.0.svn1387)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,7 +12,7 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (>= 0.0.0.20080512)
+Depends: josm (>= 0.0.svn1387)
Suggests: gpsd, iceweasel
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
@@ -20,13 +20,10 @@ Description: Plugins for JOSM
This package contains the following plugins:
* colorscheme- Allows to create different color schemes.
* livegps- Supports live GPS input together with gpsd.
- * namefinder - Allows input of place names in JOSM download dialog.
* slippymap - Displays a slippy map grid in JOSM.
* utilsplugin- Several helper utilities.
* validator - Data validator.
* wmsplugin - Displays background images from any WMS source.
- * ywms - WMS server for Yahoo imagery.
- * slippy_map_chooser - Displays a slippy map grid in JOSM download dialog.
.
JOSM is an editor for OpenStreetMap (OSM) written in Java.
The current version supports stand alone GPX tracks, GPX track data
diff --git a/debian/master.xml b/debian/master.xml
index 019164a..d1ff386 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -14,58 +14,39 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
diff --git a/debian/rules b/debian/rules
index 8dc968f..84b3e14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,29 +14,36 @@ DEB_ANT_BUILD_TARGET := build
DEB_ANT_CLEAN_TARGET := clean
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator
wmsplugin ywms slippy_map_chooser
+PLUGINS := colorscheme livegps slippymap utilsplugin validator wmsplugin
DATE := $(shell date +%Y%m%d)
+ifdef SVNREV
+VERSION := 0.0.svn${SVNREV}
+else
+VERSION := 0.0.0.${DATE}
+endif
+DESTDIR := ../tarballs/josm-plugins-${VERSION}
+DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm-plugins from ${SVNREPO}
- @mkdir ../tarballs/josm-plugins-0.0.0.${DATE}
+ @mkdir ${DESTDIR}
@for plugin in $(PLUGINS); do \
echo "Fetching $$plugin plugin"; \
- svn export -r HEAD ${SVNREPO}/"$$plugin"
../tarballs/josm-plugins-0.0.0.${DATE}/"$$plugin"; \
+ svn export -r HEAD ${SVNREPO}/"$$plugin"
${DESTDIR}/"$$plugin"; \
done
- svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
+ svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
${DESTDIR}/svn-info.xml
@echo Removing jar fil
[josm-plugins] 30/369: fix typo, update short description
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 27c59ed6ac9c079a1f76cf7660509aa76f47149a Author: Andreas Putzo Date: Sun Apr 13 10:37:51 2008 + fix typo, update short description --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 9331500..a869d19 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Package: josm-plugins Architecture: all Depends: josm Suggests: gpsd, iceweasel -Description: JOSM plugins +Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. . This package contains the following plugins: @@ -21,7 +21,7 @@ Description: JOSM plugins * slippymap - Displays a slippy map grid in JOSM. * utilsplugin - Several helper utilities. * validator - Data validator. - * wmsplugin - Displays backround images from any WMS source. + * wmsplugin - Displays background images from any WMS source. * ywms- WMS server for Yahoo imagery. . JOSM is an editor for OpenStreetMap (OSM) written in Java. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 18/369: Add a master build file that calls selected plugin builds in a subant. This reduces patching and gives more control about what's actually build.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 2d4cdafa910f0b86c5f565ee59536048d5ce9738 Author: Andreas Putzo Date: Mon Apr 7 21:03:38 2008 + Add a master build file that calls selected plugin builds in a subant. This reduces patching and gives more control about what's actually build. --- debian/master.xml | 63 +++ debian/rules | 1 + 2 files changed, 64 insertions(+) diff --git a/debian/master.xml b/debian/master.xml new file mode 100644 index 000..28abec5 --- /dev/null +++ b/debian/master.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/rules b/debian/rules index f2d8d2c..14e60e6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk JAVA_HOME := /usr/lib/jvm/java-gcj/ ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar +DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml DEB_ANT_BUILD_TARGET := dist DEB_ANT_CLEAN_TARGET := clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 13/369: Enable plugin ywms. Add iceweasel to Suggests. Used by ywms and osmarender plugin.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 91d85aa0ab1e9fe3d45f7b7565a0f210a00cf8ac Author: Andreas Putzo Date: Sun Mar 30 13:37:33 2008 + Enable plugin ywms. Add iceweasel to Suggests. Used by ywms and osmarender plugin. --- debian/control | 2 +- debian/patches/100_ywms.dpatch | 41 + 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 74690b5..753d85a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Homepage: http://josm.openstreetmap.de Package: josm-plugins Architecture: all Depends: josm -Suggests: gpsd +Suggests: gpsd, iceweasel Description: JOSM plugins JOSM (Java OpenStreetMap) plugin collection. . diff --git a/debian/patches/100_ywms.dpatch b/debian/patches/100_ywms.dpatch new file mode 100755 index 000..f7ee372 --- /dev/null +++ b/debian/patches/100_ywms.dpatch @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_ywms.dpatch by Andreas Putzo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml josm-plugins-0.0.0.20080326/ywms/build.xml +--- josm-plugins-0.0.0.20080326~/ywms/build.xml2007-12-19 18:09:31.0 + josm-plugins-0.0.0.20080326/ywms/build.xml 2008-03-29 18:48:50.0 + +@@ -1,13 +1,10 @@ + + + +- +- +- + +- ++ + +- ++ + + + +@@ -28,14 +25,6 @@ + + + +- +- +- +- +- +- +- +- + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 17/369: Started with copyright file for currently enabled plugins. Emailed author's where license is missing.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit e85720c2019334f5a466ba025ec4b4796e81395a Author: Andreas Putzo Date: Sun Mar 30 19:43:17 2008 + Started with copyright file for currently enabled plugins. Emailed author's where license is missing. --- debian/copyright | 62 ++-- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/debian/copyright b/debian/copyright index 03507cb..d189056 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,56 @@ -This package was debianized by Giovanni Mascellani on -Tue, 11 Mar 2008 19:06:41 +0100. +This package was downloaded using the command svn export 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. + +Files: debian/* +Copyright: � 2008 Giovanni Mascellani + � 2008 Andreas Putzo +License: GPL + The Debian packaging information is under the GPL, version 3 or later + +Files: colorscheme/* +Copyright: � 2007,2008 Christof Dallermassl +License: GPL-2 + +Files: lang/* +Copyright: +License: -It was downloaded from +Files: livegps/* +Copyright: � 2007,2008 Frederik Ramm + � 2007,2008 Christof Dallermassl +License: PD -Upstream Author(s): +Files: namefinder/* +Copyright: � 2007,2008 Frederik Ramm +License: PD - - +Files: slippymap/* +Copyright: � 2007 Hakan Tandogan +� 2007 Frederik Ramm +License: PD -Copyright: +Files: utilsplugin/* +Copyright: � 2007 Martijn van Oosterhout +License: missing - - +Files: validator/* +Copyright: � 2007 Francisco R. Santos +License: missing -License: +Files: wmsplugin/* +Copyright: � 2007 Tim Waters +License: missing - +Files: wmsplugin/src/uk/* +Copyright: � 2006 Jonathan Stott +License: GPL-2 -The Debian packaging is (C) 2008, Giovanni Mascellani and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +Files: wmsplugin/src/wmsplugin/WMSInfo.java +Copyright: � 2007 Frederik Ramm +License: missing -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. +Files: ywms/* +Copyright: � 2007 Francisco R. Santos + � 2007 Frederik Ramm +License: missing -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 09/369: Sorry, this dependences were really needed!
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 6a75d885da69295a944e43f448ee9c1b3dace842 Author: Giovanni Mascellani Date: Thu Mar 27 17:33:20 2008 + Sorry, this dependences were really needed! --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4b7cd39..74690b5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: extra Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo -Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev +Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, java-gcj-compat-dev, josm, libgettext-commons-java Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 14/369: Enable plugin ywms.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 69e11de56001a527fa30c13134418448c0168e74 Author: Andreas Putzo Date: Sun Mar 30 13:42:44 2008 + Enable plugin ywms. --- debian/patches/00list | 1 + debian/patches/10_build.dpatch | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/00list b/debian/patches/00list index 2eebd70..f6d8dc8 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,3 +8,4 @@ 70_namefinder 80_colorscheme 90_slippymap +100_ywms diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch index 04405ec..de0b51b 100755 --- a/debian/patches/10_build.dpatch +++ b/debian/patches/10_build.dpatch @@ -6,7 +6,7 @@ @DPATCH@ diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/build.xml --- josm-plugins-0.0.0.20080326~/build.xml 2008-03-05 20:13:48.0 + -+++ josm-plugins-0.0.0.20080326/build.xml 2008-03-29 13:36:39.0 + josm-plugins-0.0.0.20080326/build.xml 2008-03-30 13:41:54.0 + @@ -1,43 +1,49 @@ @@ -51,8 +51,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/b -- -+ + - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 15/369: Setting ywms plugin version from SVN revision fixed
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 009e535c9e259c19e26690f6a844a12904628ed5 Author: Giovanni Mascellani Date: Sun Mar 30 18:22:40 2008 + Setting ywms plugin version from SVN revision fixed --- debian/patches/100_ywms.dpatch | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/patches/100_ywms.dpatch b/debian/patches/100_ywms.dpatch index f7ee372..b8a70f2 100755 --- a/debian/patches/100_ywms.dpatch +++ b/debian/patches/100_ywms.dpatch @@ -5,9 +5,9 @@ ## DP: No description. @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml josm-plugins-0.0.0.20080326/ywms/build.xml josm-plugins-0.0.0.20080326~/ywms/build.xml2007-12-19 18:09:31.0 + -+++ josm-plugins-0.0.0.20080326/ywms/build.xml 2008-03-29 18:48:50.0 + +diff -urNad josm-plugins-0.0.0.20080320~/ywms/build.xml josm-plugins-0.0.0.20080320/ywms/build.xml +--- josm-plugins-0.0.0.20080320~/ywms/build.xml2008-03-30 20:17:32.0 +0200 josm-plugins-0.0.0.20080320/ywms/build.xml 2008-03-30 20:18:40.0 +0200 @@ -1,13 +1,10 @@ @@ -24,7 +24,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml josm-plugins-0.0.0.20080 -@@ -28,14 +25,6 @@ +@@ -28,14 +25,7 @@ @@ -36,6 +36,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml josm-plugins-0.0.0.20080 - - - ++ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 21/369: * Forgot to rename patch in 00list. * Use correct target in debian/rules.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 20494208f9f0d191a95deb22ebc98338b56742a7 Author: Andreas Putzo Date: Mon Apr 7 21:12:55 2008 + * Forgot to rename patch in 00list. * Use correct target in debian/rules. --- debian/patches/00list | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/00list b/debian/patches/00list index eb13dcb..14899de 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1 @@ -21_validator +10_validator diff --git a/debian/rules b/debian/rules index 14e60e6..134a1d4 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml -DEB_ANT_BUILD_TARGET := dist +DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 25/369: Complete copyright.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 91d81dfac440289f5dd439d5eda7758893bf0bfc Author: Andreas Putzo Date: Sat Apr 12 23:19:07 2008 + Complete copyright. --- debian/changelog | 4 ++-- debian/copyright | 64 ++-- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/debian/changelog b/debian/changelog index d659bbf..09a403c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -josm-plugins (0.0.0.20080320-1) unstable; urgency=low +josm-plugins (0.0.0.20080412-1) unstable; urgency=low * Initial release (Closes: #471846) - -- Giovanni Mascellani Wed, 12 Mar 2008 23:38:55 +0100 + -- Andreas Putzo Sat, 12 Apr 2008 22:15:24 + diff --git a/debian/copyright b/debian/copyright index d189056..100d46f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,54 +3,58 @@ All .jar files have been removed. All other downloaded files have been packaged as GNU zip'ed tarball without further modifications. Files: debian/* -Copyright: � 2008 Giovanni Mascellani - � 2008 Andreas Putzo +Copyright: © 2008 Giovanni Mascellani + © 2008 Andreas Putzo License: GPL - The Debian packaging information is under the GPL, version 3 or later + The Debian packaging information is under the GPL, version 3 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: colorscheme/* -Copyright: � 2007,2008 Christof Dallermassl +Copyright: © 2007,2008 Christof Dallermassl License: GPL-2 - -Files: lang/* -Copyright: -License: + 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: 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: namefinder/* -Copyright: � 2007,2008 Frederik Ramm +Copyright: © 2007,2008 Frederik Ramm License: PD + The namefinder plugin was put in the public domain by Frederik Ramm. Files: slippymap/* -Copyright: � 2007 Hakan Tandogan -� 2007 Frederik Ramm +Copyright: © 2007 Hakan Tandogan + © 2007 Frederik Ramm License: PD + The slippymap plugin was put in the public domain by its authors. Files: utilsplugin/* -Copyright: � 2007 Martijn van Oosterhout -License: missing +Copyright: © 2007 Frederik Ramm + © 2007 Gabriel Ebner +License: GPL-2+ Files: validator/* -Copyright: � 2007 Francisco R. Santos -License: missing - -Files: wmsplugin/* -Copyright: � 2007 Tim Waters -License: missing - -Files: wmsplugin/src/uk/* -Copyright: � 2006 Jonathan Stott +Copyright: © 2007 Francisco R. Santos + © 2007 Joerg Ostertag + © 2007,2008 Gabriel Ebner License: GPL-2 -Files: wmsplugin/src/wmsplugin/WMSInfo.java -Copyright: � 2007 Frederik Ramm -License: missing +Files: wmsplugin/* +Copyright: © 2007 Tim Waters + © 2007 Frederik Ramm + © 2007 Jonathan Stott + © 2007 Ulf Lamping + © 2007,2008 Gabriel Ebner +License: GPL-2+ Files: ywms/* -Copyright: � 2007 Francisco R. Santos - � 2007 Frederik Ramm -License: missing +Copyright: © 2007 Francisco R. Santos + © 2007 Frederik Ramm + © 2007 Gabriel Ebner + © 2007 Joerg Ostertag +License: GPL-2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 20/369: rename remaining plugin.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 87d55bf434e6320e1b7c6dcfd4064e13efe277ed
Author: Andreas Putzo
Date: Mon Apr 7 21:05:49 2008 +
rename remaining plugin.
---
debian/patches/00list | 10 --
debian/patches/{21_validator.dpatch => 10_validator.dpatch} | 0
2 files changed, 10 deletions(-)
diff --git a/debian/patches/00list b/debian/patches/00list
index f6d8dc8..eb13dcb 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,11 +1 @@
-10_build
-20_validator
21_validator
-30_utilsplugin
-40_wmsplugin
-50_livegps
-60_lang
-70_namefinder
-80_colorscheme
-90_slippymap
-100_ywms
diff --git a/debian/patches/21_validator.dpatch
b/debian/patches/10_validator.dpatch
similarity index 100%
rename from debian/patches/21_validator.dpatch
rename to debian/patches/10_validator.dpatch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 24/369: Enable ywms and validator plugins.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 36ee30ff4e595c062e441822b384659ad201c55c
Author: Andreas Putzo
Date: Sat Apr 12 22:26:49 2008 +
Enable ywms and validator plugins.
---
debian/master.xml | 16 +---
debian/rules | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/debian/master.xml b/debian/master.xml
index 28abec5..836ff66 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -12,11 +12,11 @@
-
+
@@ -44,19 +44,21 @@
-
+
-
+
+
-
-
+
+
+
diff --git a/debian/rules b/debian/rules
index e307c34..b3627ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ DEB_ANT_BUILD_TARGET := build
DEB_ANT_CLEAN_TARGET := clean
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS = validator colorscheme livegps namefinder slippymap utilsplugin
wmsplugin
+PLUGINS = validator colorscheme livegps namefinder slippymap utilsplugin
wmsplugin ywms
DATE := $(shell date +%Y%m%d)
@@ -24,7 +24,7 @@ get-orig-source:
@echo Downloading josm-plugins from ${SVNREPO}
@mkdir ../tarballs/josm-plugins-0.0.0.${DATE}
@for plugin in $(PLUGINS); do \
- echo "Fetching $$plugin"; \
+ echo "Fetching $$plugin plugin"; \
svn export -r HEAD ${SVNREPO}/"$$plugin"
../tarballs/josm-plugins-0.0.0.${DATE}/"$$plugin"; \
done
svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 23/369: Disable execution of svn during build.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit b69eb77421a87d51f5cad5ef41eee017df720fe5 Author: Andreas Putzo Date: Sat Apr 12 22:26:12 2008 + Disable execution of svn during build. --- debian/patches/00list| 1 + debian/patches/20_disable_svn.dpatch | 43 2 files changed, 44 insertions(+) diff --git a/debian/patches/00list b/debian/patches/00list index 14899de..80eaec1 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ 10_validator +20_disable_svn diff --git a/debian/patches/20_disable_svn.dpatch b/debian/patches/20_disable_svn.dpatch new file mode 100755 index 000..169679c --- /dev/null +++ b/debian/patches/20_disable_svn.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_disable_svn.dpatch by Andreas Putzo +## +## DP: The validator and ywms plugins try to execute the svn command during build. +## DP: This patch disables this behaviour. + +@DPATCH@ +diff -urNad josm-plugins-0.0.0.20080412~/validator/build.xml josm-plugins-0.0.0.20080412/validator/build.xml +--- josm-plugins-0.0.0.20080412~/validator/build.xml 2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080412/validator/build.xml2008-04-12 22:22:06.0 + +@@ -29,14 +29,6 @@ + + + +- +- +- +- +- +- +- +- + + + +diff -urNad josm-plugins-0.0.0.20080412~/ywms/build.xml josm-plugins-0.0.0.20080412/ywms/build.xml +--- josm-plugins-0.0.0.20080412~/ywms/build.xml2008-04-06 19:10:11.0 + josm-plugins-0.0.0.20080412/ywms/build.xml 2008-04-12 22:22:23.0 + +@@ -29,14 +29,6 @@ + + + +- +- +- +- +- +- +- +- + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 08/369: * Move package to main. Change build-dep, etc. accordingly. * Add ant.properties. * Added myself among uploaders. * Remove jar files in the get-orig-source target.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 986496e636591d98a84e401a5931a96e98a6522a
Author: Andreas Putzo
Date: Wed Mar 26 19:36:30 2008 +
* Move package to main. Change build-dep, etc. accordingly.
* Add ant.properties.
* Added myself among uploaders.
* Remove jar files in the get-orig-source target.
---
debian/ant.properties | 2 ++
debian/control| 6 +++---
debian/rules | 8
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 000..7385c7f
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
diff --git a/debian/control b/debian/control
index 0d45123..4b7cd39 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: josm-plugins
-Section: contrib/utils
+Section: utils
Priority: extra
Maintainer: Debian GIS Project
-Uploaders: Giovanni Mascellani
-Build-Depends: debhelper (>= 5), cdbs, dpatch, josm, gettext,
libgettext-commons-java
+Uploaders: Giovanni Mascellani , Andreas Putzo
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev
Standards-Version: 3.7.3
Homepage: http://josm.openstreetmap.de
diff --git a/debian/rules b/debian/rules
index 3cf5832..0c336c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/dpatch.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun/ /usr/lib/jvm/java-1.5.0-sun/
+JAVA_HOME := /usr/lib/jvm/java-gcj/
+ANT_HOME := /usr/share/ant
DEB_ANT_BUILD_TARGET := dist
DEB_ANT_CLEAN_TARGET := clean
@@ -18,9 +19,8 @@ get-orig-source:
@echo Downloading josm-plugins from ${SVNREPO}
svn export -r HEAD ${SVNREPO} ../tarballs/josm-plugins-0.0.0.${DATE}
svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
- #@echo Removing jar files and test data
- #find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm {}
\;
- #rm -f ../tarballs/josm-plugins-0.0.0.${DATE}/data/*
+ @echo Removing jar files
+ find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm -v
{} \;
@echo Building snapshot tarball
tar czf ../tarballs/josm-plugins_0.0.0.${DATE}.orig.tar.gz -C
../tarballs josm-plugins-0.0.0.${DATE}
@echo Cleaning up
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 11/369: Add josm.jar to classpath
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 7681588d9123a73aa27ead742cc3efabea4bd77e Author: Andreas Putzo Date: Sat Mar 29 13:50:24 2008 + Add josm.jar to classpath --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 0c336c3..f2d8d2c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/cdbs/1/rules/dpatch.mk JAVA_HOME := /usr/lib/jvm/java-gcj/ ANT_HOME := /usr/share/ant +DEB_JARS := /usr/share/josm/josm.jar + DEB_ANT_BUILD_TARGET := dist DEB_ANT_CLEAN_TARGET := clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 10/369: Add patch for validator plugin to compile with gcj.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 89d840ffe359c3af09af655d17371a546e3b61d9
Author: Andreas Putzo
Date: Thu Mar 27 18:31:07 2008 +
Add patch for validator plugin to compile with gcj.
---
debian/patches/00list | 1 +
debian/patches/21_validator.dpatch | 19 +++
2 files changed, 20 insertions(+)
diff --git a/debian/patches/00list b/debian/patches/00list
index 60883a4..8563860 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,6 @@
10_build
20_validator
+21_validator
30_utilsplugin
40_wmsplugin
50_livegps
diff --git a/debian/patches/21_validator.dpatch
b/debian/patches/21_validator.dpatch
new file mode 100755
index 000..5083da6
--- /dev/null
+++ b/debian/patches/21_validator.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 21_validator.dpatch by Andreas Putzo
+##
+## DP: Add cast operator for OsmPrimitive.
+## DP: This is necessary to compile with gcj.
+
+@DPATCH@
+diff -urNad
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
+---
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-01-14 11:16:12.0 +
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-03-27 18:26:55.0 +
+@@ -504,7 +504,7 @@
+ String key = prop.getKey();
+ String value = prop.getValue();
+ if( value == null || value.trim().length() == 0
)
+- commands.add( new
ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, null) );
++ commands.add( new
ChangePropertyCommand(Collections.singleton((OsmPrimitive)primitives.get(i)),
key, null) );
+ else
+ {
+ String replacementKey =
spellCheckKeyData.get(key);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 19/369: Remove old patches.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit a2acdef9669139570a32f19820fd8e8c246929d1 Author: Andreas Putzo Date: Mon Apr 7 21:05:08 2008 + Remove old patches. --- debian/patches/100_ywms.dpatch | 41 - debian/patches/10_build.dpatch | 89 --- debian/patches/20_validator.dpatch | 83 -- debian/patches/30_utilsplugin.dpatch | 61 - debian/patches/40_wmsplugin.dpatch | 65 -- debian/patches/50_livegps.dpatch | 164 --- debian/patches/60_lang.dpatch| 94 debian/patches/70_namefinder.dpatch | 74 debian/patches/80_colorscheme.dpatch | 47 -- debian/patches/90_slippymap.dpatch | 21 - 10 files changed, 739 deletions(-) diff --git a/debian/patches/100_ywms.dpatch b/debian/patches/100_ywms.dpatch deleted file mode 100755 index 9148c0e..000 --- a/debian/patches/100_ywms.dpatch +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 100_ywms.dpatch by Andreas Putzo -## -## DP: Patch for plugin ywms - -@DPATCH@ -diff -urNad josm-plugins-0.0.0.20080320~/ywms/build.xml josm-plugins-0.0.0.20080320/ywms/build.xml josm-plugins-0.0.0.20080320~/ywms/build.xml2008-03-30 20:17:32.0 +0200 -+++ josm-plugins-0.0.0.20080320/ywms/build.xml 2008-03-30 20:18:40.0 +0200 -@@ -1,13 +1,10 @@ - - - -- -- -- - -- -+ - -- -+ - - - -@@ -28,14 +25,7 @@ - - - -- -- -- -- -- -- -- -- -+ - - - diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch deleted file mode 100755 index de0b51b..000 --- a/debian/patches/10_build.dpatch +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by -## -## DP: Patch for the main build.xml - -@DPATCH@ -diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/build.xml josm-plugins-0.0.0.20080326~/build.xml 2008-03-05 20:13:48.0 + -+++ josm-plugins-0.0.0.20080326/build.xml 2008-03-30 13:41:54.0 + -@@ -1,43 +1,49 @@ - - -+ -+ -+ -+ - -+ - - - - -- -- -- -- -+ -+ -+ -+ - - -- -- -- -- -+ -+ -+ -+ - -- -+ - - - - - - -- -+ - - -- -- -+ -+ - - - -@@ -63,12 +69,16 @@ - - - -+ -+ - - -+ - - diff --git a/debian/patches/20_validator.dpatch b/debian/patches/20_validator.dpatch deleted file mode 100755 index 75dacca..000 --- a/debian/patches/20_validator.dpatch +++ /dev/null @@ -1,83 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by -## -## DP: Patch for plugin validator - -@DPATCH@ -diff -urNad josm-plugins-0.0.0.20080316~/validator/build.xml josm-plugins-0.0.0.20080316/validator/build.xml josm-plugins-0.0.0.20080316~/validator/build.xml 2008-03-16 15:45:08.0 +0100 -+++ josm-plugins-0.0.0.20080316/validator/build.xml2008-03-16 15:50:39.0 +0100 -@@ -1,41 +1,48 @@ - - - -+ - -- -+ - - -+ - - - - -- -+ - - - - -- -+ - - - -- -+ - - - -+ -+ - - - -@@ -49,10 +56,11 @@ - - - -- -+ - - - -+ - - diff --git a/debian/patches/30_utilsplugin.dpatch b/debian/patches/30_utilsplugin.dpatch deleted file mode 100755 index 7470a6e..000 --- a/debian/patches/30_utilsplugin.dpatch +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_build.dpatch by -## -## DP: Patch for plugin utilsplugin - -@DPATCH@ -diff -urNad josm-plugins-0.0.0.20080311~/utilsplugin/build.xml josm-plugins-0.0.0.20080311/utilsplugin/build.xml josm-plugins-0.0.0.20080311~/utilsplugin/build.xml 2008-03-16 11:24:34.0 +0100 -+++ josm-plugins-0.0.0.20080311/utilsplugin/build.xml 2008-03-16 11:24:50.0 +0100 -@@ -1,21 +1,25 @@ - - - -+ - - -+ - -- -+ - - - -@@ -27,7 +31,7 @@ - - - -- -+ - - - -@@ -43,11 +47,14 @@ - - - -- -+ - - - -+ -+ - diff --git a/debian/patches/40_wmsplugin.dpatch b/debian/patches/40_wmsplugin.dpatch deleted file mode 100755 index f935c99..000 --- a/debian/patches/40_wmsplugin.dpatch +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_wmsplugin.dpatch by -## -## DP: Patch for plugin wmsplugin - -@DPATCH@ -diff -urNad josm-plugins-0.0.0.20080316~/wmsplugin/build.xml josm-plugins-0.0.0.20080316/wmsplugin/build.xml josm-plugins-0.0.0.20080316~/wmsplugin/build.xml 2008-02-04 15:18:27.0 +0100 -+++ josm-plugins-0.0.0.200803
[josm-plugins] 16/369: Added description to some patches
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit fbed1ca27fda75864ae0fa2ac9b3fddb274c1189 Author: Giovanni Mascellani Date: Sun Mar 30 18:30:17 2008 + Added description to some patches --- debian/patches/100_ywms.dpatch | 3 +-- debian/patches/80_colorscheme.dpatch | 3 +-- debian/patches/90_slippymap.dpatch | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/patches/100_ywms.dpatch b/debian/patches/100_ywms.dpatch index b8a70f2..9148c0e 100755 --- a/debian/patches/100_ywms.dpatch +++ b/debian/patches/100_ywms.dpatch @@ -1,8 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 100_ywms.dpatch by Andreas Putzo ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin ywms @DPATCH@ diff -urNad josm-plugins-0.0.0.20080320~/ywms/build.xml josm-plugins-0.0.0.20080320/ywms/build.xml diff --git a/debian/patches/80_colorscheme.dpatch b/debian/patches/80_colorscheme.dpatch index c300df0..5ee4fbf 100755 --- a/debian/patches/80_colorscheme.dpatch +++ b/debian/patches/80_colorscheme.dpatch @@ -1,8 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 80_colorscheme.dpatch by Andreas Putzo ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin colorscheme @DPATCH@ diff -urNad josm-plugins-0.0.0.20080326~/colorscheme/build.xml josm-plugins-0.0.0.20080326/colorscheme/build.xml diff --git a/debian/patches/90_slippymap.dpatch b/debian/patches/90_slippymap.dpatch index 3bae9d4..6f0906b 100755 --- a/debian/patches/90_slippymap.dpatch +++ b/debian/patches/90_slippymap.dpatch @@ -1,8 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 90_slippymap.dpatch by Andreas Putzo ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin slippymap @DPATCH@ diff -urNad josm-plugins-0.0.0.20080326~/slippymap/build.xml josm-plugins-0.0.0.20080326/slippymap/build.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 22/369: debian/rules: only fetch configured plugins in get-orig-source target.
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit 2cd6781456fafbfcc0569d406657bc479699fcc4
Author: Andreas Putzo
Date: Mon Apr 7 21:59:08 2008 +
debian/rules: only fetch configured plugins in get-orig-source target.
---
debian/rules | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 134a1d4..e307c34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,19 @@ DEB_ANT_BUILD_TARGET := build
DEB_ANT_CLEAN_TARGET := clean
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
+PLUGINS = validator colorscheme livegps namefinder slippymap utilsplugin
wmsplugin
+
DATE := $(shell date +%Y%m%d)
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm-plugins from ${SVNREPO}
- svn export -r HEAD ${SVNREPO} ../tarballs/josm-plugins-0.0.0.${DATE}
+ @mkdir ../tarballs/josm-plugins-0.0.0.${DATE}
+ @for plugin in $(PLUGINS); do \
+ echo "Fetching $$plugin"; \
+ svn export -r HEAD ${SVNREPO}/"$$plugin"
../tarballs/josm-plugins-0.0.0.${DATE}/"$$plugin"; \
+ done
svn info --xml
http://svn.openstreetmap.org/applications/editors/josm/plugins/ >
../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
@echo Removing jar files
find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm -v
{} \;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 12/369: Enable plugins: slippymap, colorscheme
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 95f7b7d11b67bbe5fa012f5aa3b809f76a275dd2 Author: Andreas Putzo Date: Sat Mar 29 13:51:00 2008 + Enable plugins: slippymap, colorscheme --- debian/patches/00list| 2 ++ debian/patches/10_build.dpatch | 21 +--- debian/patches/80_colorscheme.dpatch | 48 debian/patches/90_slippymap.dpatch | 22 + 4 files changed, 84 insertions(+), 9 deletions(-) diff --git a/debian/patches/00list b/debian/patches/00list index 8563860..2eebd70 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -6,3 +6,5 @@ 50_livegps 60_lang 70_namefinder +80_colorscheme +90_slippymap diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch index 11b4860..04405ec 100755 --- a/debian/patches/10_build.dpatch +++ b/debian/patches/10_build.dpatch @@ -4,9 +4,9 @@ ## DP: Patch for the main build.xml @DPATCH@ -diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/build.xml josm-plugins-0.0.0.20080320~/build.xml 2008-03-22 14:24:19.0 +0100 -+++ josm-plugins-0.0.0.20080320/build.xml 2008-03-23 11:19:06.0 +0100 +diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/build.xml +--- josm-plugins-0.0.0.20080326~/build.xml 2008-03-05 20:13:48.0 + josm-plugins-0.0.0.20080326/build.xml 2008-03-29 13:36:39.0 + @@ -1,43 +1,49 @@ @@ -33,18 +33,21 @@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/b - + + -+ ++ + - -+ ++ ++ ++ - -+--> ++ diff --git a/debian/patches/80_colorscheme.dpatch b/debian/patches/80_colorscheme.dpatch new file mode 100755 index 000..c300df0 --- /dev/null +++ b/debian/patches/80_colorscheme.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 80_colorscheme.dpatch by Andreas Putzo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad josm-plugins-0.0.0.20080326~/colorscheme/build.xml josm-plugins-0.0.0.20080326/colorscheme/build.xml +--- josm-plugins-0.0.0.20080326~/colorscheme/build.xml 2007-12-19 18:09:31.0 + josm-plugins-0.0.0.20080326/colorscheme/build.xml 2008-03-29 13:43:50.0 + +@@ -1,13 +1,10 @@ + + + +- +- +- + +- ++ + +- ++ + + + +@@ -22,7 +19,7 @@ + + + +- ++ + +
[josm-plugins] 07/369: Added support for plugins namefinder and lang-*
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 82c17d4a7c97f1534822eafd57646e8d4346aca8 Author: Giovanni Mascellani Date: Mon Mar 24 17:30:02 2008 + Added support for plugins namefinder and lang-* --- debian/control | 2 +- debian/patches/00list | 2 + debian/patches/10_build.dpatch | 10 ++-- debian/patches/60_lang.dpatch | 94 + debian/patches/70_namefinder.dpatch | 74 + 5 files changed, 176 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 3dd9940..0d45123 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/utils Priority: extra Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani -Build-Depends: debhelper (>= 5), cdbs, dpatch, josm +Build-Depends: debhelper (>= 5), cdbs, dpatch, josm, gettext, libgettext-commons-java Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de diff --git a/debian/patches/00list b/debian/patches/00list index 8a60326..60883a4 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -3,3 +3,5 @@ 30_utilsplugin 40_wmsplugin 50_livegps +60_lang +70_namefinder diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch index 5e7e39a..11b4860 100755 --- a/debian/patches/10_build.dpatch +++ b/debian/patches/10_build.dpatch @@ -5,8 +5,8 @@ @DPATCH@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/build.xml josm-plugins-0.0.0.20080320~/build.xml 2008-03-20 21:44:46.0 +0100 -+++ josm-plugins-0.0.0.20080320/build.xml 2008-03-20 21:45:08.0 +0100 +--- josm-plugins-0.0.0.20080320~/build.xml 2008-03-22 14:24:19.0 +0100 josm-plugins-0.0.0.20080320/build.xml 2008-03-23 11:19:06.0 +0100 @@ -1,43 +1,49 @@ @@ -31,14 +31,14 @@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml josm-plugins-0.0.0.20080320/b - - - -- + + + + -+ ++ + +- ++ + + + + + + +- ++ + + + +@@ -23,8 +25,14 @@ + + + +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -36,7 +44,7 @@ + + + +- ++ + + + +@@ -46,7 +54,7 @@ + + + +- ++ + + + + + + +- ++ + + + +- ++ + + + diff --git a/debian/patches/70_namefinder.dpatch b/debian/patches/70_namefinder.dpatch new file mode 100755 index 000..7284170 --- /dev/null +++ b/debian/patches/70_namefinder.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_namefinder.dpatch by +## +## DP: Patch for plugin namefinder + +@DPATCH@ +diff -urNad josm-plugins-0.0.0.20080320~/namefinder/build.xml josm-plugins-0.0.0.20080320/namefinder/build.xml +--- josm-plugins-0.0.0.20080320~/namefinder/build.xml 2007-12-19 19:09:31.0 +0100 josm-plugins-0.0.0.20080320/namefinder/build.xml 2008-03-23 11:18:18.0 +0100 +@@ -1,30 +1,33 @@ + + + ++ + +- ++ + + + + + +- ++ + + + + +- ++ + + + + + +- ++ ++ + + + + + +- ++ + + + +@@ -47,9 +51,11 @@ + + + ++ + + + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 06/369: Fixed 40_wmsplugin.dpatch header
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit a7389e3e45b8971597bbcdd7db613eb868c38990 Author: Giovanni Mascellani Date: Thu Mar 20 21:08:41 2008 + Fixed 40_wmsplugin.dpatch header --- debian/patches/40_wmsplugin.dpatch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/patches/40_wmsplugin.dpatch b/debian/patches/40_wmsplugin.dpatch index c0fe46a..f935c99 100755 --- a/debian/patches/40_wmsplugin.dpatch +++ b/debian/patches/40_wmsplugin.dpatch @@ -1,8 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 40_wmsplugin.dpatch by ## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: Patch for plugin wmsplugin @DPATCH@ diff -urNad josm-plugins-0.0.0.20080316~/wmsplugin/build.xml josm-plugins-0.0.0.20080316/wmsplugin/build.xml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 05/369: Added support for livegps
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm-plugins.
commit ec4a937b1e2a009174a3cc92b5f77a4d1390904e
Author: Giovanni Mascellani
Date: Thu Mar 20 21:07:20 2008 +
Added support for livegps
---
debian/control | 1 +
debian/patches/00list| 1 +
debian/patches/10_build.dpatch | 10 +--
debian/patches/50_livegps.dpatch | 164 +++
4 files changed, 171 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index eab99ff..3dd9940 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Homepage: http://josm.openstreetmap.de
Package: josm-plugins
Architecture: all
Depends: josm
+Suggests: gpsd
Description: JOSM plugins
JOSM (Java OpenStreetMap) plugin collection.
.
diff --git a/debian/patches/00list b/debian/patches/00list
index 65c225f..8a60326 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@
20_validator
30_utilsplugin
40_wmsplugin
+50_livegps
diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch
index 5fef639..5e7e39a 100755
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10_build.dpatch
@@ -4,9 +4,9 @@
## DP: Patch for the main build.xml
@DPATCH@
-diff -urNad josm-plugins-0.0.0.20080316~/build.xml
josm-plugins-0.0.0.20080316/build.xml
josm-plugins-0.0.0.20080316~/build.xml 2008-03-16 22:19:52.0
+0100
-+++ josm-plugins-0.0.0.20080316/build.xml 2008-03-16 22:20:25.0
+0100
+diff -urNad josm-plugins-0.0.0.20080320~/build.xml
josm-plugins-0.0.0.20080320/build.xml
+--- josm-plugins-0.0.0.20080320~/build.xml 2008-03-20 21:44:46.0
+0100
josm-plugins-0.0.0.20080320/build.xml 2008-03-20 21:45:08.0
+0100
@@ -1,43 +1,49 @@
@@ -49,11 +49,11 @@ diff -urNad josm-plugins-0.0.0.20080316~/build.xml
josm-plugins-0.0.0.20080316/b
-
-+
-
-+
-->
++
-
diff --git a/debian/patches/50_livegps.dpatch b/debian/patches/50_livegps.dpatch
new file mode 100755
index 000..2a599af
--- /dev/null
+++ b/debian/patches/50_livegps.dpatch
@@ -0,0 +1,164 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_livegps.dpatch by
+##
+## DP: Patch for plugin livegps
+
+@DPATCH@
+diff -urNad josm-plugins-0.0.0.20080320~/livegps/build.xml
josm-plugins-0.0.0.20080320/livegps/build.xml
+--- josm-plugins-0.0.0.20080320~/livegps/build.xml 2008-03-20
21:54:50.0 +0100
josm-plugins-0.0.0.20080320/livegps/build.xml 2008-03-20
21:56:44.0 +0100
+@@ -1,26 +1,34 @@
+
+
+
++
+
+
+
++
+
++
+
+-
++
+
++
+
+
+
+@@ -29,21 +37,23 @@
+
+
+
++
+
+
+
+-
++
+
+-
++
+
+
+
+
+-
++
+
+
+
+@@ -55,8 +65,9 @@
+
+
+
+-
+-
++
++
++
+
+
+
++
+
+
+-java version: ${java.version}
++
++
+
+
+
+-
+-
++
++
+
+
+
+
++
++
Add other two -
+
+
+ ${ant.project.name}
+@@ -96,19 +112,21 @@
+
+
+
++-->
+
+
++
++ Add other two -
+
+ ${plugin.site.description}
+ ${plugin.site.url}
+
+
+-
++ Add other two -
+
+
+ ${ant.project.name}
+@@ -122,8 +140,10 @@
+
+
+
++-->
+
+
++
+
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm-plugins.git
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 04/369: Changelog cleaned
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 134d00409ab301598a2ecd8cb1f269f99c1ae213 Author: Giovanni Mascellani Date: Thu Mar 20 16:59:56 2008 + Changelog cleaned --- debian/changelog | 41 ++--- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index c40a34c..d659bbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,42 +1,5 @@ -josm-plugins (0.0.0.20080316-2) unstable; urgency=low +josm-plugins (0.0.0.20080320-1) unstable; urgency=low - * Added wmsplugin - - -- Giovanni Mascellani Sun, 16 Mar 2008 22:20:55 +0100 - -josm-plugins (0.0.0.20080316-1) unstable; urgency=low - - * Update to latest SVN release - - -- Giovanni Mascellani Sun, 16 Mar 2008 15:30:26 +0100 - -josm-plugins (0.0.0.20080311-5) unstable; urgency=low - - * Splitted patch 10_build in separate patch, one per plugin - - -- Giovanni Mascellani Sun, 16 Mar 2008 13:50:06 +0100 - -josm-plugins (0.0.0.20080311-4) unstable; urgency=low - - * Fixed out-of-dpatch changes - - -- Giovanni Mascellani Sun, 16 Mar 2008 11:25:18 +0100 - -josm-plugins (0.0.0.20080311-3) unstable; urgency=low - - * The plugins built so far are effectively installed, and not only built! -;-) - - -- Giovanni Mascellani Thu, 13 Mar 2008 00:13:17 +0100 - -josm-plugins (0.0.0.20080311-2) unstable; urgency=low - - * Switched to dpatch - - -- Giovanni Mascellani Wed, 12 Mar 2008 23:39:20 +0100 - -josm-plugins (0.0.0.20080311-1) unstable; urgency=low - - * Initial release (Closes: #) + * Initial release (Closes: #471846) -- Giovanni Mascellani Wed, 12 Mar 2008 23:38:55 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 01/369: Creating trunk directory
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit f8169ba138e1b1cf6d980492704b3690163dc6ac Author: Andreas Putzo Date: Mon Mar 17 19:42:48 2008 + Creating trunk directory -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] 02/369: [svn-inject] Applying Debian modifications to trunk
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit ee11d12b08daaabbd97f9d8ffdb6f252e9de56b3 Author: Andreas Putzo Date: Mon Mar 17 19:43:02 2008 + [svn-inject] Applying Debian modifications to trunk --- debian/changelog | 42 + debian/compat| 1 + debian/control | 24 ++ debian/copyright | 24 ++ debian/josm-plugins.dirs | 1 + debian/josm-plugins.install | 1 + debian/patches/00list| 4 ++ debian/patches/10_build.dpatch | 87 debian/patches/20_validator.dpatch | 83 ++ debian/patches/30_utilsplugin.dpatch | 61 + debian/patches/40_wmsplugin.dpatch | 66 +++ debian/rules | 33 ++ 12 files changed, 427 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000..c40a34c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,42 @@ +josm-plugins (0.0.0.20080316-2) unstable; urgency=low + + * Added wmsplugin + + -- Giovanni Mascellani Sun, 16 Mar 2008 22:20:55 +0100 + +josm-plugins (0.0.0.20080316-1) unstable; urgency=low + + * Update to latest SVN release + + -- Giovanni Mascellani Sun, 16 Mar 2008 15:30:26 +0100 + +josm-plugins (0.0.0.20080311-5) unstable; urgency=low + + * Splitted patch 10_build in separate patch, one per plugin + + -- Giovanni Mascellani Sun, 16 Mar 2008 13:50:06 +0100 + +josm-plugins (0.0.0.20080311-4) unstable; urgency=low + + * Fixed out-of-dpatch changes + + -- Giovanni Mascellani Sun, 16 Mar 2008 11:25:18 +0100 + +josm-plugins (0.0.0.20080311-3) unstable; urgency=low + + * The plugins built so far are effectively installed, and not only built! +;-) + + -- Giovanni Mascellani Thu, 13 Mar 2008 00:13:17 +0100 + +josm-plugins (0.0.0.20080311-2) unstable; urgency=low + + * Switched to dpatch + + -- Giovanni Mascellani Wed, 12 Mar 2008 23:39:20 +0100 + +josm-plugins (0.0.0.20080311-1) unstable; urgency=low + + * Initial release (Closes: #) + + -- Giovanni Mascellani Wed, 12 Mar 2008 23:38:55 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 000..ad7e01c --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: josm-plugins +Section: contrib/utils +Priority: extra +Maintainer: Giovanni Mascellani +Build-Depends: debhelper (>= 5), cdbs, dpatch, josm +Standards-Version: 3.7.3 +Homepage: http://josm.openstreetmap.de + +Package: josm-plugins +Architecture: all +Depends: josm +Description: JOSM plugins + JOSM (Java OpenStreetMap) plugin collection. + . + JOSM is an editor for OpenStreetMap (OSM) written in Java. + The current version supports stand alone GPX tracks, GPX track data + from OSM database and existing nodes, line segments and metadata tags + from the OSM database. + . + OpenStreetMap is a project aimed squarely at creating and providing + free geographic data such as street maps to anyone who wants them. + The project was started because most maps you think of as free actually + have legal or technical restrictions on their use, holding back people + from using them in creative, productive or unexpected ways. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000..03507cb --- /dev/null +++ b/debian/copyright @@ -0,0 +1,24 @@ +This package was debianized by Giovanni Mascellani on +Tue, 11 Mar 2008 19:06:41 +0100. + +It was downloaded from + +Upstream Author(s): + + + + +Copyright: + + + + +License: + + + +The Debian packaging is (C) 2008, Giovanni Mascellani and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. diff --git a/debian/josm-plugins.dirs b/debian/josm-plugins.dirs new file mode 100644 index 000..708e0ca --- /dev/null +++ b/debian/josm-plugins.dirs @@ -0,0 +1 @@ +usr/share/josm/plugins diff --git a/debian/josm-plugins.install b/debian/josm-plugins.install new file mode 100644 index 000..42cf81a --- /dev/null +++ b/debian/josm-plugins.install @@ -0,0 +1 @@ +dist/* usr/share/josm/plugins diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 000..65c225f --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,4 @@ +10_build +20_validator +30_utilsplugin +40_wmsplugin diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch new file mode 100755 index 000..5fef639 --- /dev/null +++ b/debian/patches/10_build.dpatch @@ -0,0 +1,87 @@ +#! /bin/sh /usr/share/
[josm-plugins] 03/369: Maintainer changed to pkg-grass, moving me in Uploaders
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository josm-plugins. commit 7e29799ced441d7efd2a5d43c8745983ead065f6 Author: Giovanni Mascellani Date: Thu Mar 20 15:13:42 2008 + Maintainer changed to pkg-grass, moving me in Uploaders --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ad7e01c..eab99ff 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: josm-plugins Section: contrib/utils Priority: extra -Maintainer: Giovanni Mascellani +Maintainer: Debian GIS Project +Uploaders: Giovanni Mascellani Build-Depends: debhelper (>= 5), cdbs, dpatch, josm Standards-Version: 3.7.3 Homepage: http://josm.openstreetmap.de -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[josm-plugins] branch master created (now 7afc96c)
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a change to branch master
in repository josm-plugins.
at 7afc96c Bump JOSM dependency to 7588.
This branch includes the following new commits:
new f8169ba Creating trunk directory
new ee11d12 [svn-inject] Applying Debian modifications to trunk
new 7e29799 Maintainer changed to pkg-grass, moving me in Uploaders
new 134d004 Changelog cleaned
new ec4a937 Added support for livegps
new a7389e3 Fixed 40_wmsplugin.dpatch header
new 82c17d4 Added support for plugins namefinder and lang-*
new 986496e * Move package to main. Change build-dep, etc.
accordingly. * Add ant.properties. * Added myself among uploaders. * Remove jar
files in the get-orig-source target.
new 6a75d88 Sorry, this dependences were really needed!
new 89d840f Add patch for validator plugin to compile with gcj.
new 7681588 Add josm.jar to classpath
new 95f7b7d Enable plugins: slippymap, colorscheme
new 91d85aa Enable plugin ywms. Add iceweasel to Suggests. Used by
ywms and osmarender plugin.
new 69e11de Enable plugin ywms.
new 009e535 Setting ywms plugin version from SVN revision fixed
new fbed1ca Added description to some patches
new e85720c Started with copyright file for currently enabled
plugins. Emailed author's where license is missing.
new 2d4cdaf Add a master build file that calls selected plugin builds
in a subant. This reduces patching and gives more control about what's actually
build.
new a2acdef Remove old patches.
new 87d55bf rename remaining plugin.
new 2049420 * Forgot to rename patch in 00list. * Use correct target
in debian/rules.
new 2cd6781 debian/rules: only fetch configured plugins in
get-orig-source target.
new b69eb77 Disable execution of svn during build.
new 36ee30f Enable ywms and validator plugins.
new 91d81df Complete copyright.
new 703bb43 Add patch to correct mistakes in clean targets.
new 212b9d3 Add plugin description to the long description. Removing
build-dep on gettext again, because the lang* plugin is currently not included.
new 2cbb2ef Add a readme explaining how josm handles plugins.
new d3335ab Remove plugin version (svn revision) information for the
validator and ywms plugin because we don't know them at build time.
new 27c59ed fix typo, update short description
new be13c5d Move plugin version changes to the patch where it belongs
to.
new 29cf826 fix typo
new cc6c52c Update to reflect the version uploaded to unstable.
new 8c711f6 Making again revision number available also at build time
for ywms and validator
new 8deee3b Added changelog entry about enabling SVN revision number
in ywms and validator
new 836dee0 Added Vcs-* fields in debian/control
new 287c93c Enabled plugin slippy_map_chooser
new 4039018 Added slippy_map_chooser plugin description
new ca3d961* Setting package license to GPL-2+ * Inserting
slippy_map_chooser copyright stanza
new bd7b943 Bumped Standards-Version to 3.8.0 (no changes needed)
new 43a3536 Updated 20_disable_svn.path for plugin slippymap
new e7a31e7 Releasing (if someone will sponsor me)
new 1cc7731 Bumping to last SVN release
new 477a852 Patches updated to last SVN release
new 46c4801* Added new plugins: agpifoj, measurement, openvisible,
surveyor, usertools * d/rules: HEAD was checked out instead of specified
version
new b40f16c Added libmetadata-extractor-java in compilation and as
dependency (used by agpifoj)
new a006b1a Fixed lintian messages: * added ${misc:Depends} to
dependencies * added patch descriptions
new 994a0c5 Fixing things in d/copyright
new 9274519 d/copyright partially fixed, but still requiring love
new ada5e59 update long description use openjdk instead of gcj
new 23d2caf add newlines to make lintian happy
new 248c6a1 License checked on upstream NOTICE file
new 37f2166 License for plugin measurement (stated in a more recent
SVN revision)
new d178073 Removed patch for usertools
new f649d03* Removed plugin usertools because of unspecified
license (author not responding) * Forcing josm-plugins to be installed with
the correct josm version
new 04593b3 Updated changelog
new 78559b8 Removed .rej file from patch
new 0adf270 Patches updated to last revision
new e3bae97 Missing link to libmetadata-extractor-java
new 8e0ec82 Deleted usertools from master.xml
new ad46798 Fixed too strict conflicting bound
new 4e94cf1 usertools n
qmapshack_0.6.0-1_amd64.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Thu, 16 Oct 2014 21:41:48 +0200 Source: qmapshack Binary: qmapshack Architecture: source amd64 Version: 0.6.0-1 Distribution: unstable Urgency: medium Maintainer: Debian GIS Project Changed-By: Jaromír Mikeš Description: qmapshack - GPS mapping (GeoTiff and vector) and GPSr management Changes: qmapshack (0.6.0-1) unstable; urgency=medium . * Start new upload. Checksums-Sha1: a43ecc852bebe23396dd5c93cfbd2af5ab4383d1 2081 qmapshack_0.6.0-1.dsc 4f469e947faea9d4e808a88f1828e6ed9eddfabb 2950301 qmapshack_0.6.0.orig.tar.gz f80b846ea1c3804a68e315905c9d086f30bdcbc7 5536 qmapshack_0.6.0-1.debian.tar.xz e761f4c52e1516f6e76f4c271d9edc9cfed699fa 1386642 qmapshack_0.6.0-1_amd64.deb Checksums-Sha256: 235afcb9ab9ce6602b041cc42a1d41156baad75ee779e5842e1e237b3c3bfc53 2081 qmapshack_0.6.0-1.dsc 19ba56e08ab75ce17ae0cca1d1ba9561d0a7a13b276612a4cf8454bef0b4b01e 2950301 qmapshack_0.6.0.orig.tar.gz 0f2f830a1f270991cb42e37de71f7ecec078ec89f390068fdc2f14c4cce53a7f 5536 qmapshack_0.6.0-1.debian.tar.xz 6961f90c62334782294a3316c898aa98ff522aaefe5992b95aec57a249a8dba4 1386642 qmapshack_0.6.0-1_amd64.deb Files: 70bbc4380229ec840d569b6e1763b228 2081 science optional qmapshack_0.6.0-1.dsc c5298252da5c226a823e8e445b79022c 2950301 science optional qmapshack_0.6.0.orig.tar.gz 0b6b054dd4415b73936e4551c33ff57c 5536 science optional qmapshack_0.6.0-1.debian.tar.xz 07db0492ae01952e3cca75f88dd77d86 1386642 science optional qmapshack_0.6.0-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBAgAGBQJUQh13AAoJEFsBlFXiuE+l6YAP+wepRh9SmF5epmIGbZtNGlBH 3aYbAGgUPJQtkWbFxFPc3gHVxLiB3ylCs+gpMl/+I1s9pSsEe2sLf4/BaPC4kXdz +a3GlC6TJBAmoJIrWK9s92rFkjLDWuYG3Nreg+Yyy6WPHPKbgxm0upLimBWXKJK+ Cne33uDCsruR39EynIxZt4nRQT6x8JkTCW4gxSKf7lth5LISsR8WpWQXyLdXfgz/ 9jkzfdzYR+ycMzQsITaKyLmKoCFXPrWMfuPaD3pYOe80JL2t9tTQgYiI3DQmuoJ2 3ppmPWuQyIGZVz77gm8sjsNczJgz2DMYfcj48OuC0A17xlQo82iZi9nm+4Gc6xa1 ybBS0yNltpI+dwNZXMuz+R6zO1oivMSKDQS4yVeCKJISK/5YlpAA7TPQTne9iTD0 WPEyMh9ruZRZIOvshRS3KNyYx1YrmBTFrFOpNx9uS6/ZJmoA14r1OIx82VBabmM3 XapIAwrBqvPF5nNPjFf3ir5EEi5vCm0K31i94Li/jKvdZtv1Qr6lOCBqtz9ybRma 4yL3WM9bB0QTAvLBfuOmUxHVEEipJulMB8THqnIVF0kaQbvmLEf5OpMcCVHN7yRR GhcjpsobyiYy3Xnj5M/JfcMxry2EXfqJBu1NEMk7QgSY0LwUoi/LsLc4h4DdKobd 5c66xECl7N9oDK3FK5oV =bmAt -END PGP SIGNATURE- Thank you for your contribution to Debian. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer/josm issue
On 10/18/2014 12:42 PM, Marcus Lundblad wrote: > I cooked up a patch that fetches the logo image if the embedded resource > isn't found in the package. The reason I did this instead of just > overriding the original code is to hopefully make it possibly more > upstreamable. > I tried building and installing the package with the patch applied and > Josm can successfully load Bing aerials with this. Thanks for your patch. Now we have code for two possible solutions to our problem. Ideally the logo URL is not hardcoded but extracted from the attribution response. If the service changes the URL the code doesn't need changing. Is it possible to implement that in your patch? Kind Regards, Bas -- GPG Key ID: 4096R/E88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Resolution for missing Bing logo
On 10/18/2014 12:12 PM, Felix Natter wrote: > the good news is I have received a mail from a Microsoft employee > (unfortunately late on Friday) inviting me on a call regarding > use of the Bing logo in jmapviewer. > > I will make that call on Monday morning and maybe we will be able to > agree on a free license that I can put in debian/copyright and thus I > can re-include bing_maps.png If they license the logo under a DFSG compatible license that would be great. And making our lives much easier. > But if MS decides the logo must not be included in jmapviewer > then I'm afraid I *must* remove BingAerialTileSource.java from > jmapviewer and apply the attached patch [1] to 0.0.svn7480+dfsg1-2, > removing Bing support from JOSM. Otherwise jmapviewer may be moved to > non-free because it contains Bing support but not the logo [2]. I'm not sure that the alternative is that you *must* remove the Bing support from jmapviewer. The logo referenced by the BrandLogoUri in the attribution REST-call be fine the use instead of the bing_map.png included in jmapviewer. As mentioned by Martin Krüger: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765421#30 The Bing license says: " and if the required logos and copyright notices are not included in the service generated content, you shall add the logos and copyright notices provided by Microsoft to the service generated content as described in the SDKs " Since the attribution REST-call includes the logo in its generated content, downloading and using that instead of adding it in jmapviewer itself seems to comply with the license. > --> can we agree on this? In the interest of our JOSM users, doing our best to prevent the removal of Bing support in jmapviewer should be our priority. Please discuss the BrandLogoUri solution with Microsoft in your call, that seems to be the preferred solution to keep jmapviewer and its rdeps in main, while also complying with the Bing license terms. While my brief tests with your patch show that JOSM works fine without Bing support, it's a major loss of functionality. MapBox Satellite and other freely usable satellite imagery is not on par with the Bing imagery. Kind Regards, Bas -- GPG Key ID: 4096R/E88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: Re: Re: Re: Bug#765421: jmapviewer/josm issue
I cooked up a patch that fetches the logo image if the embedded resource
isn't found in the package. The reason I did this instead of just
overriding the original code is to hopefully make it possibly more
upstreamable.
I tried building and installing the package with the patch applied and
Josm can successfully load Bing aerials with this.
//Marcus
diff -r jmapviewer-1.03+dfsg.orig/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java jmapviewer-1.03+dfsg/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
5a6
> import java.io.InputStream;
177c178,184
< return ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
---
> final InputStream imageResource =
> JMapViewer.class.getResourceAsStream("images/bing_maps.png");
> if (imageResource != null) {
> return ImageIO.read(imageResource);
> } else {
> return ImageIO.read(new URL("http://dev.virtualearth.net/Branding/logo_powered_by.png";));
> }
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#765421: jmapviewer: Resolution for missing Bing logo
hello all,
the good news is I have received a mail from a Microsoft employee
(unfortunately late on Friday) inviting me on a call regarding
use of the Bing logo in jmapviewer.
I will make that call on Monday morning and maybe we will be able to
agree on a free license that I can put in debian/copyright and thus I
can re-include bing_maps.png
But if MS decides the logo must not be included in jmapviewer
then I'm afraid I *must* remove BingAerialTileSource.java from
jmapviewer and apply the attached patch [1] to 0.0.svn7480+dfsg1-2,
removing Bing support from JOSM. Otherwise jmapviewer may be moved to
non-free because it contains Bing support but not the logo [2].
--> can we agree on this?
[1] "dquilt import josm2.diff" should be enough before running
"gbp buildpackage".
[2] https://lists.debian.org/debian-gis/2014/10/msg00115.html
Cheers and Best Regards,
--
Felix Natter
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
index 318257f..c597d08 100644
--- a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
@@ -150,7 +150,7 @@ public class AddImageryLayerAction extends JosmAction implements AdaptableAction
// never enable blacklisted entries. Do not add same imagery layer twice (fix #2519)
if (info.isBlacklisted() /*|| isLayerAlreadyPresent()*/) { // FIXME check disabled to allow several instances with different settings (see #7981)
setEnabled(false);
-} else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX) {
+} else if (info.getImageryType() == ImageryType.TMS /*|| info.getImageryType() == ImageryType.BING*/ || info.getImageryType() == ImageryType.SCANEX) {
setEnabled(true);
} else if (Main.isDisplayingMapView() && !Main.map.mapView.getAllLayers().isEmpty()) {
setEnabled(true);
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index fce96df..82daf15 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -45,8 +45,6 @@ public class ImageryInfo implements Comparable, Attributed {
TMS("tms"),
/** An HTML proxy (previously used for Yahoo imagery) entry. **/
HTML("html"),
-/** TMS entry for Microsoft Bing. */
-BING("bing"),
/** TMS entry for Russian company https://wiki.openstreetmap.org/wiki/WikiProject_Russia/kosmosnimki";>ScanEx. **/
SCANEX("scanex"),
/** A WMS endpoint entry only stores the WMS server info, without layer, which are chosen later by the user. **/
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 91d5b6b..d1185a9 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -978,7 +978,7 @@ public class MapView extends NavigatableComponent implements PropertyChangeListe
layerInfo.add(i.getName());
}
for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
-layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+layerInfo.add(/*ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" :*/ i.getName());
}
return Utils.join("; ", layerInfo);
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 6176e0a..737b848 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -152,7 +152,7 @@ public abstract class ImageryLayer extends Layer {
public static ImageryLayer create(ImageryInfo info) {
if (info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.HTML)
return new WMSLayer(info);
-else if (info.getImageryType() == ImageryType.TMS || info.getImageryType() == ImageryType.BING || info.getImageryType() == ImageryType.SCANEX)
+else if (info.getImageryType() == ImageryType.TMS /*|| info.getImageryType() == ImageryType.BING*/ || info.getImageryType() == ImageryType.SCANEX)
return new TMSLayer(info);
else throw new AssertionError();
}
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index b940251..5a64dab 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -51,7 +51,6 @@ import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
Processing of qmapshack_0.6.0-1_amd64.changes
qmapshack_0.6.0-1_amd64.changes uploaded successfully to localhost along with the files: qmapshack_0.6.0-1.dsc qmapshack_0.6.0.orig.tar.gz qmapshack_0.6.0-1.debian.tar.xz qmapshack_0.6.0-1_amd64.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[qmapshack] annotated tag debian/0.6.0-1 created (now c7554dc)
This is an automated email from the git hooks/post-receive script. mira-guest pushed a change to annotated tag debian/0.6.0-1 in repository qmapshack. at c7554dc (tag) tagging 3b416e8401d7924f5eb366f11eb325e76bb4677c (commit) replaces debian/0.5.0-1 tagged by Jaromír Mikeš on Sat Oct 18 09:59:00 2014 +0200 - Log - Debian release 0.6.0-1 Jaromír Mikeš (3): Start new upload Imported Upstream version 0.6.0 Merge tag 'upstream/0.6.0' --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
