[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
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
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 ComparableImageryInfo, 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 a href=https://wiki.openstreetmap.org/wiki/WikiProject_Russia/kosmosnimki;ScanEx/a. **/
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;
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
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
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 pkg-grass-devel@lists.alioth.debian.org Changed-By: Jaromír Mikeš mira.mi...@seznam.cz 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
[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
[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 andr...@putzo.net 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 andr...@putzo.net 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com Thu, 13 Mar 2008 00:13:17 +0100 + +josm-plugins (0.0.0.20080311-2) unstable; urgency=low + + * Switched to dpatch + + -- Giovanni Mascellani g.mascell...@gmail.com Wed, 12 Mar 2008 23:39:20 +0100 + +josm-plugins (0.0.0.20080311-1) unstable; urgency=low + + * Initial release (Closes: #) + + -- Giovanni Mascellani g.mascell...@gmail.com 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 g.mascell...@gmail.com +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 g.mascell...@gmail.com on +Tue, 11 Mar 2008 19:06:41 +0100. + +It was downloaded from url://example.com + +Upstream Author(s): + +put author's name and email here +likewise for another author + +Copyright: + +Copyright (C) Name OfAuthor +likewise for another author + +License: + +Put the license of the package here indented by 4 spaces + +The Debian packaging is (C) 2008, Giovanni Mascellani g.mascell...@gmail.com 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
[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 mascell...@poisson.phc.unipi.it
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 @@
project name=josm-plugins default=build basedir=.
@@ -49,11 +49,11 @@ diff -urNad josm-plugins-0.0.0.20080316~/build.xml
josm-plugins-0.0.0.20080316/b
ant dir=validator antfile=build.xml target=dist/
ant dir=wmsplugin antfile=build.xml target=dist/
-ant dir=ywms antfile=build.xml target=dist/
-+!-- ant dir=ywms antfile=build.xml target=dist/
++!-- ant dir=ywms antfile=build.xml
target=dist/--
ant dir=livegps antfile=build.xml target=dist/
-ant dir=surveyor antfile=build.xml target=dist/
-+ant dir=surveyor antfile=build.xml target=dist/
--
++!-- ant dir=surveyor antfile=build.xml target=dist/
--
/target
- target name=build_defect depends=compile
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 g.mascell...@gmail.com
+##
+## 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 @@
+ project name=livegps default=dist basedir=.
+
+ !-- josm user home directory depends on the platform used (windows has a
different place than unix/linux) --
++!-- Not used in Debian
+ property environment=env/
+ condition property=josm.home.dir value=${env.APPDATA}/JOSM
else=${user.home}/.josm
+ and
+ os family=windows/
+ /and
+ /condition
++--
+
+ !-- compilation properties --
+ !--property name=josm.build.dir value=../../JOSM// --
++!-- Not used in Debian
+ property name=josm.build.dir value=../../core//
+ property name=josm.plugins.dir value=${josm.home.dir}/plugins/
++--
+ !-- property name=josm
location=../../JOSM/dist/josm-custom.jar / --
++!-- Not used in Debian
+ property name=josm
location=../../core/dist/josm-custom.jar /
+ property name=plugin.build.dir value=build/
+ property name=plugin.dist.dirvalue=../../dist/
++--
+ property name=plugin.namevalue=${ant.project.name}/
+- property name=plugin.jar value=../../dist/${plugin.name}.jar/
++ property name=plugin.jar
value=${plugin.dist.dir}/${plugin.name}.jar/
+
++!-- Not used in Debian
+ property name=plugin.jar value=../../dist/${plugin.name}.jar/
+ property name=livegpsplugin.jar
value=${josm.home.dir}/plugins/livegps.jar/
++--
+
+ !-- plugin meta data (enter new version number if anything changed!) --
+ property name=plugin.version value=1.3/
+@@ -29,21 +37,23 @@
+ property name=plugin.class value=livegps.LiveGpsPlugin/
+
[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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com ## -## 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] 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 mascell...@poisson.phc.unipi.it
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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com
-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 @@
project name=josm-plugins default=build basedir=.
@@ -31,14 +31,14 @@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml
josm-plugins-0.0.0.20080320/b
-mkdir dir=../dist/
-ant dir=colorscheme antfile=build.xml target=dist/
-!--ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
--ant dir=lang antfile=build.xml target=dist/
+ target name=dist
+mkdir dir=${plugin.dist.dir}/
+!-- ant dir=colorscheme antfile=build.xml target=dist/
--
+!-- ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
-+!-- ant dir=lang antfile=build.xml target=dist/
+ ant dir=lang antfile=build.xml target=dist/
ant dir=namefinderantfile=build.xml target=dist/
- ant dir=nearclick antfile=build.xml target=dist/
+-ant dir=nearclick antfile=build.xml target=dist/
++!-- ant dir=nearclick antfile=build.xml target=dist/
ant dir=openvisible antfile=build.xml target=dist/
ant dir=osmarenderantfile=build.xml target=dist/
ant dir=plastic_laf antfile=build.xml target=dist/
diff --git a/debian/patches/60_lang.dpatch b/debian/patches/60_lang.dpatch
new file mode 100755
index 000..d378bf5
--- /dev/null
+++ b/debian/patches/60_lang.dpatch
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_lang.dpatch by g.mascell...@gmail.com
+##
+## DP: Patch for plugins lang-*
+
+@DPATCH@
+diff -urNad josm-plugins-0.0.0.20080320~/lang/build.xml
josm-plugins-0.0.0.20080320/lang/build.xml
+--- josm-plugins-0.0.0.20080320~/lang/build.xml2008-03-22
14:08:40.0 +0100
josm-plugins-0.0.0.20080320/lang/build.xml 2008-03-22 14:19:27.0
+0100
+@@ -1,20 +1,22 @@
+ project name=lang default=install-all basedir=.
+
+ !-- compilation properties --
++!-- Not used in Debian
+ property name=josm.build.dir value=../../core/
+ property name=josm.home.dir value=${user.home}/.josm/
+ property name=josm
location=../../core/dist/josm-custom.jar /
+ property name=plugin.build.dir value=build/
+ property name=plugin.dist.dirvalue=../../dist/
++--
+ property name=plugin.namevalue=${ant.project.name}/
+- property name=plugin.jar value=../../dist/${plugin.name}.jar/
++!-- property name=plugin.jar
value=${plugin.dist.dir}/${plugin.name}.jar/--
+
+ property name=ant.build.javac.target value=1.5/
+
+ target name=dist depends=install-all
+ /target
+
+- target name=install-all depends=josm-build,keys.pot
++ target name=install-all
+ ant target=installproperty name=language value=de//ant
+ ant target=installproperty name=language value=fr//ant
+
[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 andr...@putzo.net
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 @@
project name=josm-plugins default=build basedir=.
@@ -33,18 +33,21 @@ diff -urNad josm-plugins-0.0.0.20080320~/build.xml
josm-plugins-0.0.0.20080320/b
-!--ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
+ target name=dist
+mkdir dir=${plugin.dist.dir}/
-+!-- ant dir=colorscheme antfile=build.xml target=dist/
--
++ant dir=colorscheme antfile=build.xml target=dist/
+!-- ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
ant dir=lang antfile=build.xml target=dist/
ant dir=namefinderantfile=build.xml target=dist/
-ant dir=nearclick antfile=build.xml target=dist/
-+!-- ant dir=nearclick antfile=build.xml target=dist/
- ant dir=openvisible antfile=build.xml target=dist/
- ant dir=osmarenderantfile=build.xml target=dist/
- ant dir=plastic_laf antfile=build.xml target=dist/
+-ant dir=openvisible antfile=build.xml target=dist/
+-ant dir=osmarenderantfile=build.xml target=dist/
+-ant dir=plastic_laf antfile=build.xml target=dist/
++!-- ant dir=nearclick antfile=build.xml target=dist/
--
++!-- ant dir=openvisible antfile=build.xml target=dist/
--
++!-- ant dir=osmarenderantfile=build.xml target=dist/
--
++!-- ant dir=plastic_laf antfile=build.xml target=dist/
--
ant dir=slippymap antfile=build.xml target=dist/
-ant dir=tagging-preset-tester antfile=build.xml
target=dist/
-+ant dir=tagging-preset-tester antfile=build.xml
target=dist/--
++!-- ant dir=tagging-preset-tester antfile=build.xml
target=dist/ --
ant dir=utilsplugin antfile=build.xml target=dist/
ant dir=validator antfile=build.xml target=dist/
ant dir=wmsplugin antfile=build.xml target=dist/
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 andr...@putzo.net
+##
+## 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 @@
+ project name=colorscheme default=dist basedir=.
+
+ !-- compilation properties --
+- property name=josm.build.dir value=../../core/
+- property name=josm.home.dir value=${user.home}/.josm/
+- property name=josm
location=../../core/dist/josm-custom.jar /
+ property name=plugin.build.dir value=build/
+- property name=plugin.dist.dirvalue=../../dist/
++ property name=plugin.dist.dirvalue=../dist/
+ property name=plugin.name
[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 andr...@putzo.net
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 andr...@putzo.net
-##
-## 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 @@
- project name=ywms default=dist basedir=.
-
- !-- compilation properties --
-- property name=josm.build.dir value=../../core/
-- property name=josm.home.dir value=${user.home}/.josm/
-- property name=josm
location=../../core/dist/josm-custom.jar /
- property name=plugin.build.dir value=build/
-- property name=plugin.dist.dirvalue=../../dist/
-+ property name=plugin.dist.dirvalue=../dist/
- property name=plugin.namevalue=${ant.project.name}/
-- property name=plugin.jar value=../../dist/${plugin.name}.jar/
-+ property name=plugin.jar value=../dist/${plugin.name}.jar/
-
- property name=ant.build.javac.target value=1.5/
-
-@@ -28,14 +25,7 @@
- copy todir=${plugin.build.dir}/images
- fileset dir=images/
- /copy
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
-- env key=LANG value=C/
-- arg value=info/
-- arg value=--xml/
-- arg value=./
--/exec
--xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
-+xmlproperty file=${svn.info} prefix=version keepRoot=false
collapseAttributes=true/
- jar destfile=${plugin.jar} basedir=${plugin.build.dir}
- manifest
- attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
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 g.mascell...@gmail.com
-##
-## 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 @@
- project name=josm-plugins default=build basedir=.
-
-+ property name=josm location=/usr/share/josm/josm.jar /
-+ property name=plugin.dist.dir location=dist /
-+ property name=ant.build.javac.target value=1.5/
-+ property name=svn.info location=svn-info.xml /
-
-+!-- Not used in Debian
- target name=compile_josm
- ant dir=../core target=dist /
- /target
-
- target name=compile depends=compile_josm
- /target
-+--
-
- target name=build depends=dist
- /target
-
-- target name=dist depends=compile
--mkdir dir=../dist/
--ant dir=colorscheme antfile=build.xml target=dist/
--!--ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
-+ target name=dist
-+mkdir dir=${plugin.dist.dir}/
-+ant dir=colorscheme antfile=build.xml target=dist/
-+!-- ant dir=duplicateway antfile=build.xml target=dist/
code still uses API 0.4 --
- ant dir=lang antfile=build.xml target=dist/
- ant dir=namefinderantfile=build.xml target=dist/
--ant dir=nearclick antfile=build.xml target=dist/
--ant dir=openvisible antfile=build.xml target=dist/
--ant dir=osmarenderantfile=build.xml target=dist/
--ant dir=plastic_laf antfile=build.xml target=dist/
-+!-- ant
[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 andr...@putzo.net
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] 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 andr...@putzo.net
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 andr...@putzo.net
+##
+## 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 @@
+ copy todir=build/images
+ fileset dir=images/
+ /copy
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+- env key=LANG value=C/
+- arg value=info/
+- arg value=--xml/
+- arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+ jar destfile=${plugin.jar} basedir=build
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
+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 @@
+ copy todir=${plugin.build.dir}/images
+ fileset dir=images/
+ /copy
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+- env key=LANG value=C/
+- arg value=info/
+- arg value=--xml/
+- arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+ jar destfile=${plugin.jar} basedir=${plugin.build.dir}
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
--
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 andr...@putzo.net
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 pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Giovanni Mascellani g.mascell...@gmail.com
-Build-Depends: debhelper (= 5), cdbs, dpatch, josm, gettext,
libgettext-commons-java
+Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
+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] 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 andr...@putzo.net 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 g.mascell...@gmail.com Wed, 12 Mar 2008 23:38:55 +0100 + -- Andreas Putzo andr...@putzo.net 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 g.mascell...@gmail.com - � 2008 Andreas Putzo andr...@putzo.net +Copyright: © 2008 Giovanni Mascellani g.mascell...@gmail.com + © 2008 Andreas Putzo andr...@putzo.net 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 cdaller...@gmx.at +Copyright: © 2007,2008 Christof Dallermassl cdaller...@gmx.at 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 frede...@remote.org - � 2007,2008 Christof Dallermassl cdaller...@gmx.at +Copyright: © 2007,2008 Frederik Ramm frede...@remote.org + © 2007,2008 Christof Dallermassl cdaller...@gmx.at License: PD + The livegps plugin was put in the public domain by its authors. Files: namefinder/* -Copyright: � 2007,2008 Frederik Ramm frede...@remote.org +Copyright: © 2007,2008 Frederik Ramm frede...@remote.org License: PD + The namefinder plugin was put in the public domain by Frederik Ramm. Files: slippymap/* -Copyright: � 2007 Hakan Tandogan ha...@gurkensalat.com -� 2007 Frederik Ramm frede...@remote.org +Copyright: © 2007 Hakan Tandogan ha...@gurkensalat.com + © 2007 Frederik Ramm frede...@remote.org License: PD + The slippymap plugin was put in the public domain by its authors. Files: utilsplugin/* -Copyright: � 2007 Martijn van Oosterhout klep...@svana.org -License: missing +Copyright: © 2007 Frederik Ramm frede...@remote.org + © 2007 Gabriel Ebner g...@gabrielebner.at +License: GPL-2+ Files: validator/* -Copyright: � 2007 Francisco R. Santos frsan...@gmail.com -License: missing - -Files: wmsplugin/* -Copyright: � 2007 Tim Waters chippy2...@gmail.com -License: missing - -Files: wmsplugin/src/uk/* -Copyright: � 2006 Jonathan Stott jco...@jstott.me.uk +Copyright: © 2007 Francisco R. Santos frsan...@gmail.com + © 2007 Joerg Ostertag openstreet...@ostertag.name + © 2007,2008 Gabriel Ebner g...@gabrielebner.at License: GPL-2 -Files: wmsplugin/src/wmsplugin/WMSInfo.java -Copyright: � 2007 Frederik Ramm frede...@remote.org -License: missing +Files: wmsplugin/* +Copyright: © 2007 Tim Waters chippy2...@gmail.com + © 2007 Frederik Ramm frede...@remote.org + © 2007 Jonathan Stott jonat...@jstott.me.uk + © 2007 Ulf Lamping ulf.lamp...@web.de + © 2007,2008 Gabriel Ebner g...@gabrielebner.at +License: GPL-2+ Files: ywms/* -Copyright: � 2007 Francisco R. Santos frsan...@gmail.com - � 2007 Frederik Ramm frede...@remote.org -License: missing +Copyright: © 2007 Francisco R. Santos frsan...@gmail.com + © 2007 Frederik Ramm frede...@remote.org + © 2007 Gabriel Ebner g...@gabrielebner.at + © 2007 Joerg Ostertag openstreet...@ostertag.name +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 andr...@putzo.net
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] 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 andr...@putzo.net 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] 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 andr...@putzo.net
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 @@
/target
target name=build depends=init
-!--
+
ant dir=../validator antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/validator.jar/
/ant
---
+
ant dir=../utilsplugin antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
/ant
@@ -44,19 +44,21 @@
ant dir=../slippymap antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/slippymap.jar/
/ant
-!--
+
ant dir=../ywms antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/ywms.jar/
/ant
---
+
/target
target name=clean
-ant dir=../utilsplugin antfile=build.xml target=clean/
+ant dir=../validator antfile=build.xml target=clean/
+ant dir=../utilsplugin antfile=build.xml target=clean/
ant dir=../wmsplugin antfile=build.xml target=clean/
-ant dir=../livegps antfile=build.xml target=clean/
-ant dir=../namefinder antfile=build.xml target=clean/
+ant dir=../livegps antfile=build.xml target=clean/
+ant dir=../namefinder antfile=build.xml target=clean/
ant dir=../colorscheme antfile=build.xml target=clean/
ant dir=../slippymap antfile=build.xml target=clean/
+ant dir=../ywmsantfile=build.xml target=clean/
delete dir=../tmp/
delete dir=${plugin.dist.dir}/
/target
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] 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 andr...@putzo.net
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 @@
+project name=master
+
+!-- Use an empty dummy directory as josm build dir --
+property name=josm.build.dir value=../tmp/josm/
+property name=josm location=/usr/share/josm/josm.jar/
+property name=plugin.dist.dirvalue=../dist/
+
+
+target name=init
+mkdir dir=../dist/
+mkdir dir=../tmp/josm/lib/
+/target
+
+target name=build depends=init
+!--
+ant dir=../validator antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/validator.jar/
+/ant
+--
+ant dir=../utilsplugin antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
+/ant
+
+ant dir=../wmsplugin antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/wmsplugin.jar/
+/ant
+
+ant dir=../livegps antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/livegps.jar/
+/ant
+!--
+ant dir=../lang antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/lang.jar/
+/ant
+--
+ant dir=../namefinder antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/namefinder.jar/
+/ant
+
+ant dir=../colorscheme antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/colorscheme.jar/
+/ant
+
+ant dir=../slippymap antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/slippymap.jar/
+/ant
+!--
+ant dir=../ywms antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/ywms.jar/
+/ant
+--
+/target
+target name=clean
+ant dir=../utilsplugin antfile=build.xml target=clean/
+ant dir=../wmsplugin antfile=build.xml target=clean/
+ant dir=../livegps antfile=build.xml target=clean/
+ant dir=../namefinder antfile=build.xml target=clean/
+ant dir=../colorscheme antfile=build.xml target=clean/
+ant dir=../slippymap antfile=build.xml target=clean/
+delete dir=../tmp/
+delete dir=${plugin.dist.dir}/
+/target
+/project
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 andr...@putzo.net
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 andr...@putzo.net
+##
+## 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 @@
+ project name=ywms default=dist basedir=.
+
+ !-- compilation properties --
+- property name=josm.build.dir value=../../core/
+- property name=josm.home.dir value=${user.home}/.josm/
+- property name=josm
location=../../core/dist/josm-custom.jar /
+ property name=plugin.build.dir value=build/
+- property name=plugin.dist.dirvalue=../../dist/
++ property name=plugin.dist.dirvalue=../dist/
+ property name=plugin.namevalue=${ant.project.name}/
+- property name=plugin.jar value=../../dist/${plugin.name}.jar/
++ property name=plugin.jar value=../dist/${plugin.name}.jar/
+
+ property name=ant.build.javac.target value=1.5/
+
+@@ -28,14 +25,6 @@
+ copy todir=${plugin.build.dir}/images
+ fileset dir=images/
+ /copy
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+- env key=LANG value=C/
+- arg value=info/
+- arg value=--xml/
+- arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+ jar destfile=${plugin.jar} basedir=${plugin.build.dir}
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
--
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 andr...@putzo.net
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 andr...@putzo.net
+##
+## 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] 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 andr...@putzo.net 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com + � 2008 Andreas Putzo andr...@putzo.net +License: GPL + The Debian packaging information is under the GPL, version 3 or later + +Files: colorscheme/* +Copyright: � 2007,2008 Christof Dallermassl cdaller...@gmx.at +License: GPL-2 + +Files: lang/* +Copyright: +License: -It was downloaded from url://example.com +Files: livegps/* +Copyright: � 2007,2008 Frederik Ramm frede...@remote.org + � 2007,2008 Christof Dallermassl cdaller...@gmx.at +License: PD -Upstream Author(s): +Files: namefinder/* +Copyright: � 2007,2008 Frederik Ramm frede...@remote.org +License: PD -put author's name and email here -likewise for another author +Files: slippymap/* +Copyright: � 2007 Hakan Tandogan ha...@gurkensalat.com +� 2007 Frederik Ramm frede...@remote.org +License: PD -Copyright: +Files: utilsplugin/* +Copyright: � 2007 Martijn van Oosterhout klep...@svana.org +License: missing -Copyright (C) Name OfAuthor -likewise for another author +Files: validator/* +Copyright: � 2007 Francisco R. Santos frsan...@gmail.com +License: missing -License: +Files: wmsplugin/* +Copyright: � 2007 Tim Waters chippy2...@gmail.com +License: missing -Put the license of the package here indented by 4 spaces +Files: wmsplugin/src/uk/* +Copyright: � 2006 Jonathan Stott jco...@jstott.me.uk +License: GPL-2 -The Debian packaging is (C) 2008, Giovanni Mascellani g.mascell...@gmail.com and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +Files: wmsplugin/src/wmsplugin/WMSInfo.java +Copyright: � 2007 Frederik Ramm frede...@remote.org +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 frsan...@gmail.com + � 2007 Frederik Ramm frede...@remote.org +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 mascell...@poisson.phc.unipi.it 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andr...@putzo.net -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 andr...@putzo.net 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 @@ project name=josm-plugins default=build basedir=. @@ -51,8 +51,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/build.xml josm-plugins-0.0.0.20080326/b ant dir=utilsplugin antfile=build.xml target=dist/ ant dir=validator antfile=build.xml target=dist/ ant dir=wmsplugin antfile=build.xml target=dist/ --ant dir=ywms antfile=build.xml target=dist/ -+!-- ant dir=ywms antfile=build.xml target=dist/-- + ant dir=ywms antfile=build.xml target=dist/ ant dir=livegps antfile=build.xml target=dist/ -ant dir=surveyor antfile=build.xml target=dist/ -- 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 mascell...@poisson.phc.unipi.it
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 @@
project name=ywms default=dist basedir=.
@@ -24,7 +24,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml
josm-plugins-0.0.0.20080
property name=ant.build.javac.target value=1.5/
-@@ -28,14 +25,6 @@
+@@ -28,14 +25,7 @@
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
@@ -36,6 +36,7 @@ diff -urNad josm-plugins-0.0.0.20080326~/ywms/build.xml
josm-plugins-0.0.0.20080
-/exec
-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
-delete file=REVISION/
++xmlproperty file=${svn.info} prefix=version keepRoot=false
collapseAttributes=true/
jar destfile=${plugin.jar} basedir=${plugin.build.dir}
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
--
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 andr...@putzo.net 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] 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com 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 g.mascell...@gmail.com © 2008 Andreas Putzo andr...@putzo.net -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 cdaller...@gmx.at @@ -58,3 +61,8 @@ Copyright: © 2007 Francisco R. Santos frsan...@gmail.com © 2007 Gabriel Ebner g...@gabrielebner.at © 2007 Joerg Ostertag openstreet...@ostertag.name License: GPL-2 + +Files: slippy_map_chooser/* +Copyright: © 2007 Immanuel Scholz i...@eigenheimstrasse.de + © 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 mascell...@poisson.phc.unipi.it
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 g.mascell...@gmail.com 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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
-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 @@
/target
target name=build depends=init
-
-ant dir=../validator antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/validator.jar/
-/ant
-
-ant dir=../utilsplugin antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
-/ant
-
-ant dir=../wmsplugin antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/wmsplugin.jar/
+
+ant dir=../colorscheme antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/colorscheme.jar/
/ant
ant dir=../livegps antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/livegps.jar/
/ant
-!--
-ant dir=../lang antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/lang.jar/
-/ant
---
-ant dir=../namefinder antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/namefinder.jar/
-/ant
-
-ant dir=../colorscheme antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/colorscheme.jar/
-/ant
ant dir=../slippymap antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/slippymap.jar/
/ant
-
-ant dir=../ywms antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/ywms.jar/
+
+ant dir=../utilsplugin antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
/ant
-
-ant dir=../slippy_map_chooser antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/slippy_map_chooser.jar/
+
+ant dir=../validator antfile=build.xml target=dist
+
[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 andr...@putzo.net
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 andr...@putzo.net Sat, 12 Apr 2008 22:15:24 +
+ -- Andreas Putzo andr...@putzo.net 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 @@
copy todir=build/images
fileset dir=images/
/copy
@@ -23,10 +23,16 @@ diff -urNad
josm-plugins-0.0.0.20080412~/validator/build.xml josm-plugins-0.0.0.
jar destfile=${plugin.jar} basedir=build
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
-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 @@
+ attribute name=Plugin-Description value=A OSM data validator/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
+ /manifest
+ /jar
+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 @@
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
@@ -41,3 +47,9 @@ diff -urNad josm-plugins-0.0.0.20080412~/ywms/build.xml
josm-plugins-0.0.0.20080
jar destfile=${plugin.jar} basedir=${plugin.build.dir}
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
+ attribute name=Plugin-Description value=A WMS server for Yahoo
imagery based on Firefox/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
+ /manifest
+ /jar
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
+delete file=${plugin.site.file} /
delete file=${plugin.jar} /
/target
-
-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 @@
- manifest
- attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
- attribute name=Plugin-Description value=A OSM data validator/
-- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
-- attribute name=Plugin-Date value=${version.entry.commit.date}/
- attribute name=Author value=Francisco R. Santos
[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 mascell...@poisson.phc.unipi.it 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] 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 andr...@putzo.net 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] 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 mascell...@poisson.phc.unipi.it
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 @@
+ copy todir=build/images
+ fileset dir=images /
+ /copy
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+- env key=LANG value=C/
+- arg value=info/
+- arg value=--xml/
+- arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+
+ !-- create josm-custom.jar --
+ jar destfile=${plugin.jar} basedir=build
+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 @@
copy todir=build/images
fileset dir=images/
@@ -23,9 +41,9 @@ diff -urNad josm-plugins-0.0.0.20080413~/validator/build.xml
josm-plugins-0.0.0.
jar destfile=${plugin.jar} basedir=build
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
-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 @@
copy todir=${plugin.build.dir}/images
fileset dir=images/
--
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] 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 mascell...@poisson.phc.unipi.it
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 g.mascell...@gmail.com 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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
-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 @@
property name=plugin.jar
value=${plugin.dist.dir}/ywms.jar/
/ant
+ant dir=../slippy_map_chooser antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/slippy_map_chooser.jar/
+/ant
+
/target
target name=clean
-ant dir=../validator antfile=build.xml target=clean/
-ant dir=../utilsplugin antfile=build.xml target=clean/
-ant dir=../wmsplugin antfile=build.xml target=clean/
-ant dir=../livegps antfile=build.xml target=clean/
-ant dir=../namefinder antfile=build.xml target=clean/
-ant dir=../colorscheme antfile=build.xml target=clean/
-ant dir=../slippymap antfile=build.xml target=clean/
-ant dir=../ywmsantfile=build.xml target=clean/
+ant dir=../validator antfile=build.xml target=clean/
+ant dir=../utilspluginantfile=build.xml target=clean/
+ant dir=../wmsplugin antfile=build.xml target=clean/
+ant dir=../livegpsantfile=build.xml target=clean/
+ant dir=../namefinder antfile=build.xml target=clean/
+ant dir=../colorschemeantfile=build.xml target=clean/
+ant dir=../slippymap antfile=build.xml target=clean/
+ant dir=../ywms antfile=build.xml target=clean/
+ant dir=../slippy_map_chooser antfile=build.xml target=clean/
delete dir=../tmp/
delete dir=${plugin.dist.dir}/
/target
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 andr...@putzo.net
##
-## 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 @@
/target
@@ -16,9 +17,9 @@ diff -urNad
[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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com Sun, 18 May 2008 15:54:49 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com 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 andr...@putzo.net
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 andr...@putzo.net
+##
+## 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 @@
+ /target
+
+ target name=clean
+-delete dir=${plugin.site.file} /
++delete file=${plugin.site.file} /
+ delete dir=${plugin.build.dir} /
+ delete file=${plugin.jar} /
+ /target
+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 @@
+
+ target name=clean
+ delete dir=${plugin.build.dir} /
+-delete dir=${plugin.site.file} /
++delete file=${plugin.site.file} /
+ delete file=${plugin.jar} /
+ /target
+
--
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 mascell...@poisson.phc.unipi.it
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 @@
property name=josm location=/usr/share/josm/josm.jar/
property name=plugin.dist.dirvalue=../dist/
+xmlproperty file=../svn-info.xml prefix=version keepRoot=false
collapseAttributes=true/
+
target name=init
mkdir dir=../dist/
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 @@
copy todir=build/images
fileset dir=images/
/copy
@@ -23,16 +23,10 @@ diff -urNad
josm-plugins-0.0.0.20080413~/validator/build.xml josm-plugins-0.0.0.
jar destfile=${plugin.jar} basedir=build
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
- attribute name=Plugin-Description value=A OSM data validator/
-- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
-- attribute name=Plugin-Date value=${version.entry.commit.date}/
- attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
- /manifest
- /jar
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 @@
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
@@ -47,9 +41,3 @@ diff -urNad josm-plugins-0.0.0.20080413~/ywms/build.xml
josm-plugins-0.0.0.20080
jar destfile=${plugin.jar} basedir=${plugin.build.dir}
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
- attribute name=Plugin-Description value=A WMS server for Yahoo
imagery based on Firefox/
-- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
-- attribute name=Plugin-Date value=${version.entry.commit.date}/
- attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
- /manifest
- /jar
--
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 andr...@putzo.net 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andr...@putzo.net -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 mascell...@poisson.phc.unipi.it
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 @@
target name=build depends=init
+ant dir=../agpifoj antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/agpifoj.jar/
+/ant
+
ant dir=../colorscheme antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/colorscheme.jar/
/ant
@@ -22,10 +26,27 @@
ant dir=../livegps antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/livegps.jar/
/ant
+
+ant dir=../measurement antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/measurement.jar/
+/ant
+
+ant dir=../openvisible antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/openvisible.jar/
+/ant
ant dir=../slippymap antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/slippymap.jar/
/ant
+
+!-- surveyor must be compiled _after_ livegps --
+ant dir=../surveyor antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/surveyor.jar/
+/ant
+
+ant dir=../usertools antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/usertools.jar/
+/ant
ant dir=../utilsplugin antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
@@ -40,10 +61,16 @@
/ant
/target
+
target name=clean
+ant dir=../agpifojantfile=build.xml target=clean/
ant dir=../colorschemeantfile=build.xml target=clean/
ant dir=../livegpsantfile=build.xml target=clean/
+ant dir=../measurementantfile=build.xml target=clean/
+ant dir=../openvisibleantfile=build.xml target=clean/
ant dir=../slippymap antfile=build.xml target=clean/
+ant dir=../surveyor antfile=build.xml target=clean/
+ant dir=../usertools antfile=build.xml target=clean/
ant dir=../utilspluginantfile=build.xml target=clean/
ant dir=../validator antfile=build.xml target=clean/
ant dir=../wmsplugin antfile=build.xml target=clean/
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 g.mascell...@gmail.com
+##
+## 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 @@
+ /javac
+ /target
+ target name=dist depends=compile
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+-env key=LANG value=C/
+-arg value=info/
+-arg value=--xml/
+-arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+ copy todir=${plugin.build.dir}/
+ fileset dir=resources
+ include name=*.xml/
diff
[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 andr...@putzo.net
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 @@
/target
@@ -16,9 +16,9 @@ diff -urNad
josm-plugins-0.0.0.20080412~/colorscheme/build.xml josm-plugins-0.0.
delete dir=${plugin.build.dir} /
delete file=${plugin.jar} /
/target
-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 @@
target name=clean
@@ -28,3 +28,27 @@ diff -urNad josm-plugins-0.0.0.20080412~/livegps/build.xml
josm-plugins-0.0.0.20
delete file=${plugin.jar} /
/target
+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 @@
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin/
+ attribute name=Plugin-Description value=A OSM data validator/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
+ /manifest
+ /jar
+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 @@
+ manifest
+ attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.ywms.YWMSPlugin/
+ attribute name=Plugin-Description value=A WMS server for Yahoo
imagery based on Firefox/
+- attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+- attribute name=Plugin-Date value=${version.entry.commit.date}/
+ attribute name=Author value=Francisco R. Santos
lt;frsan...@gmail.com/
+ /manifest
+ /jar
--
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 p...@debian.org 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 andr...@putzo.net 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] 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com Mon, 14 Apr 2008 18:13:49 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com 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 g.mascell...@gmail.com, Andreas Putzo andreas@ Build-Depends: ant, cdbs, dpatch, debhelper (= 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] 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andr...@putzo.net 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] 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 andr...@putzo.net 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 andr...@putzo.net ## -## 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 andr...@putzo.net 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 andr...@putzo.net 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 mascell...@poisson.phc.unipi.it
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 g.mascell...@gmail.com
+##
+## 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 @@
+ property name=plugin.site.url
value=http://www.tegmento.org/~cdaller/josm/colorscheme//
+ property name=plugin.site.upload.target
value=cdal...@www.tegmento.org:public_html/josm/colorscheme//
+ property name=ant.build.javac.target value=1.5/
+-target name=dist depends=compile, site
++target name=dist depends=compile
+ echo message=creating ${plugin.jar}/
+ !-- images --
+ !--
+@@ -29,14 +29,6 @@
+ include name=*.xml/
+ /fileset
+ /copy
+-exec append=false output=REVISION executable=svn
failifexecutionfails=false
+-env key=LANG value=C/
+-arg value=info/
+-arg value=--xml/
+-arg value=./
+-/exec
+-xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
+-delete file=REVISION/
+ !-- create jar file --
+ jar destfile=${plugin.jar} basedir=${plugin.build.dir}
+ manifest
+@@ -48,14 +40,11 @@
+ /manifest
+ /jar
+ /target
+-target name=compile depends=init
++target name=compile depends=
+ mkdir dir=${plugin.build.dir}/
+ javac srcdir=src destdir=${plugin.build.dir} debug=true
source=1.5 target=1.5
+ classpath
+-pathelement path=${josm.build.dir}/build/
+-fileset dir=${josm.build.dir}/lib
+-include name=**/*.jar/
+-/fileset
++pathelement path=${josm}/
+ /classpath
+ /javac
+ /target
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 andr...@putzo.net
-##
-## 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) );
-
[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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com 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 cdaller...@gmx.at License: GPL-2 @@ -22,15 +31,33 @@ Copyright: © 2007,2008 Frederik Ramm frede...@remote.org License: PD The livegps plugin was put in the public domain by its authors. +Files: measurement/* +Copyright: © Raphael Mack o...@raphael-mack.de +License: ??? + +Files: openvisible/* +Copyright: © Dallermassl (???) +License: ??? + Files: slippymap/* Copyright: © 2007 Hakan Tandogan ha...@gurkensalat.com © 2007 Frederik Ramm frede...@remote.org + © LuVar lubomir.va...@freemap.sk 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 frede...@remote.org © 2007 Gabriel Ebner g...@gabrielebner.at + © Martijn van Oosterhout klep...@svana.org License: GPL-2+ Files: validator/* @@ -39,10 +66,33 @@ Copyright: © 2007 Francisco R. Santos frsan...@gmail.com © 2007,2008 Gabriel Ebner g...@gabrielebner.at 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 chippy2...@gmail.com © 2007 Frederik Ramm frede...@remote.org © 2007 Jonathan Stott jonat...@jstott.me.uk © 2007 Ulf Lamping ulf.lamp...@web.de © 2007,2008 Gabriel Ebner g...@gabrielebner.at + © Petr Dlouhý petr.dlo...@email.cz + © Nick Whitelegg nick.whitel...@solent.ac.uk 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 mascell...@poisson.phc.unipi.it 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 frsan...@gmail.com 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 mascell...@poisson.phc.unipi.it
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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
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 @@
copy todir=build/images
fileset dir=images /
@@ -23,3 +23,14 @@ diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml
jar destfile=${plugin.jar} basedir=build
manifest
attribute name=Plugin-Class
value=org.openstreetmap.josm.plugins.agpifoj.AgpifojPlugin /
+@@ -50,6 +42,10 @@
+ echo message=creating ${plugin.jar}/
+ javac srcdir=src classpath=${josm} destdir=build
+ compilerarg value=-Xlint:deprecation/
++classpath
++file file=${josm}/
++file file=/usr/share/java/metadata-extractor.jar/
++/classpath
+ /javac
+ /target
+ target name=init
--
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 mascell...@poisson.phc.unipi.it
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 g.mascell...@gmail.com
##
-## 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 g.mascell...@gmail.com
##
-## 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 g.mascell...@gmail.com
##
-## 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 g.mascell...@gmail.com
##
-## 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 g.mascell...@gmail.com
##
-## 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 g.mascell...@gmail.com
##
-## 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
[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 andr...@putzo.net 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 g.mascell...@gmail.com 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 andr...@putzo.net 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 g.mascell...@gmail.com - © 2008 Andreas Putzo andr...@putzo.net + © 2008-2009 Andreas Putzo andr...@putzo.net 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 andr...@putzo.net 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] 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com +Copyright: © 2008-2009 Giovanni Mascellani g.mascell...@gmail.com © 2008 Andreas Putzo andr...@putzo.net 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 cdaller...@gmx.at 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 frede...@remote.org @@ -25,11 +22,6 @@ Copyright: © 2007,2008 Frederik Ramm frede...@remote.org License: PD The livegps plugin was put in the public domain by its authors. -Files: namefinder/* -Copyright: © 2007,2008 Frederik Ramm frede...@remote.org -License: PD - The namefinder plugin was put in the public domain by Frederik Ramm. - Files: slippymap/* Copyright: © 2007 Hakan Tandogan ha...@gurkensalat.com © 2007 Frederik Ramm frede...@remote.org @@ -54,15 +46,3 @@ Copyright: © 2007 Tim Waters chippy2...@gmail.com © 2007 Ulf Lamping ulf.lamp...@web.de © 2007,2008 Gabriel Ebner g...@gabrielebner.at License: GPL-2+ - -Files: ywms/* -Copyright: © 2007 Francisco R. Santos frsan...@gmail.com - © 2007 Frederik Ramm frede...@remote.org - © 2007 Gabriel Ebner g...@gabrielebner.at - © 2007 Joerg Ostertag openstreet...@ostertag.name -License: GPL-2 - -Files: slippy_map_chooser/* -Copyright: © 2007 Immanuel Scholz i...@eigenheimstrasse.de - © 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] 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 mascell...@poisson.phc.unipi.it
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 @@
- property name=plugin.site.url
value=http://www.tegmento.org/~cdaller/josm/colorscheme//
- property name=plugin.site.upload.target
value=cdal...@www.tegmento.org:public_html/josm/colorscheme//
- property name=ant.build.javac.target value=1.5/
--target name=dist depends=compile, site
-+target name=dist depends=compile
- echo message=creating ${plugin.jar}/
- !-- images --
- !--
-@@ -29,14 +29,6 @@
- include name=*.xml/
- /fileset
- /copy
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
--xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
- !-- create jar file --
- jar destfile=${plugin.jar} basedir=${plugin.build.dir}
- manifest
-@@ -48,14 +40,11 @@
- /manifest
- /jar
- /target
--target name=compile depends=init
-+target name=compile depends=
- mkdir dir=${plugin.build.dir}/
- javac srcdir=src destdir=${plugin.build.dir} debug=true
source=1.5 target=1.5
- classpath
--pathelement path=${josm.build.dir}/build/
--fileset dir=${josm.build.dir}/lib
--include name=**/*.jar/
--/fileset
-+pathelement path=${josm}/
- /classpath
- /javac
- /target
--
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 mascell...@poisson.phc.unipi.it 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 @@ ant dir=../openvisibleantfile=build.xml target=clean/ ant dir=../slippymap antfile=build.xml target=clean/ ant dir=../surveyor antfile=build.xml target=clean/ -ant dir=../usertools antfile=build.xml target=clean/ ant dir=../utilspluginantfile=build.xml target=clean/ ant dir=../validator antfile=build.xml target=clean/ ant dir=../wmsplugin antfile=build.xml 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] 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 mascell...@poisson.phc.unipi.it 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 mascell...@poisson.phc.unipi.it 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 g.mascell...@gmail.com Sat, 04 Apr 2009 20:42:13 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com 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 mascell...@poisson.phc.unipi.it
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 g.mascell...@gmail.com
-##
-## 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 @@
- /javac
- /target
- target name=dist depends=compile
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
--xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
- jar destfile=${plugin.jar} basedir=${plugin.build.dir}
- manifest
- attribute name=Plugin-Class
value=usertools.UserToolsPlugin /
--
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 mascell...@poisson.phc.unipi.it
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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
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 o...@raphael-mack.de
License: GPL-3+
Files: openvisible/*
-Copyright: © Dallermassl (???)
-License: ???
+Copyright: © Christof Dallermassl
+License: GPL-2+
Files: slippymap/*
Copyright: © 2007 Hakan Tandogan ha...@gurkensalat.com
@@ -50,10 +50,6 @@ Files: surveyor/*
Copyright: © Christof Dallermassl
License: GPL-2+
-Files: usertools/*
-Copyright: ???
-License: ???
-
Files: utilsplugin/*
Copyright: © 2007 Frederik Ramm frede...@remote.org
© 2007 Gabriel Ebner g...@gabrielebner.at
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] 67/369: Josm version on which josm-plugins depends updated.
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 9c4366febc83e44e4b02da2510e5ee952b089852
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Jun 7 13:20:17 2009 +
Josm version on which josm-plugins depends updated.
---
debian/control | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 984ce6b..10216cc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk,
- josm (= 0.0.svn1515), libmetadata-extractor-java
-Build-Conflicts: josm (= 0.0.svn1516)
+ josm (= 0.0.svn1529), libmetadata-extractor-java
+Build-Conflicts: josm (= 0.0.svn1530)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -13,8 +13,8 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn1515), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm (= 0.0.svn1516)
+Depends: josm (= 0.0.svn1529), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (= 0.0.svn1530)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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 mascell...@poisson.phc.unipi.it
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 @@
property name=plugin.jar
value=${plugin.dist.dir}/surveyor.jar/
/ant
-ant dir=../usertools antfile=build.xml target=dist
-property name=plugin.jar
value=${plugin.dist.dir}/usertools.jar/
-/ant
-
ant dir=../utilsplugin antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/utilsplugin.jar/
/ant
--
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] 58/369: Patches updated to last 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 0adf27091e460c645e50775abb7bd68d2aa155e3
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Apr 4 23:30:56 2009 +
Patches updated to last revision
---
debian/patches/100_surveyor.dpatch | 18
debian/patches/10_colorscheme.dpatch | 18
debian/patches/20_livegps.dpatch | 38 ++--
debian/patches/30_slippymap.dpatch | 33 ++---
debian/patches/40_utilsplugin.dpatch | 22 +-
debian/patches/50_validator.dpatch | 22 +-
debian/patches/60_wmsplugin.dpatch | 26 +++-
debian/patches/70_agpifoj.dpatch | 35 ++
debian/patches/80_measurement.dpatch | 26 +++-
debian/patches/90_openvisible.dpatch | 57 ++--
10 files changed, 96 insertions(+), 199 deletions(-)
diff --git a/debian/patches/100_surveyor.dpatch
b/debian/patches/100_surveyor.dpatch
index 98c4329..526fb35 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -6,20 +6,14 @@
@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 @@
+--- trunk~/surveyor/build.xml 2009-03-08 14:39:18.0 +0100
trunk/surveyor/build.xml 2009-04-05 01:29:11.0 +0200
+@@ -19,7 +19,7 @@
+ /classpath
/javac
/target
- target name=dist depends=compile
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
--xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
+-target name=dist depends=compile,revision
++target name=dist depends=compile
copy todir=${plugin.build.dir}/
fileset dir=resources
include name=*.xml/
diff --git a/debian/patches/10_colorscheme.dpatch
b/debian/patches/10_colorscheme.dpatch
index fd512f3..fbf1d57 100755
--- a/debian/patches/10_colorscheme.dpatch
+++ b/debian/patches/10_colorscheme.dpatch
@@ -6,3 +6,21 @@
## DP: * Fix wrong classpath and dependencies
@DPATCH@
+diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
+--- trunk~/colorscheme/build.xml 2009-03-08 14:39:18.0 +0100
trunk/colorscheme/build.xml2009-04-05 01:20:53.0 +0200
+@@ -8,13 +8,12 @@
+ mkdir dir=${plugin.build.dir}/
+ /target
+ target name=compile depends=init
+-echo message=creating ${plugin.jar}/
+ javac srcdir=src classpath=${josm} debug=true
destdir=${plugin.build.dir}
+ compilerarg value=-Xlint:deprecation/
+ compilerarg value=-Xlint:unchecked/
+ /javac
+ /target
+-target name=dist depends=compile,revision
++target name=dist depends=compile
+ copy todir=${plugin.build.dir}
+ fileset dir=src
+ include name=*.xml/
diff --git a/debian/patches/20_livegps.dpatch b/debian/patches/20_livegps.dpatch
index 757a505..d2c9383 100755
--- a/debian/patches/20_livegps.dpatch
+++ b/debian/patches/20_livegps.dpatch
@@ -7,34 +7,14 @@
@DPATCH@
diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
trunk~/livegps/build.xml 2009-01-01 18:55:45.0 +0100
-+++ trunk/livegps/build.xml2009-02-15 19:58:35.0 +0100
-@@ -35,14 +35,6 @@
- copy todir=${plugin.build.dir}/images
- fileset dir=images /
- /copy
--exec append=false output=REVISION executable=svn
failifexecutionfails=false
--env key=LANG value=C/
--arg value=info/
--arg value=--xml/
--arg value=./
--/exec
--xmlproperty file=REVISION prefix=version keepRoot=false
collapseAttributes=true/
--delete file=REVISION/
- !-- create jar file --
- jar destfile=${plugin.jar} basedir=${plugin.build.dir}
- manifest
-@@ -60,12 +52,7 @@
- javac srcdir=livegps destdir=${plugin.build.dir} debug=true
source=1.5 target=1.5
- compilerarg value=-Xlint:deprecation/
- classpath
--pathelement path=${josm.build.dir}/build/
--fileset dir=${josm.build.dir}/lib
--include name=../core/build/josm.jar/
--include name=**/*.jar/
--/fileset
--pathelement location=${plugin.jar}/
-+pathelement location=${josm}/
- /classpath
+--- trunk~/livegps/build.xml 2009-03-18 15:55:16.0 +0100
[josm-plugins] 56/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 04593b3f2e56c7c9b659b0120ff22bcc72b16b6a Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Apr 4 23:14:12 2009 + Updated changelog --- debian/changelog | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50c8c2d..abf7cee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,28 @@ -josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn14400-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * New upstream revision + * Added plugins: ++ agpifoj - Creates a new layer with geotagged pictures. ++ 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. ++ surveyor - Allows adding markers/nodes on current gps positions. + * Removed plugins: ++ namefinder ++ ywms ++ slippy_map_chooser +(integrated in josm or in other plugins, not more maintained on +upstream SVN) + * dpatches updated consequently [ 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 andr...@putzo.net Wed, 25 Feb 2009 21:43:30 + + -- Giovanni Mascellani g.mascell...@gmail.com Sat, 04 Apr 2009 20:42:13 +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] 69/369: Backporting plugin 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 a5b95e8dad281f83454a8a437fe2089150178336
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Jun 7 13:40:30 2009 +
Backporting plugin validator
---
debian/patches/50_validator.dpatch | 86 +-
1 file changed, 85 insertions(+), 1 deletion(-)
diff --git a/debian/patches/50_validator.dpatch
b/debian/patches/50_validator.dpatch
index 2f81e2f..11e701f 100755
--- a/debian/patches/50_validator.dpatch
+++ b/debian/patches/50_validator.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad trunk~/validator/build.xml trunk/validator/build.xml
--- trunk~/validator/build.xml 2009-03-08 14:39:18.0 +0100
-+++ trunk/validator/build.xml 2009-04-05 01:24:52.0 +0200
trunk/validator/build.xml 2009-06-07 15:38:06.0 +0200
@@ -14,7 +14,7 @@
compilerarg value=-Xlint:unchecked/
/javac
@@ -17,3 +17,87 @@ diff -urNad trunk~/validator/build.xml
trunk/validator/build.xml
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
+diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
+---
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-02-01 21:50:42.0 +0100
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-06-07 15:39:26.0 +0200
+@@ -12,7 +12,7 @@
+ import org.openstreetmap.josm.data.coor.EastNorth;
+ import org.openstreetmap.josm.data.osm.*;
+ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.gui.MapView;
+ import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+ import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+@@ -129,7 +129,7 @@
+ /**
+ * Visitor that highlights all cells the selected primitives go through
+ */
+-class HighlightCellVisitor implements Visitor
++class HighlightCellVisitor extends AbstractVisitor
+ {
+ /** The MapView */
+ private final MapView mv;
+diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
+--- trunk~/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
2009-03-08 14:39:18.0 +0100
trunk/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
2009-06-07 15:39:26.0 +0200
+@@ -12,7 +12,7 @@
+ import org.openstreetmap.josm.data.osm.OsmPrimitive;
+ import org.openstreetmap.josm.data.osm.Relation;
+ import org.openstreetmap.josm.data.osm.Way;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.tools.GBC;
+
+ /**
+@@ -24,7 +24,7 @@
+ *
+ * @author frsantos
+ */
+-public class Test implements Visitor
++public class Test extends AbstractVisitor
+ {
+ /** Name of the test */
+ protected String name;
+diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
+---
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
2009-02-01 21:50:42.0 +0100
trunk/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
2009-06-07 15:39:26.0 +0200
+@@ -14,7 +14,7 @@
+ import org.openstreetmap.josm.data.osm.Relation;
+ import org.openstreetmap.josm.data.osm.Way;
+ import org.openstreetmap.josm.data.osm.WaySegment;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+ import org.openstreetmap.josm.gui.MapView;
+
+ /**
+@@ -251,7 +251,7 @@
+ * Visitor that highlights the primitives affected by this error
+ * @author frsantos
+ */
+-class PaintVisitor implements ValidatorVisitor, Visitor {
++class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
+ /** The graphics */
+ private final Graphics g;
+ /** The MapView */
+diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
+---
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
2009-02-01 21:50:42.0 +0100
trunk/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
2009-06-07 15:39:46.0 +0200
+@@ -5,7 +5,7 @@
[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 mascell...@poisson.phc.unipi.it 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 o...@raphael-mack.de -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] 61/369: Fixed too strict conflicting bound
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 ad46798e78b3ecbf397b7d5fdb6bb8faf38c1dbb
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Apr 4 23:37:46 2009 +
Fixed too strict conflicting bound
---
debian/control | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index b3773e8..984ce6b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian GIS Project
pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk,
josm (= 0.0.svn1515), libmetadata-extractor-java
+Build-Conflicts: josm (= 0.0.svn1516)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -13,7 +14,7 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
Depends: josm (= 0.0.svn1515), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm ( 0.0.svn1515)
+Conflicts: josm (= 0.0.svn1516)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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] 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 mascell...@poisson.phc.unipi.it
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
copy todir=${plugin.build.dir}/
fileset dir=resources
include name=*.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] 59/369: Missing link to libmetadata-extractor-java
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 e3bae97b73932d3ba5f46cf574f628d6a23c4760 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Apr 4 23:33:39 2009 + Missing link to libmetadata-extractor-java --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 862b2dd..fc82b4f 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-6-openjdk ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar +DEB_JARS += /usr/share/java/metadata-extractor.jar DEB_ANT_BUILDFILE := $(CURDIR)/debian/master.xml DEB_ANT_BUILD_TARGET := build -- 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] 74/369: FTBFS should be 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 ee81f6fcd61fc2182189bebd67afadf571e03eef Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Thu Aug 13 12:06:48 2009 + FTBFS should be fixed --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d176f47..8e0c22a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,7 @@ josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low upstream SVN) * dpatches updated consequently * Added both build and binary dependencies on the exact version of josm -(closes: #530305) +(closes: #530305, #537009) * Debian policy bumped to 3.8.2 (no changes required) [ Andreas Putzo ] @@ -25,7 +25,7 @@ josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani g.mascell...@gmail.com Tue, 11 Aug 2009 16:11:47 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com Thu, 13 Aug 2009 13:57:57 +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] 71/369: Dependencies set to latest josm 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 80919f2ebff568246b6868807ee92a394fecc192
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Fri Jul 17 13:56:31 2009 +
Dependencies set to latest josm revision
---
debian/control | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 10216cc..95a0188 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk,
- josm (= 0.0.svn1529), libmetadata-extractor-java
-Build-Conflicts: josm (= 0.0.svn1530)
+ josm (= 0.0.svn1788), libmetadata-extractor-java
+Build-Conflicts: josm (= 0.0.svn1789)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -13,8 +13,8 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn1529), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm (= 0.0.svn1530)
+Depends: josm (= 0.0.svn1788), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (= 0.0.svn1789)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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] 76/369: Patched updated to latest 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 bd9cb3ff8f61155388ca521107bf30f24bcc8989
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Mon Sep 14 14:13:22 2009 +
Patched updated to latest revision
---
debian/changelog | 6 +++---
debian/patches/100_surveyor.dpatch | 16 ++--
debian/patches/60_wmsplugin.dpatch | 8
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 71690d2..058f0e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low
+josm-plugins (0.0.svn17608-1) UNRELEASED; urgency=low
[ Giovanni Mascellani ]
* New upstream revision
@@ -23,9 +23,9 @@ josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low
[ Andreas Putzo ]
* Update packaging copyright year.
* Mention added plugins in long description.
- * Use openjdk in debian/rules to be consistent with build dependency.
+ * Use openjdk in debian/rules to be consistent with build dependency.
- -- Giovanni Mascellani g.mascell...@gmail.com Fri, 11 Sep 2009 11:09:49
+0200
+ -- Giovanni Mascellani g.mascell...@gmail.com Mon, 14 Sep 2009 16:05:56
+0200
josm-plugins (0.0.0.20080518-1) unstable; urgency=low
diff --git a/debian/patches/100_surveyor.dpatch
b/debian/patches/100_surveyor.dpatch
index 6c37a7e..3f03e52 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -6,21 +6,9 @@
## DP: * Backport recent code
@DPATCH@
-diff -urNad
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-06-06 22:25:31.0 +0200
-+++
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-07-17 15:55:16.0 +0200
-@@ -102,7 +102,7 @@
- private void openAsData(File file) throws SAXException, IOException,
FileNotFoundException {
- String fn = file.getName();
- if (new OsmImporter().acceptFile(file)) {
--DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), null, Main.pleaseWaitDlg);
-+DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), Main.pleaseWaitDlg);
- OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
- Main.main.addLayer(layer);
- }
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
trunk~/surveyor/build.xml 2009-07-09 14:36:03.0 +0200
-+++ trunk/surveyor/build.xml 2009-07-17 15:54:41.0 +0200
+--- trunk~/surveyor/build.xml 2009-08-30 18:28:38.0 +0200
trunk/surveyor/build.xml 2009-09-14 16:09:57.0 +0200
@@ -19,7 +19,7 @@
/classpath
/javac
diff --git a/debian/patches/60_wmsplugin.dpatch
b/debian/patches/60_wmsplugin.dpatch
index 542fb9c..c7fd74e 100755
--- a/debian/patches/60_wmsplugin.dpatch
+++ b/debian/patches/60_wmsplugin.dpatch
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
trunk~/wmsplugin/build.xml 2009-07-04 20:28:12.0 +0200
-+++ trunk/wmsplugin/build.xml 2009-07-17 15:48:28.0 +0200
-@@ -14,7 +14,7 @@
+--- trunk~/wmsplugin/build.xml 2009-09-09 00:30:10.0 +0200
trunk/wmsplugin/build.xml 2009-09-14 16:09:32.0 +0200
+@@ -43,7 +43,7 @@
compilerarg value=-Xlint:unchecked/
/javac
/target
-target name=dist depends=compile,revision
+target name=dist depends=compile
+ echo message=building ${plugin.jar} with version
${version.entry.commit.revision} for JOSM version ${josm.reference.release} /
copy todir=${plugin.build.dir}/images
fileset dir=images/
- /copy
--
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] 75/369: Bump to 3.8.3
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 fee8effbfdaf52fd4fc42b2138451bce4bc0da81 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Fri Sep 11 09:10:25 2009 + Bump to 3.8.3 --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e0c22a..71690d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,14 +18,14 @@ josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low * dpatches updated consequently * Added both build and binary dependencies on the exact version of josm (closes: #530305, #537009) - * Debian policy bumped to 3.8.2 (no changes required) + * Debian policy bumped to 3.8.3 (no changes required) [ 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 g.mascell...@gmail.com Thu, 13 Aug 2009 13:57:57 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com Fri, 11 Sep 2009 11:09:49 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4b644f2..2d710ed 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andreas@ Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk, josm (= 0.0.svn1788), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn1789) -Standards-Version: 3.8.2 +Standards-Version: 3.8.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/ -- 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] 73/369: Policy to 3.8.2
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 0d297dbe8422b627319316251f2d87368bb823cb Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Tue Aug 11 14:17:16 2009 + Policy to 3.8.2 --- debian/changelog | 5 +++-- debian/control | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fba7e38..d176f47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,14 +17,15 @@ josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low upstream SVN) * dpatches updated consequently * Added both build and binary dependencies on the exact version of josm -(closes #530305) +(closes: #530305) + * Debian policy bumped to 3.8.2 (no changes required) [ 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 g.mascell...@gmail.com Wed, 15 Jul 2009 21:11:36 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com Tue, 11 Aug 2009 16:11:47 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 95a0188..4b644f2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andreas@ Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk, josm (= 0.0.svn1788), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn1789) -Standards-Version: 3.8.0 +Standards-Version: 3.8.2 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] 70/369: New upstream 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 8dc4a04e964137056e9cb1a5d4b79da15349d94b Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Wed Jul 15 19:12:29 2009 + New upstream release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eab62c..fba7e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn14400-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * New upstream revision @@ -24,7 +24,7 @@ josm-plugins (0.0.svn14400-1) UNRELEASED; urgency=low * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani g.mascell...@gmail.com Sun, 24 May 2009 11:45:31 +0200 + -- Giovanni Mascellani g.mascell...@gmail.com Wed, 15 Jul 2009 21:11:36 +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] 72/369: Advances to latest upstream 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 fe26bc175c4294eeca31706ee3b73de971551220
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Fri Jul 17 13:56:59 2009 +
Advances to latest upstream revision
---
debian/patches/100_surveyor.dpatch | 48 +++---
debian/patches/50_validator.dpatch | 84 --
debian/patches/60_wmsplugin.dpatch | 8 ++--
3 files changed, 18 insertions(+), 122 deletions(-)
diff --git a/debian/patches/100_surveyor.dpatch
b/debian/patches/100_surveyor.dpatch
index d38522a..6c37a7e 100755
--- a/debian/patches/100_surveyor.dpatch
+++ b/debian/patches/100_surveyor.dpatch
@@ -6,9 +6,21 @@
## DP: * Backport recent code
@DPATCH@
+diff -urNad
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
+---
trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-06-06 22:25:31.0 +0200
trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
2009-07-17 15:55:16.0 +0200
+@@ -102,7 +102,7 @@
+ private void openAsData(File file) throws SAXException, IOException,
FileNotFoundException {
+ String fn = file.getName();
+ if (new OsmImporter().acceptFile(file)) {
+-DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), null, Main.pleaseWaitDlg);
++DataSet dataSet = OsmReader.parseDataSet(new
FileInputStream(file), Main.pleaseWaitDlg);
+ OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
+ Main.main.addLayer(layer);
+ }
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
trunk~/surveyor/build.xml 2009-03-08 14:39:18.0 +0100
-+++ trunk/surveyor/build.xml 2009-04-05 01:29:11.0 +0200
+--- trunk~/surveyor/build.xml 2009-07-09 14:36:03.0 +0200
trunk/surveyor/build.xml 2009-07-17 15:54:41.0 +0200
@@ -19,7 +19,7 @@
/classpath
/javac
@@ -18,35 +30,3 @@ diff -urNad trunk~/surveyor/build.xml
trunk/surveyor/build.xml
copy todir=${plugin.build.dir}/
fileset dir=resources
include name=*.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();
diff --git a/debian/patches/50_validator.dpatch
b/debian/patches/50_validator.dpatch
index 11e701f..43376ac 100755
--- a/debian/patches/50_validator.dpatch
+++ b/debian/patches/50_validator.dpatch
@@ -17,87 +17,3 @@ diff -urNad trunk~/validator/build.xml
trunk/validator/build.xml
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
-diff -urNad
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
trunk~/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-02-01 21:50:42.0 +0100
-+++
trunk/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
2009-06-07 15:39:26.0 +0200
-@@ -12,7 +12,7 @@
- import org.openstreetmap.josm.data.coor.EastNorth;
- import org.openstreetmap.josm.data.osm.*;
- import
[josm-plugins] 77/369: Josm dependency updated
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 7bf6487f1aaee3acb6c4d2290e68a49d95a5cfc9
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Mon Sep 14 14:14:37 2009 +
Josm dependency updated
---
debian/control | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index 2d710ed..46f3283 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk,
- josm (= 0.0.svn1788), libmetadata-extractor-java
-Build-Conflicts: josm (= 0.0.svn1789)
+ josm (= 0.0.svn1981), libmetadata-extractor-java
+Build-Conflicts: josm (= 0.0.svn1982)
Standards-Version: 3.8.3
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -13,8 +13,8 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn1788), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm (= 0.0.svn1789)
+Depends: josm (= 0.0.svn1981), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (= 0.0.svn1982)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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] 78/369: Sorry, got a not working revision before. Updating 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 6bee5972fad15cdeec0ae06d01879420a79aac82 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Mon Sep 14 14:29:26 2009 + Sorry, got a not working revision before. Updating changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 058f0e5..37fbda1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn17608-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn17277-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * New upstream revision -- 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] 85/369: Minor fixes
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 4d903509c012c02653bfa45c7d757fe16deef3fb Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Fri Nov 6 23:56:25 2009 + Minor fixes --- debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5472d35..c8abf93 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,13 @@ Source: josm-plugins Section: java Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org -Uploaders: Giovanni Mascellani mascell...@poisson.phc.unipi.it, Andreas Putzo andr...@putzo.net +Uploaders: Giovanni Mascellani mascell...@poisson.phc.unipi.it, + Andreas Putzo andr...@putzo.net Build-Depends: ant, cdbs, dpatch, debhelper (= 5), default-jdk, josm (= 0.0.svn2255), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn2256) Standards-Version: 3.8.3 -Homepage: http://josm.openstreetmap.de +Homepage: http://josm.openstreetmap.de/wiki/Plugins 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] 84/369: Some minor fixes
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 80102bd09400fa9ec8425f749354576b0c99c693 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Fri Nov 6 23:54:31 2009 + Some minor fixes --- debian/control | 4 ++-- debian/rules | 6 +++--- debian/watch | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 61b8bd0..5472d35 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: josm-plugins -Section: utils +Section: java Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani mascell...@poisson.phc.unipi.it, Andreas Putzo andr...@putzo.net -Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk, +Build-Depends: ant, cdbs, dpatch, debhelper (= 5), default-jdk, josm (= 0.0.svn2255), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn2256) Standards-Version: 3.8.3 diff --git a/debian/rules b/debian/rules index fc82b4f..d4baae1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f # debian/rules file for josm-plugins (uses cdbs) - + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := /usr/share/josm/josm.jar DEB_JARS += /usr/share/java/metadata-extractor.jar diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..ec65a37 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +# Watch file missing, because there are no upstream releases. +# This package contains many independent plugins, all of them +# under a continuous development philosophy. -- 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] 79/369: Copyright updated
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 b794d6cce56176ebea36848f935d691a478a559b Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Mon Sep 14 14:33:16 2009 + Copyright updated --- debian/copyright | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/copyright b/debian/copyright index 59fea09..7eca090 100644 --- a/debian/copyright +++ b/debian/copyright @@ -60,6 +60,7 @@ Files: validator/* Copyright: © 2007 Francisco R. Santos frsan...@gmail.com © 2007 Joerg Ostertag openstreet...@ostertag.name © 2007,2008 Gabriel Ebner g...@gabrielebner.at + © 2007 Immanuel Scholz License: GPL-2 Files: validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java -- 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] 86/369: dirs unused
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 0b87437f21cce02f82f953a0c027c81a93ef5b4d Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Fri Nov 6 23:59:42 2009 + dirs unused --- debian/josm-plugins.dirs | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/josm-plugins.dirs b/debian/josm-plugins.dirs deleted file mode 100644 index 708e0ca..000 --- a/debian/josm-plugins.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/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] 87/369: Initial upstream branch
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 7f07ad2b7a905405e737078e20e08759b8c94152 Author: David Paleino da...@debian.org Date: Mon Nov 9 17:33:27 2009 +0100 Initial upstream branch -- 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] 88/369: Merge branch 'upstream'
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 ae4dc6935065c80459177108c067c5a0b27d872d Merge: 0b87437 7f07ad2 Author: David Paleino da...@debian.org Date: Mon Nov 9 17:33:33 2009 +0100 Merge branch 'upstream' -- 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] 82/369: Coming back a few versions (too recent releases are incompatible with josm)
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 fa7734a0ffc5a4b0105e96ecb483ee5240cabac2 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Thu Nov 5 23:49:47 2009 + Coming back a few versions (too recent releases are incompatible with josm) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5159a22..998a7a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn18463-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn18009-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * New upstream revision @@ -25,7 +25,7 @@ josm-plugins (0.0.svn18463-1) UNRELEASED; urgency=low * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani g.mascell...@gmail.com Mon, 14 Sep 2009 16:05:56 +0200 + -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Fri, 06 Nov 2009 00:47:04 +0100 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] 81/369: Updated my name ;-)
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 d331b6701fba724bc54a4575f31be48b6abf80ff Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Thu Nov 5 23:07:33 2009 + Updated my name ;-) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f71eb20..61b8bd0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: josm-plugins Section: utils Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org -Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo andr...@putzo.net +Uploaders: Giovanni Mascellani mascell...@poisson.phc.unipi.it, Andreas Putzo andr...@putzo.net Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk, josm (= 0.0.svn2255), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn2256) -- 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] 83/369: Releasing and adding README.source
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 eabe6fca2ea9bf3fc7eaf18c40bf70c2ff2662b4 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Thu Nov 5 23:52:44 2009 + Releasing and adding README.source --- debian/README.source | 5 + debian/changelog | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..37f3e1d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,5 @@ +This package uses the dpatch system to apply patches to the upstream +source code of the software that is packaged. For details about how to +use dpatch read + /usr/share/doc/dpatch/README.source.gz +from the dpatch package. diff --git a/debian/changelog b/debian/changelog index 998a7a0..6d2d680 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn18009-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn18009-1) unstable; urgency=low [ Giovanni Mascellani ] * New upstream revision @@ -19,13 +19,14 @@ josm-plugins (0.0.svn18009-1) UNRELEASED; urgency=low * Added both build and binary dependencies on the exact version of josm (closes: #530305, #537009) * Debian policy bumped to 3.8.3 (no changes required) + * Added debian/README.source with info about dpatch [ 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 mascell...@poisson.phc.unipi.it Fri, 06 Nov 2009 00:47:04 +0100 + -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Fri, 06 Nov 2009 00:52:03 +0100 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] 80/369: Updated for new josm
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 6fd30d10427830ebed9b0ce4e20d1b493a7316a2
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Thu Nov 5 23:06:53 2009 +
Updated for new josm
---
debian/changelog | 2 +-
debian/control | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37fbda1..5159a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm-plugins (0.0.svn17277-1) UNRELEASED; urgency=low
+josm-plugins (0.0.svn18463-1) UNRELEASED; urgency=low
[ Giovanni Mascellani ]
* New upstream revision
diff --git a/debian/control b/debian/control
index 46f3283..f71eb20 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Giovanni Mascellani g.mascell...@gmail.com, Andreas Putzo
andr...@putzo.net
Build-Depends: ant, cdbs, dpatch, debhelper (= 5), openjdk-6-jdk,
- josm (= 0.0.svn1981), libmetadata-extractor-java
-Build-Conflicts: josm (= 0.0.svn1982)
+ josm (= 0.0.svn2255), libmetadata-extractor-java
+Build-Conflicts: josm (= 0.0.svn2256)
Standards-Version: 3.8.3
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -13,8 +13,8 @@ Vcs-Browser:
http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn1981), libmetadata-extractor-java, ${misc:Depends}
-Conflicts: josm (= 0.0.svn1982)
+Depends: josm (= 0.0.svn2255), libmetadata-extractor-java, ${misc:Depends}
+Conflicts: josm (= 0.0.svn2256)
Suggests: gpsd
Description: Plugins for JOSM
JOSM (Java OpenStreetMap) plugin collection.
--
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] 91/369: debian/control: added myself to 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 4c326a06790220101fa89424fbd8a92f91b34a8c Author: David Paleino da...@debian.org Date: Mon Nov 9 17:43:37 2009 +0100 debian/control: added myself to Uploaders --- debian/changelog | 7 +++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d2d680..8e546b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +josm-plugins (0.0.svn18009-2) UNRELEASED; urgency=low + + * debian/control: +- added myself to Uploaders + + -- David Paleino da...@debian.org Mon, 09 Nov 2009 17:42:58 +0100 + josm-plugins (0.0.svn18009-1) unstable; urgency=low [ Giovanni Mascellani ] diff --git a/debian/control b/debian/control index c8abf93..2cc68bc 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: java Priority: extra Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Giovanni Mascellani mascell...@poisson.phc.unipi.it, - Andreas Putzo andr...@putzo.net + Andreas Putzo andr...@putzo.net, + David Paleino da...@debian.org Build-Depends: ant, cdbs, dpatch, debhelper (= 5), default-jdk, josm (= 0.0.svn2255), libmetadata-extractor-java Build-Conflicts: josm (= 0.0.svn2256) -- 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] 94/369: New plugins added to package
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 bbf011c684a9046172b790b9a965860f28ed2a81 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Dec 5 00:40:30 2009 +0100 New plugins added to package --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index d4baae1..dd360a0 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := clean SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/ -PLUGINS := agpifoj colorscheme livegps measurement openvisible slippymap surveyor utilsplugin validator wmsplugin +PLUGINS := agpifoj cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps measurement openvisible routing 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] 95/369: d/ch: updated for new 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 a3c41142c3caf6c261deedddbff11b8b06ec6307 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Dec 5 01:01:05 2009 +0100 d/ch: updated for new revision --- debian/changelog | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 886ed59..aa02323 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,16 @@ -josm-plugins (0.0.svn18009-2) UNRELEASED; urgency=low +josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low + [ David Paleino ] * debian/control: - added myself to Uploaders - move package from Section java to utils, according to archive override - Vcs-* fields updated, package moved to Git - -- David Paleino da...@debian.org Mon, 09 Nov 2009 17:46:44 +0100 + [ Giovanni Mascellani ] + * Updated to revision 18885 (synchronized with josm) + + -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Sat, 05 Dec 2009 01:00:12 +0100 josm-plugins (0.0.svn18009-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] 93/369: Vcs-* fields updated, package moved to Git
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 0049241e44e70297d136b32559637f1a07769ce7 Author: David Paleino da...@debian.org Date: Mon Nov 9 17:46:57 2009 +0100 Vcs-* fields updated, package moved to Git --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2875ff..886ed59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ josm-plugins (0.0.svn18009-2) UNRELEASED; urgency=low - added myself to Uploaders - move package from Section java to utils, according to archive override +- Vcs-* fields updated, package moved to Git - -- David Paleino da...@debian.org Mon, 09 Nov 2009 17:45:30 +0100 + -- David Paleino da...@debian.org Mon, 09 Nov 2009 17:46:44 +0100 josm-plugins (0.0.svn18009-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 1c62336..c2aef3a 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: ant, cdbs, dpatch, debhelper (= 5), default-jdk, Build-Conflicts: josm (= 0.0.svn2256) Standards-Version: 3.8.3 Homepage: http://josm.openstreetmap.de/wiki/Plugins -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm-plugins/ +Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git +Vcs-Browser: http://git.debian.org/?p=pkg-grass/josm-plugins.git 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] 102/369: Dependencies for routing plugin 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 8e6a7c594d02a915684f6e5c22c436a6cbce96ca
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Dec 6 22:21:04 2009 +0100
Dependencies for routing plugin fixed
---
debian/control| 3 ++-
debian/patches/150_routing.dpatch | 10 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 1901662..4d39323 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-grass/josm-plugins.git
Package: josm-plugins
Architecture: all
-Depends: josm (= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends}
+Depends: josm (= 0.0.svn2561), libmetadata-extractor-java, ${misc:Depends},
+ liblog4j1.2-java, libjgrapht0.7-java
Conflicts: josm (= 0.0.svn2562)
Suggests: gpsd
Description: Plugins for JOSM
diff --git a/debian/patches/150_routing.dpatch
b/debian/patches/150_routing.dpatch
index ad16e67..80eb74a 100755
--- a/debian/patches/150_routing.dpatch
+++ b/debian/patches/150_routing.dpatch
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad josm-plugins~/routing/build.xml josm-plugins/routing/build.xml
--- josm-plugins~/routing/build.xml2009-12-05 01:01:22.0 +0100
-+++ josm-plugins/routing/build.xml 2009-12-06 21:42:54.0 +0100
josm-plugins/routing/build.xml 2009-12-06 22:20:03.0 +0100
@@ -4,8 +4,8 @@
property name=plugin.dist.dirvalue=../../dist/
property name=plugin.build.dir value=build/
@@ -30,3 +30,11 @@ diff -urNad josm-plugins~/routing/build.xml
josm-plugins/routing/build.xml
copy todir=${plugin.build.dir}/
fileset dir=resources
include name=*.xml/
+@@ -46,6 +44,7 @@
+ attribute name=Plugin-Mainversion value=2450/
+ attribute name=Plugin-Stage value=50/
+ attribute name=Plugin-Version
value=${version.entry.commit.revision}/
++attribute name=Class-Path value=${jgrapht} ${log4j}/
+ /manifest
+ /jar
+ /target
--
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] 100/369: Added master.xml stanzas for new 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 5fd5b4f9b2058c642684c4696417da3eedef4cbb
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sun Dec 6 21:51:20 2009 +0100
Added master.xml stanzas for new plugins
---
debian/master.xml | 20
1 file changed, 20 insertions(+)
diff --git a/debian/master.xml b/debian/master.xml
index 734d92a..a33c6b6 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -19,9 +19,25 @@
property name=plugin.jar
value=${plugin.dist.dir}/agpifoj.jar/
/ant
+ant dir=../cadastre-fr antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/cadastre-fr.jar/
+/ant
+
ant dir=../colorscheme antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/colorscheme.jar/
/ant
+
+ant dir=../DirectUpload antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/DirectUpload.jar/
+/ant
+
+ant dir=../editgpx antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/editgpx.jar/
+/ant
+
+ant dir=../lakewalker antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/lakewalker.jar/
+/ant
ant dir=../livegps antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/livegps.jar/
@@ -35,6 +51,10 @@
property name=plugin.jar
value=${plugin.dist.dir}/openvisible.jar/
/ant
+ant dir=../routing antfile=build.xml target=dist
+property name=plugin.jar
value=${plugin.dist.dir}/routing.jar/
+/ant
+
ant dir=../slippymap antfile=build.xml target=dist
property name=plugin.jar
value=${plugin.dist.dir}/slippymap.jar/
/ant
--
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] 90/369: Merge commit 'upstream/0.0.svn18009'
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 d27dcf40837c759279a521cd83d7900da8139322 Merge: ae4dc69 556f400 Author: David Paleino da...@debian.org Date: Mon Nov 9 17:34:23 2009 +0100 Merge commit 'upstream/0.0.svn18009' agpifoj/.classpath |7 + agpifoj/.project | 17 + agpifoj/CHANGELOG |1 + agpifoj/LICENSE| 341 ++ agpifoj/README | 57 + agpifoj/build.xml | 64 ++ agpifoj/images/agpifoj-open.png| Bin 0 - 938 bytes agpifoj/images/dialogs/agpifoj-mag-cursor.png | Bin 0 - 394 bytes agpifoj/images/dialogs/agpifoj-marker-black.png| Bin 0 - 239 bytes agpifoj/images/dialogs/agpifoj-marker-selected.png | Bin 0 - 231 bytes agpifoj/images/dialogs/agpifoj-marker.png | Bin 0 - 233 bytes agpifoj/images/dialogs/agpifoj.png | Bin 0 - 500 bytes agpifoj/images/dialogs/gpx2img.png | Bin 0 - 663 bytes agpifoj/images/dialogs/gpx2imgManual.png | Bin 0 - 924 bytes .../josm/plugins/agpifoj/AgpifojDialog.java| 185 +++ .../josm/plugins/agpifoj/AgpifojLayer.java | 530 + .../josm/plugins/agpifoj/AgpifojPlugin.java| 100 ++ .../plugins/agpifoj/CorrelateGpxWithImages.java| 1177 .../josm/plugins/agpifoj/ImageDisplay.java | 607 ++ colorscheme/LICENSE| 339 ++ colorscheme/build.xml | 57 + colorscheme/copyright.txt |6 + .../josm/plugin/colorscheme/ColorSchemePlugin.java | 31 + .../plugin/colorscheme/ColorSchemePreference.java | 190 livegps/.classpath |7 + livegps/.project | 17 + livegps/README | 14 + livegps/build.xml | 57 + livegps/images/autocentermenu.png | Bin 0 - 577 bytes livegps/images/capturemenu.png | Bin 0 - 743 bytes livegps/images/centermenu.png | Bin 0 - 745 bytes livegps/images/dialogs/livegps.png | Bin 0 - 2778 bytes livegps/src/livegps/LiveGpsAcquirer.java | 226 livegps/src/livegps/LiveGpsData.java | 207 livegps/src/livegps/LiveGpsDialog.java | 108 ++ livegps/src/livegps/LiveGpsLayer.java | 157 +++ livegps/src/livegps/LiveGpsLock.java | 16 + livegps/src/livegps/LiveGpsPlugin.java | 221 livegps/src/livegps/LiveGpsStatus.java | 49 + measurement/.classpath |7 + measurement/.project | 17 + measurement/LICENSE|7 + measurement/build.xml | 55 + measurement/images/dialogs/measure.png | Bin 0 - 757 bytes measurement/images/mapmode/measurement.png | Bin 0 - 664 bytes measurement/images/measurement.png | Bin 0 - 333 bytes .../plugins/measurement/MeasurementDialog.java | 167 +++ .../josm/plugins/measurement/MeasurementLayer.java | 333 ++ .../josm/plugins/measurement/MeasurementMode.java | 54 + .../plugins/measurement/MeasurementPlugin.java | 51 + openvisible/.classpath |7 + openvisible/.project | 17 + openvisible/LICENSE| 339 ++ openvisible/build.xml | 57 + openvisible/copyright.txt |6 + openvisible/images/openvisible.png | Bin 0 - 784 bytes .../josm/plugin/openvisible/OpenVisibleAction.java | 135 +++ .../josm/plugin/openvisible/OpenVisiblePlugin.java | 21 + .../josm/plugin/openvisible/OsmGpxBounds.java | 121 ++ slippymap/.classpath |7 + slippymap/.project | 17 + slippymap/README | 16 + slippymap/build.xml| 56 + slippymap/images/preferences/slippymap.png | Bin 0 - 3748 bytes slippymap/images/slippymap.png | Bin 0 - 847 bytes .../josm/plugins/slippymap/SlippyMapKey.java | 78 ++ .../josm/plugins/slippymap/SlippyMapLayer.java | 915 +++ .../josm/plugins/slippymap/SlippyMapPlugin.java| 40 + .../slippymap/SlippyMapPreferenceSetting.java | 105 ++ .../plugins/slippymap/SlippyMapPreferences.java| 219 .../josm/plugins/slippymap/SlippyMapTile.java | 188
[josm-plugins] 97/369: Merge commit 'upstream/0.0.svn18885'
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 ec4ebbb45f6aa7ea3f6e58c8a0dd6f8e0a0c942e
Merge: a3c4114 51e1ab6
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Dec 5 01:01:22 2009 +0100
Merge commit 'upstream/0.0.svn18885'
{agpifoj = DirectUpload}/.classpath | 0
DirectUpload/.project | 17 +
DirectUpload/LICENSE | 341 +++
DirectUpload/README| 4 +
{slippymap = DirectUpload}/build.xml | 12 +-
DirectUpload/images/UploadAction.png | Bin 0 - 105039 bytes
DirectUpload/nbproject/build-impl.xml | 629 +
DirectUpload/nbproject/genfiles.properties | 8 +
DirectUpload/nbproject/private/private.properties | 2 +
DirectUpload/nbproject/private/private.xml | 4 +
DirectUpload/nbproject/project.properties | 59 ++
DirectUpload/nbproject/project.xml | 16 +
.../josm/plugins/DirectUpload/UploadDataGui.form | 164
.../josm/plugins/DirectUpload/UploadDataGui.java | 517 +++
.../plugins/DirectUpload/UploadDataGuiPlugin.java | 43 +
agpifoj/.classpath | 3 +-
agpifoj/build.xml | 2 +-
.../josm/plugins/agpifoj/AgpifojLayer.java | 54 +-
.../plugins/agpifoj/CorrelateGpxWithImages.java| 20 +-
{measurement = cadastre-fr}/.classpath| 2 +-
cadastre-fr/.project | 17 +
cadastre-fr/CONTRIBUTION | 4 +
cadastre-fr/LICENSE| 341 +++
cadastre-fr/README | 26 +
{livegps = cadastre-fr}/build.xml | 14 +-
cadastre-fr/dist-lastest/readme.txt| 4 +
cadastre-fr/images/cadastre_small.png | Bin 0 - 222 bytes
cadastre-fr/images/load.png| Bin 0 - 883 bytes
cadastre-fr/images/mapmode/adjustxywms.png | Bin 0 - 1300 bytes
cadastre-fr/images/mapmode/adjustzwms.png | Bin 0 - 1468 bytes
cadastre-fr/images/preferences/cadastrewms.gif | Bin 0 - 1068 bytes
cadastre-fr/images/preferences/sel_box_1.png | Bin 0 - 435 bytes
cadastre-fr/images/preferences/sel_box_2.png | Bin 0 - 426 bytes
cadastre-fr/images/preferences/sel_box_3.png | Bin 0 - 452 bytes
cadastre-fr/images/preferences/sel_box_4.png | Bin 0 - 507 bytes
cadastre-fr/images/preferences/unsel_box_1.png | Bin 0 - 381 bytes
cadastre-fr/images/preferences/unsel_box_2.png | Bin 0 - 371 bytes
cadastre-fr/images/preferences/unsel_box_3.png | Bin 0 - 401 bytes
cadastre-fr/images/preferences/unsel_box_4.png | Bin 0 - 451 bytes
cadastre-fr/images/save.png| Bin 0 - 845 bytes
cadastre-fr/src/META-INF/MANIFEST.MF | 6 +
cadastre-fr/src/cadastre_fr/CacheControl.java | 210 +
.../cadastre_fr/CacheFileLambert4ZoneFilter.java | 52 ++
.../cadastre_fr/CacheFileLambert9ZoneFilter.java | 59 ++
.../src/cadastre_fr/CacheFileUTM20NFilter.java | 53 ++
cadastre-fr/src/cadastre_fr/CadastreGrabber.java | 100 +++
cadastre-fr/src/cadastre_fr/CadastreInterface.java | 508 +++
cadastre-fr/src/cadastre_fr/CadastrePlugin.java| 302 +++
.../src/cadastre_fr/CadastrePreferenceSetting.java | 280 ++
.../src/cadastre_fr/CheckSourceUploadHook.java | 92 ++
.../src/cadastre_fr/DownloadSVGBuilding.java | 276 ++
cadastre-fr/src/cadastre_fr/DownloadSVGTask.java | 222 +
.../src/cadastre_fr/DownloadWMSPlanImage.java | 122 +++
.../src/cadastre_fr/DownloadWMSVectorImage.java| 82 ++
.../src/cadastre_fr/DuplicateLayerException.java | 5 +
cadastre-fr/src/cadastre_fr/EastNorthBound.java| 42 +
cadastre-fr/src/cadastre_fr/GeorefImage.java | 233 +
cadastre-fr/src/cadastre_fr/ImageModifier.java | 16 +
.../src/cadastre_fr/MenuActionBoundaries.java | 37 +
.../src/cadastre_fr/MenuActionBuildings.java | 37 +
cadastre-fr/src/cadastre_fr/MenuActionGrab.java| 46 +
.../src/cadastre_fr/MenuActionGrabPlanImage.java | 348
.../src/cadastre_fr/MenuActionLoadFromCache.java | 117 +++
.../src/cadastre_fr/MenuActionNewLocation.java | 99 ++
.../src/cadastre_fr/MenuActionResetCookie.java | 24 +
.../src/cadastre_fr/MenuActionSaveRasterAs.java| 74 ++
.../src/cadastre_fr/RasterImageModifier.java | 104 +++
cadastre-fr/src/cadastre_fr/SVGParser.java | 65 ++
cadastre-fr/src/cadastre_fr/Scale.java | 29 +
cadastre-fr/src/cadastre_fr/SimplifyWay.java | 128 +++
.../src/cadastre_fr/VectorImageModifier.java | 112 +++
cadastre-fr/src/cadastre_fr/WMSAdjustAction.java | 159
[josm-plugins] 104/369: debian/copyright updated
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 834d1632e7d53931d68215a46e85c02bbd75f13d Author: David Paleino da...@debian.org Date: Mon Dec 7 10:19:06 2009 +0100 debian/copyright updated --- debian/changelog | 3 ++- debian/copyright | 25 + 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45892ff..13100a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low - move package from Section java to utils, according to archive override - Vcs-* fields updated, package moved to Git + * debian/copyright updated [ Giovanni Mascellani ] * Updated to revision 18885 (synchronized with josm) @@ -19,7 +20,7 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low + lakewalker - Helps vectorizing WMS images + routing - Provides routing capabilities - -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Sun, 06 Dec 2009 21:21:06 +0100 + -- David Paleino da...@debian.org Mon, 07 Dec 2009 10:18:54 +0100 josm-plugins (0.0.svn18009-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 7eca090..f1588c5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -96,3 +96,28 @@ Copyright: © 2007 Tim Waters chippy2...@gmail.com © Petr Dlouhý petr.dlo...@email.cz © Nick Whitelegg nick.whitel...@solent.ac.uk License: GPL-2+ + +Files: cadastre-fr/* +Copyright: © 2008-2009 by Pieren pier...@gmail.com and others +License: GPL-2+ + +Files: DirectUpload/* +Copyright: © Subhodip Biswas +License: GPL-2+ + +Files: editgpx/* +Copyright: © 2008, Martin Garbe l...@running-sheep.com +License: GPL +X-Comment: some code in GPXLayerImportAction.java comes from + the measurement plugin by Raphael Mack +X-Note: FIXME! + +Files: lakewalker/* +Copyright: © 2000-2007, Rodney Kinney + © 2000-2007, Brent Easton +License: LGPL +X-Comment: which version? + +Files: routing/* +Copyright: © 2008, Innovant +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] 105/369: Added DON'T UPLOAD note
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 1a78a797c8c07d2fd62414e49bbf80ef9770d865 Author: David Paleino da...@debian.org Date: Mon Dec 7 10:20:03 2009 +0100 Added DON'T UPLOAD note --- debian/changelog | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 13100a7..338194f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low + ** DO NOT UPLOAD ** +There are some copyright issues. Mixed GPL and GPL-2 code being +released with GPL-3+ code. There's also an unversioned LGPL. +These should be cleared and fixed before upload. + [ David Paleino ] * debian/control: - added myself to Uploaders @@ -20,7 +25,7 @@ josm-plugins (0.0.svn18885-1) UNRELEASED; urgency=low + lakewalker - Helps vectorizing WMS images + routing - Provides routing capabilities - -- David Paleino da...@debian.org Mon, 07 Dec 2009 10:18:54 +0100 + -- David Paleino da...@debian.org Mon, 07 Dec 2009 10:19:10 +0100 josm-plugins (0.0.svn18009-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
