[DebianGIS-dev] r2601 - packages/josm-plugins/tags
Author: gmascellani-guest Date: 2009-11-09 14:22:57 + (Mon, 09 Nov 2009) New Revision: 2601 Added: packages/josm-plugins/tags/0.0.svn18009-1/ Log: Tagging 0.0.svn18009-1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2600 - packages/josm/tags
Author: gmascellani-guest Date: 2009-11-09 14:22:07 + (Mon, 09 Nov 2009) New Revision: 2600 Added: packages/josm/tags/0.0.svn2255-1/ Log: Tagging 0.0.svn2255-1 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2599 - packages/openstreetmap-map-icons/trunk/debian
Author: gmascellani-guest Date: 2009-11-07 10:10:34 + (Sat, 07 Nov 2009) New Revision: 2599 Added: packages/openstreetmap-map-icons/trunk/debian/README.Debian Log: README.Debian added Added: packages/openstreetmap-map-icons/trunk/debian/README.Debian === --- packages/openstreetmap-map-icons/trunk/debian/README.Debian (rev 0) +++ packages/openstreetmap-map-icons/trunk/debian/README.Debian 2009-11-07 10:10:34 UTC (rev 2599) @@ -0,0 +1,7 @@ +openstreetmap-map-icons +=== + +Some icons collections (japan and nickw) have been removed from the package +because of unclear license terms. + +-- Giovanni Mascellani ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2598 - packages/openstreetmap-map-icons/trunk/debian
Author: gmascellani-guest Date: 2009-11-07 10:08:33 + (Sat, 07 Nov 2009) New Revision: 2598 Modified: packages/openstreetmap-map-icons/trunk/debian/docs packages/openstreetmap-map-icons/trunk/debian/examples packages/openstreetmap-map-icons/trunk/debian/rules Log: Docs and examples generation updated Modified: packages/openstreetmap-map-icons/trunk/debian/docs === --- packages/openstreetmap-map-icons/trunk/debian/docs 2009-11-07 09:42:46 UTC (rev 2597) +++ packages/openstreetmap-map-icons/trunk/debian/docs 2009-11-07 10:08:33 UTC (rev 2598) @@ -1,4 +1,2 @@ README README.icons -overview.de.html -overview.en.html Modified: packages/openstreetmap-map-icons/trunk/debian/examples === --- packages/openstreetmap-map-icons/trunk/debian/examples 2009-11-07 09:42:46 UTC (rev 2597) +++ packages/openstreetmap-map-icons/trunk/debian/examples 2009-11-07 10:08:33 UTC (rev 2598) @@ -1,6 +1,5 @@ -create_osm.sh -create_osm.xslt -create_overview.pl +create_icons_index.pl +*.html +icons.dtd icons.xml -update_thumbnails.pl -merge-icons-all-from-svg2classic2square.sh +geoinfo.db Modified: packages/openstreetmap-map-icons/trunk/debian/rules === --- packages/openstreetmap-map-icons/trunk/debian/rules 2009-11-07 09:42:46 UTC (rev 2597) +++ packages/openstreetmap-map-icons/trunk/debian/rules 2009-11-07 10:08:33 UTC (rev 2598) @@ -37,12 +37,10 @@ dh_clean -k -i dh_installdirs -i dh_install -i - find $(CURDIR)/debian/openstreetmap-map-icons-classic/usr/share/icons/openstreetmap/ -type d -empty -delete - find $(CURDIR)/debian/openstreetmap-map-icons-scalable/usr/share/icons/openstreetmap/ -type d -empty -delete - find $(CURDIR)/debian/openstreetmap-map-icons-square/usr/share/icons/openstreetmap/ -type d -empty -delete - find $(CURDIR)/debian/openstreetmap-map-icons-classic/usr/share/icons/openstreetmap/ -type f | xargs chmod 644 - find $(CURDIR)/debian/openstreetmap-map-icons-scalable/usr/share/icons/openstreetmap/ -type f |xargs chmod 644 - find $(CURDIR)/debian/openstreetmap-map-icons-square/usr/share/icons/openstreetmap/ -type f | xargs chmod 644 + for i in classic scalable square ; do \ + find $(CURDIR)/debian/openstreetmap-map-icons-$$i/usr/share/icons/openstreetmap/ -type d -empty -delete ; \ + find $(CURDIR)/debian/openstreetmap-map-icons-$$i/usr/share/icons/openstreetmap/ -type f | xargs chmod 644 ; \ + done install-arch: @@ -52,6 +50,9 @@ dh_installchangelogs dh_installdocs dh_installexamples + for i in classic.small classic.big square.small square.big scalable ; do \ + dh_link usr/share/icons/openstreetmap/$$i usr/share/doc/openstreetmap-map-icons-classic/examples/$$i ; \ + done dh_compress dh_fixperms dh_installdeb ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2597 - packages/openstreetmap-map-icons/trunk/debian
Author: gmascellani-guest Date: 2009-11-07 09:42:46 + (Sat, 07 Nov 2009) New Revision: 2597 Added: packages/openstreetmap-map-icons/trunk/debian/docs packages/openstreetmap-map-icons/trunk/debian/examples Removed: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples Log: File name changed, in order to get them correctly used Copied: packages/openstreetmap-map-icons/trunk/debian/docs (from rev 2587, packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs) === --- packages/openstreetmap-map-icons/trunk/debian/docs (rev 0) +++ packages/openstreetmap-map-icons/trunk/debian/docs 2009-11-07 09:42:46 UTC (rev 2597) @@ -0,0 +1,4 @@ +README +README.icons +overview.de.html +overview.en.html Copied: packages/openstreetmap-map-icons/trunk/debian/examples (from rev 2587, packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples) === --- packages/openstreetmap-map-icons/trunk/debian/examples (rev 0) +++ packages/openstreetmap-map-icons/trunk/debian/examples 2009-11-07 09:42:46 UTC (rev 2597) @@ -0,0 +1,6 @@ +create_osm.sh +create_osm.xslt +create_overview.pl +icons.xml +update_thumbnails.pl +merge-icons-all-from-svg2classic2square.sh Deleted: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs 2009-11-07 09:41:26 UTC (rev 2596) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.docs 2009-11-07 09:42:46 UTC (rev 2597) @@ -1,4 +0,0 @@ -README -README.icons -overview.de.html -overview.en.html Deleted: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples 2009-11-07 09:41:26 UTC (rev 2596) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-common.examples 2009-11-07 09:42:46 UTC (rev 2597) @@ -1,6 +0,0 @@ -create_osm.sh -create_osm.xslt -create_overview.pl -icons.xml -update_thumbnails.pl -merge-icons-all-from-svg2classic2square.sh ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2596 - packages/openstreetmap-map-icons/trunk/debian
Author: gmascellani-guest Date: 2009-11-07 09:41:26 + (Sat, 07 Nov 2009) New Revision: 2596 Modified: packages/openstreetmap-map-icons/trunk/debian/control Log: Minor fix Modified: packages/openstreetmap-map-icons/trunk/debian/control === --- packages/openstreetmap-map-icons/trunk/debian/control 2009-11-07 09:40:40 UTC (rev 2595) +++ packages/openstreetmap-map-icons/trunk/debian/control 2009-11-07 09:41:26 UTC (rev 2596) @@ -2,7 +2,8 @@ Section: x11 Priority: optional Maintainer: Debian GIS Project -Uploaders: Andreas Putzo , Giovanni Mascellani +Uploaders: Andreas Putzo , + Giovanni Mascellani Build-Depends: debhelper (>= 5) Standards-Version: 3.8.3 Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2595 - packages/openstreetmap-map-icons/trunk/debian
Author: gmascellani-guest Date: 2009-11-07 09:40:40 + (Sat, 07 Nov 2009) New Revision: 2595 Added: packages/openstreetmap-map-icons/trunk/debian/watch Removed: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs Log: Minor fixes Deleted: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs 2009-11-06 23:59:42 UTC (rev 2594) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-classic.dirs 2009-11-07 09:40:40 UTC (rev 2595) @@ -1,2 +0,0 @@ -usr/share/icons/openstreetmap/classic.small -usr/share/icons/openstreetmap/classic.big Deleted: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs 2009-11-06 23:59:42 UTC (rev 2594) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-scalable.dirs 2009-11-07 09:40:40 UTC (rev 2595) @@ -1 +0,0 @@ -usr/share/icons/openstreetmap/scalable Deleted: packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs === --- packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs 2009-11-06 23:59:42 UTC (rev 2594) +++ packages/openstreetmap-map-icons/trunk/debian/openstreetmap-map-icons-square.dirs 2009-11-07 09:40:40 UTC (rev 2595) @@ -1,2 +0,0 @@ -usr/share/icons/openstreetmap/square.small -usr/share/icons/openstreetmap/square.big Added: packages/openstreetmap-map-icons/trunk/debian/watch === --- packages/openstreetmap-map-icons/trunk/debian/watch (rev 0) +++ packages/openstreetmap-map-icons/trunk/debian/watch 2009-11-07 09:40:40 UTC (rev 2595) @@ -0,0 +1 @@ +# Watch file missing, because upstream doesn't make official releases. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2584 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-11-05 23:52:44 + (Thu, 05 Nov 2009) New Revision: 2584 Added: packages/josm-plugins/trunk/debian/README.source Modified: packages/josm-plugins/trunk/debian/changelog Log: Releasing and adding README.source Added: packages/josm-plugins/trunk/debian/README.source === --- packages/josm-plugins/trunk/debian/README.source (rev 0) +++ packages/josm-plugins/trunk/debian/README.source2009-11-05 23:52:44 UTC (rev 2584) @@ -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. Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-11-05 23:49:47 UTC (rev 2583) +++ packages/josm-plugins/trunk/debian/changelog2009-11-05 23:52:44 UTC (rev 2584) @@ -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 @@ * 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 Fri, 06 Nov 2009 00:47:04 +0100 + -- Giovanni Mascellani Fri, 06 Nov 2009 00:52:03 +0100 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2583 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-11-05 23:49:47 + (Thu, 05 Nov 2009) New Revision: 2583 Modified: packages/josm-plugins/trunk/debian/changelog Log: Coming back a few versions (too recent releases are incompatible with josm) Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-11-05 23:44:43 UTC (rev 2582) +++ packages/josm-plugins/trunk/debian/changelog2009-11-05 23:49:47 UTC (rev 2583) @@ -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 @@ * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani Mon, 14 Sep 2009 16:05:56 +0200 + -- Giovanni Mascellani Fri, 06 Nov 2009 00:47:04 +0100 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2582 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-11-05 23:44:43 + (Thu, 05 Nov 2009) New Revision: 2582 Modified: packages/josm/trunk/debian/changelog Log: Releasing Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-11-05 23:34:41 UTC (rev 2581) +++ packages/josm/trunk/debian/changelog2009-11-05 23:44:43 UTC (rev 2582) @@ -1,4 +1,4 @@ -josm (0.0.svn2255-1) UNRELEASED; urgency=low +josm (0.0.svn2255-1) unstable; urgency=low [ Giovanni Mascellani ] * New upstream release (closes: #542653, #541326) @@ -14,7 +14,7 @@ * Removed OSM homepage in long description. * Section set to `java'. - -- Giovanni Mascellani Fri, 06 Nov 2009 00:04:00 +0100 + -- Giovanni Mascellani Fri, 06 Nov 2009 00:44:28 +0100 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2581 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-11-05 23:34:41 + (Thu, 05 Nov 2009)
New Revision: 2581
Modified:
packages/josm/trunk/debian/copyright
Log:
copyright updated
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-11-05 23:07:33 UTC (rev
2580)
+++ packages/josm/trunk/debian/copyright2009-11-05 23:34:41 UTC (rev
2581)
@@ -20,13 +20,14 @@
Copyright (c) 2008-2009 Dirk Stöcker
Copyright (c) 2008-2009 Stefan Breunig
Copyright (c) 2008-2009 Karl Guggisberg
+ Copyright (c) 2008 Jan Peter Stotz
License: GPL-3+
Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux
systems, the complete text of the GNU General Public License Version 3 can be
found in `/usr/share/common-licenses/GPL-3'.
-Files: src/org/openstreetmap/gui/*
-Copyright: Copyright (c) 2008 Jan Peter Stotz
+Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+Copyright: Copyright (c) 2009 Stefan Zeller
License: GPL-3+
File: src/org/apache/*
@@ -155,7 +156,10 @@
up with any other open source license - just use it. You can rename
the files, move the Java packages, whatever you want.
-Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
+Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java,
+ src/org/openstreetmap/josm/gui/download/OsmMapControl.java,
+ src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java,
+ src/org/openstreetmap/josm/gui/download/SizeButton.java
Copyright: Copyright (c) 2007 Tim Haussmann
License: GPL-3+
@@ -170,10 +174,15 @@
Copyright: Copyright (c) 2008, Henrik Niehaus
License: BSD
-Files: src/org/openstreetmap/josm/tools/CopyList.java
+Files: src/org/openstreetmap/josm/tools/CopyList.java,
+ src/org/openstreetmap/josm/tools/DateUtils.java
Copyright: Copyright (c) 2008 Petr Nejedly
-License: GPL-2+
+License: GPL-3+
+Files: src/org/openstreetmap/josm/data/coor/QuadTiling.java
+Copyright: Copyright (c) 2009 Dave Hansen
+License: GPL-3+
+
Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
License: GPL-3+
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2580 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-11-05 23:07:33 + (Thu, 05 Nov 2009) New Revision: 2580 Modified: packages/josm-plugins/trunk/debian/control Log: Updated my name ;-) Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-11-05 23:06:53 UTC (rev 2579) +++ packages/josm-plugins/trunk/debian/control 2009-11-05 23:07:33 UTC (rev 2580) @@ -2,7 +2,7 @@ Section: utils Priority: extra Maintainer: Debian GIS Project -Uploaders: Giovanni Mascellani , Andreas Putzo +Uploaders: Giovanni Mascellani , Andreas Putzo Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, josm (>= 0.0.svn2255), libmetadata-extractor-java Build-Conflicts: josm (>= 0.0.svn2256) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2579 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-11-05 23:06:53 + (Thu, 05 Nov 2009)
New Revision: 2579
Modified:
packages/josm-plugins/trunk/debian/changelog
packages/josm-plugins/trunk/debian/control
Log:
Updated for new josm
Modified: packages/josm-plugins/trunk/debian/changelog
===
--- packages/josm-plugins/trunk/debian/changelog2009-11-05 23:04:28 UTC
(rev 2578)
+++ packages/josm-plugins/trunk/debian/changelog2009-11-05 23:06:53 UTC
(rev 2579)
@@ -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
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-11-05 23:04:28 UTC (rev
2578)
+++ packages/josm-plugins/trunk/debian/control 2009-11-05 23:06:53 UTC (rev
2579)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
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 @@
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.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2578 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-11-05 23:04:28 + (Thu, 05 Nov 2009) New Revision: 2578 Modified: packages/josm/trunk/debian/changelog Log: Updated my name ;-) Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-11-05 22:55:16 UTC (rev 2577) +++ packages/josm/trunk/debian/changelog2009-11-05 23:04:28 UTC (rev 2578) @@ -14,7 +14,7 @@ * Removed OSM homepage in long description. * Section set to `java'. - -- Giovanni Mascellani Sun, 11 Oct 2009 18:20:55 +0200 + -- Giovanni Mascellani Fri, 06 Nov 2009 00:04:00 +0100 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2577 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-11-05 22:55:16 + (Thu, 05 Nov 2009)
New Revision: 2577
Modified:
packages/josm/trunk/debian/control
Log:
Small fixed in control
Modified: packages/josm/trunk/debian/control
===
--- packages/josm/trunk/debian/control 2009-11-04 21:05:32 UTC (rev 2576)
+++ packages/josm/trunk/debian/control 2009-11-05 22:55:16 UTC (rev 2577)
@@ -2,9 +2,9 @@
Section: java
Priority: extra
Maintainer: Debian GIS Project
-Uploaders: Andreas Putzo , Giovanni Mascellani
, Petter Reinholdtsen
+Uploaders: Andreas Putzo , Giovanni Mascellani
, Petter Reinholdtsen
DM-Upload-Allowed: yes
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, openjdk-6-jdk,
libgettext-commons-java, libmetadata-extractor-java
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, default-jdk,
libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java
Standards-Version: 3.8.3
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/
@@ -12,7 +12,7 @@
Package: josm
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre,
libgettext-commons-java, libmetadata-extractor-java,
openstreetmap-map-icons-classic, ${misc:Depends}
+Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre,
libgettext-commons-java (>= 0.9.6), libmetadata-extractor-java,
openstreetmap-map-icons-classic, ${misc:Depends}
Recommends: josm-plugins
Description: Editor for OpenStreetMap
JOSM is an editor for OpenStreetMap (OSM) written in Java.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2543 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-10-11 16:21:15 + (Sun, 11 Oct 2009) New Revision: 2543 Modified: packages/josm/trunk/debian/changelog Log: Fixing changelog Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-10-11 16:20:11 UTC (rev 2542) +++ packages/josm/trunk/debian/changelog2009-10-11 16:21:15 UTC (rev 2543) @@ -1,5 +1,6 @@ josm (0.0.svn2255-1) UNRELEASED; urgency=low + [ Giovanni Mascellani ] * New upstream release (closes: #542653, #541326) * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). Thanks to Ross Burton for the report. @@ -13,7 +14,7 @@ * Removed OSM homepage in long description. * Section set to `java'. - -- Francesco Paolo Lovergine Thu, 08 Oct 2009 11:57:44 +0200 + -- Giovanni Mascellani Sun, 11 Oct 2009 18:20:55 +0200 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2542 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-10-11 16:20:11 + (Sun, 11 Oct 2009) New Revision: 2542 Added: packages/josm/tarballs/josm_0.0.svn2255.orig.tar.gz Log: Upstream tarball revision 2255 Added: packages/josm/tarballs/josm_0.0.svn2255.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn2255.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2541 - in packages/josm/trunk/debian: . patches
Author: gmascellani-guest
Date: 2009-10-11 16:19:39 + (Sun, 11 Oct 2009)
New Revision: 2541
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/copyright
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Packaging new release
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-10-09 09:54:53 UTC (rev
2540)
+++ packages/josm/trunk/debian/changelog2009-10-11 16:19:39 UTC (rev
2541)
@@ -1,9 +1,6 @@
-josm (0.0.svn1981-1) UNRELEASED; urgency=low
+josm (0.0.svn2255-1) UNRELEASED; urgency=low
- [ David Paleino ]
* New upstream release (closes: #542653, #541326)
-
- [ Giovanni Mascellani ]
* debian/josm.sh: wrong java executable path for java 1.5.0 (closes:
#525020).
Thanks to Ross Burton for the report.
* debian/josm.sh: use java alternative if known to work (closes: #521125).
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-10-09 09:54:53 UTC (rev
2540)
+++ packages/josm/trunk/debian/copyright2009-10-11 16:19:39 UTC (rev
2541)
@@ -159,6 +159,17 @@
Copyright: Copyright (c) 2007 Tim Haussmann
License: GPL-3+
+Files: src/org/openstreetmap/josm/gui/MultiSplitLayout.java,
+ src/org/openstreetmap/josm/gui/MultiSplitPane.java
+Copyright: Copyright 2004 Sun Microsystems, Inc., 4150 Network Circle,
+ Santa Clara, California 95054, U.S.A.
+License: LGPL-2.1+
+
+Files: src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java,
+ src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java
+Copyright: Copyright (c) 2008, Henrik Niehaus
+License: BSD
+
Files: src/org/openstreetmap/josm/tools/CopyList.java
Copyright: Copyright (c) 2008 Petr Nejedly
License: GPL-2+
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-10-09 09:54:53 UTC
(rev 2540)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-10-11 16:19:39 UTC
(rev 2541)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-08-02
14:36:40.0 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-09-14
15:42:51.0 +0200
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-09-08
22:56:02.0 +0200
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-10-11
18:05:24.0 +0200
@@ -49,6 +49,7 @@
public class AboutAction extends JosmAction {
@@ -46,20 +46,20 @@
about.addTab(tr("Info"), info);
about.addTab(tr("Readme"), createScrollPane(readme));
diff -urNad
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-08-02 18:54:11.0 +0200
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-09-14 15:49:59.0 +0200
-@@ -53,8 +53,8 @@
+--- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-08-30 19:07:24.0 +0200
trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-10-11 18:06:37.0 +0200
+@@ -52,8 +52,8 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report
Bug")};
- int answer = OptionPaneUtil.showOptionDialog(Main.parent, tr("An
unexpected exception occurred.\n\n" +
+ int answer = JOptionPane.showOptionDialog(Main.parent, tr("An
unexpected exception occurred.\n\n" +
-"This is always a coding error. If you are running the
latest\n" +
-"version of JOSM, please consider being kind and file a bug
report."),
+"Please consider being kind and file a bug report.\n" +
+"See http://bugs.debian.org for a guide how to do this."),
- tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE,
+ tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE,null,
options, options[0]);
if (answer == 1) {
-@@ -66,10 +66,10 @@
+@@ -65,10 +65,10 @@
+ stack.getBuffer().toString();
JPanel p = new JPanel(new GridBagLayout());
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2451 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-09-14 14:45:14 + (Mon, 14 Sep 2009) New Revision: 2451 Modified: packages/josm/trunk/debian/changelog Log: Changelog updated Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-09-14 14:44:03 UTC (rev 2450) +++ packages/josm/trunk/debian/changelog2009-09-14 14:45:14 UTC (rev 2451) @@ -2,8 +2,6 @@ [ David Paleino ] * New upstream release (closes: #542653, #541326) - * debian/patches/: -- 10_build.dpatch updated, mostly integrated upstream [ Giovanni Mascellani ] * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). @@ -11,8 +9,10 @@ * debian/josm.sh: use java alternative if known to work (closes: #521125). * Plugin list update fixed (closes: #532742) * Policy version bumbed to 3.8.3 (no changes required) + * Patches updated for new release + * debian/copyright updated - -- David Paleino Sat, 12 Sep 2009 00:01:57 +0200 + -- Giovanni Mascellani Mon, 14 Sep 2009 16:44:14 +0200 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2450 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-09-14 14:44:03 + (Mon, 14 Sep 2009)
New Revision: 2450
Modified:
packages/josm/trunk/debian/copyright
Log:
Copyright updated
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-09-14 14:33:16 UTC (rev
2449)
+++ packages/josm/trunk/debian/copyright2009-09-14 14:44:03 UTC (rev
2450)
@@ -12,11 +12,14 @@
Files: *
Copyright: Copyright (c) 2005-2008 Immanuel Scholz
- Copyright (c) 2007-2008 Frederik Ramm
- Copyright (c) 2007-2008 Gabriel Ebner
- Copyright (c) 2007-2008 David Earl
- Copyright (c) 2007-2008 Ulf Lamping
- Copyright (c) 2007-2008 Raphael Mack
+ Copyright (c) 2007-2009 Frederik Ramm
+ Copyright (c) 2007-2009 Gabriel Ebner
+ Copyright (c) 2007-2009 David Earl
+ Copyright (c) 2007-2009 Ulf Lamping
+ Copyright (c) 2007-2009 Raphael Mack
+ Copyright (c) 2008-2009 Dirk Stöcker
+ Copyright (c) 2008-2009 Stefan Breunig
+ Copyright (c) 2008-2009 Karl Guggisberg
License: GPL-3+
Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux
systems, the complete text of the GNU General Public License Version 3 can be
@@ -156,6 +159,10 @@
Copyright: Copyright (c) 2007 Tim Haussmann
License: GPL-3+
+Files: src/org/openstreetmap/josm/tools/CopyList.java
+Copyright: Copyright (c) 2008 Petr Nejedly
+License: GPL-2+
+
Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
License: GPL-3+
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2449 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-09-14 14:33:16 + (Mon, 14 Sep 2009) New Revision: 2449 Modified: packages/josm-plugins/trunk/debian/copyright Log: Copyright updated Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-09-14 14:29:26 UTC (rev 2448) +++ packages/josm-plugins/trunk/debian/copyright2009-09-14 14:33:16 UTC (rev 2449) @@ -60,6 +60,7 @@ Copyright: © 2007 Francisco R. Santos © 2007 Joerg Ostertag © 2007,2008 Gabriel Ebner + © 2007 Immanuel Scholz License: GPL-2 Files: validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2448 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-09-14 14:29:26 + (Mon, 14 Sep 2009) New Revision: 2448 Modified: packages/josm-plugins/trunk/debian/changelog Log: Sorry, got a not working revision before. Updating changelog Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-09-14 14:14:37 UTC (rev 2447) +++ packages/josm-plugins/trunk/debian/changelog2009-09-14 14:29:26 UTC (rev 2448) @@ -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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2447 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-09-14 14:14:37 + (Mon, 14 Sep 2009)
New Revision: 2447
Modified:
packages/josm-plugins/trunk/debian/control
Log:
Josm dependency updated
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-09-14 14:13:22 UTC (rev
2446)
+++ packages/josm-plugins/trunk/debian/control 2009-09-14 14:14:37 UTC (rev
2447)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
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 @@
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.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2446 - in packages/josm-plugins/trunk/debian: . patches
Author: gmascellani-guest
Date: 2009-09-14 14:13:22 + (Mon, 14 Sep 2009)
New Revision: 2446
Modified:
packages/josm-plugins/trunk/debian/changelog
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Log:
Patched updated to latest revision
Modified: packages/josm-plugins/trunk/debian/changelog
===
--- packages/josm-plugins/trunk/debian/changelog2009-09-14 13:56:51 UTC
(rev 2445)
+++ packages/josm-plugins/trunk/debian/changelog2009-09-14 14:13:22 UTC
(rev 2446)
@@ -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 @@
[ 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 Fri, 11 Sep 2009 11:09:49
+0200
+ -- Giovanni Mascellani Mon, 14 Sep 2009 16:05:56
+0200
josm-plugins (0.0.0.20080518-1) unstable; urgency=low
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-09-14 13:56:51 UTC (rev 2445)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-09-14 14:13:22 UTC (rev 2446)
@@ -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 @@
Modified: packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-09-14 13:56:51 UTC (rev 2445)
+++ packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
2009-09-14 14:13:22 UTC (rev 2446)
@@ -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 @@
-
+
+
-
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2445 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-09-14 13:56:51 + (Mon, 14 Sep 2009)
New Revision: 2445
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Patch updated for latest revision
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-14 13:52:01 UTC
(rev 2444)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-14 13:56:51 UTC
(rev 2445)
@@ -1,18 +1,149 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_build.dpatch by Andreas Putzo
##
-## DP: Adjustments to the ant build file, mainly to not include
+## DP: Adjustments to the ant build file, mainly to not include
## DP: the dependencies into the target jar file.
@DPATCH@
-diff -urNad josm-0.0.svn1981~/build.xml josm-0.0.svn1981/build.xml
josm-0.0.svn1981~/build.xml2009-09-11 23:56:17.0 +0200
-+++ josm-0.0.svn1981/build.xml 2009-09-11 23:59:21.0 +0200
-@@ -68,6 +68,7 @@
-
-
-
-+
-
+diff -urNad trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2009-08-09 22:43:59.0 +0200
trunk/build.xml2009-09-14 15:42:24.0 +0200
+@@ -4,47 +4,40 @@
+
+
+
+-
+-
+-
++
++
++
++
+
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+-
+
+
+
+
+
+-
++
++
++
+
+
+-
++
++
++
+
+
+-
+
+
+
+
+-
++
++
++
+
+
+
+-
+-
+-
+-
+-
+
+
+
+@@ -67,7 +60,8 @@
+ target="1.5" source="1.5" debug="on"
encoding="UTF-8">
+
+
+-
++
++
+
+
+
+@@ -77,7 +71,8 @@
+
+
+
+-
++
++
+
+
+
+diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
+--- trunk~/i18n/build.xml 2009-07-09 10:54:34.0 +0200
trunk/i18n/build.xml 2009-09-14 15:42:24.0 +0200
+@@ -58,10 +58,14 @@
+
+
-
+-
+-
++
++
++
++
++
+
+-
++
++
+
+
+@@ -93,10 +97,13 @@
+
+
+
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -124,6 +138,7 @@
+
+
+
++
+
+
+
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-09-14 13:52:01 UTC
(rev 2444)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-09-14 13:56:51 UTC
(rev 2445)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-09
10:53:33.0 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-17
14:23:15.0 +0200
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-08-02
14:36:40.0 +0200
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-09-14
15:42:51.0 +0200
@@ -49,6 +49,7 @@
public class AboutAction extends JosmAction {
@@ -16,7 +16,7 @@
private final static JTextArea revision;
private static String time;
-@@ -71,6 +72,10 @@
+@@ -72,6 +73,10 @@
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
@@ -27,7 +27,7 @@
Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
match = timePattern.matcher(revision.getText());
time = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -134,6 +139,8 @@
+@@ -136,6 +141,8 @@
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr
[DebianGIS-dev] r2426 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-09-11 09:10:25 + (Fri, 11 Sep 2009) New Revision: 2426 Modified: packages/josm-plugins/trunk/debian/changelog packages/josm-plugins/trunk/debian/control Log: Bump to 3.8.3 Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-09-11 09:09:37 UTC (rev 2425) +++ packages/josm-plugins/trunk/debian/changelog2009-09-11 09:10:25 UTC (rev 2426) @@ -18,14 +18,14 @@ * 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 Thu, 13 Aug 2009 13:57:57 +0200 + -- Giovanni Mascellani Fri, 11 Sep 2009 11:09:49 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-09-11 09:09:37 UTC (rev 2425) +++ packages/josm-plugins/trunk/debian/control 2009-09-11 09:10:25 UTC (rev 2426) @@ -6,7 +6,7 @@ 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/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2425 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-09-11 09:09:37 + (Fri, 11 Sep 2009) New Revision: 2425 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/control Log: Bump to 3.8.3 Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-09-11 08:31:15 UTC (rev 2424) +++ packages/josm/trunk/debian/changelog2009-09-11 09:09:37 UTC (rev 2425) @@ -5,9 +5,9 @@ Thanks to Ross Burton for the report. * debian/josm.sh: use java alternative if known to work (closes: #521125). * Plugin list update fixed (closes: #532742) - * Policy version bumbed to 3.8.2 (no changes required) + * Policy version bumbed to 3.8.3 (no changes required) - -- Giovanni Mascellani Thu, 20 Aug 2009 19:20:10 +0200 + -- Giovanni Mascellani Fri, 11 Sep 2009 11:09:14 +0200 josm (0.0.svn1529-1) unstable; urgency=low Modified: packages/josm/trunk/debian/control === --- packages/josm/trunk/debian/control 2009-09-11 08:31:15 UTC (rev 2424) +++ packages/josm/trunk/debian/control 2009-09-11 09:09:37 UTC (rev 2425) @@ -5,7 +5,7 @@ Uploaders: Andreas Putzo , Giovanni Mascellani , Petter Reinholdtsen DM-Upload-Allowed: yes Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java -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/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2399 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-08-20 17:31:31 + (Thu, 20 Aug 2009) New Revision: 2399 Modified: packages/josm/trunk/debian/changelog Log: New upstream version Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-08-13 12:06:48 UTC (rev 2398) +++ packages/josm/trunk/debian/changelog2009-08-20 17:31:31 UTC (rev 2399) @@ -1,13 +1,13 @@ josm (0.0.svn1788-1) UNRELEASED; urgency=low - * New upstream release + * New upstream release (closes: #542653, #541326) * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). Thanks to Ross Burton for the report. * debian/josm.sh: use java alternative if known to work (closes: #521125). * Plugin list update fixed (closes: #532742) * Policy version bumbed to 3.8.2 (no changes required) - -- Giovanni Mascellani Tue, 11 Aug 2009 16:05:24 +0200 + -- Giovanni Mascellani Thu, 20 Aug 2009 19:20:10 +0200 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2398 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-08-13 12:06:48 + (Thu, 13 Aug 2009) New Revision: 2398 Modified: packages/josm-plugins/trunk/debian/changelog Log: FTBFS should be fixed Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-08-11 14:17:16 UTC (rev 2397) +++ packages/josm-plugins/trunk/debian/changelog2009-08-13 12:06:48 UTC (rev 2398) @@ -17,7 +17,7 @@ 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 @@ * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani Tue, 11 Aug 2009 16:11:47 +0200 + -- Giovanni Mascellani Thu, 13 Aug 2009 13:57:57 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2397 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-08-11 14:17:16 + (Tue, 11 Aug 2009) New Revision: 2397 Modified: packages/josm-plugins/trunk/debian/changelog packages/josm-plugins/trunk/debian/control Log: Policy to 3.8.2 Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-08-11 14:11:19 UTC (rev 2396) +++ packages/josm-plugins/trunk/debian/changelog2009-08-11 14:17:16 UTC (rev 2397) @@ -17,14 +17,15 @@ 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 Wed, 15 Jul 2009 21:11:36 +0200 + -- Giovanni Mascellani Tue, 11 Aug 2009 16:11:47 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-08-11 14:11:19 UTC (rev 2396) +++ packages/josm-plugins/trunk/debian/control 2009-08-11 14:17:16 UTC (rev 2397) @@ -6,7 +6,7 @@ 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/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2396 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-08-11 14:11:19 + (Tue, 11 Aug 2009) New Revision: 2396 Modified: packages/josm/trunk/debian/changelog packages/josm/trunk/debian/control Log: Policy bumped to 3.8.2 Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-08-11 14:03:59 UTC (rev 2395) +++ packages/josm/trunk/debian/changelog2009-08-11 14:11:19 UTC (rev 2396) @@ -5,8 +5,9 @@ Thanks to Ross Burton for the report. * debian/josm.sh: use java alternative if known to work (closes: #521125). * Plugin list update fixed (closes: #532742) + * Policy version bumbed to 3.8.2 (no changes required) - -- Giovanni Mascellani Wed, 15 Jul 2009 19:21:54 +0200 + -- Giovanni Mascellani Tue, 11 Aug 2009 16:05:24 +0200 josm (0.0.svn1529-1) unstable; urgency=low Modified: packages/josm/trunk/debian/control === --- packages/josm/trunk/debian/control 2009-08-11 14:03:59 UTC (rev 2395) +++ packages/josm/trunk/debian/control 2009-08-11 14:11:19 UTC (rev 2396) @@ -5,7 +5,7 @@ Uploaders: Andreas Putzo , Giovanni Mascellani , Petter Reinholdtsen DM-Upload-Allowed: yes Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), gettext, openjdk-6-jdk, libgettext-commons-java, libmetadata-extractor-java -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/josm/ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2395 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-08-11 14:03:59 + (Tue, 11 Aug 2009)
New Revision: 2395
Modified:
packages/josm/trunk/debian/copyright
Log:
debian/copyright updated, after having cleared out upstream that JOSM as a whole
can be considered under GPL-3+
Modified: packages/josm/trunk/debian/copyright
===
--- packages/josm/trunk/debian/copyright2009-08-09 08:28:25 UTC (rev
2394)
+++ packages/josm/trunk/debian/copyright2009-08-11 14:03:59 UTC (rev
2395)
@@ -17,14 +17,14 @@
Copyright (c) 2007-2008 David Earl
Copyright (c) 2007-2008 Ulf Lamping
Copyright (c) 2007-2008 Raphael Mack
-License: GPL-2+
+License: GPL-3+
Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux
- systems, the complete text of the GNU General Public License Version 2 can be
- found in `/usr/share/common-licenses/GPL-2'.
+ systems, the complete text of the GNU General Public License Version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
Files: src/org/openstreetmap/gui/*
Copyright: Copyright (c) 2008 Jan Peter Stotz
-License: GPL-2
+License: GPL-3+
File: src/org/apache/*
Copyright: Copyright 2000-2008 Apache Foundation
@@ -54,10 +54,10 @@
Copyright: Copyright (c) 2007-2009 Andreas Putzo
Copyright (c) 2008 Petter Reinholdtsen
Copyright (c) 2008-2009 Giovanni Mascellani
-License: GPL-2+
+License: GPL-3+
The Debian packaging information is under the GPL, version 2 or later. On
Debian GNU/Linux systems, the complete text of the GNU General Public License
- Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
Copyright: Copyright (c) 1994-2007 Sun Microsystems, Inc.
@@ -123,23 +123,23 @@
src/org/openstreetmap/josm/data/projection/LambertEST.java
src/org/openstreetmap/josm/data/projection/Lambert.java
Copyright: Copyright (c) 2002 Johan Montagnat
-License: GPL-2
+License: GPL-3+
Files: src/org/openstreetmap/josm/io/NmeaReader.java
Copyright: Copyright (c) 2008 Christoph Brill
-License: GPL-2
+License: GPL-3+
Files: src/org/openstreetmap/josm/data/osm/Changeset.java
Copyright: Copyright (c) 2007 Martijn van Oosterhout
-License: GPL-2
+License: GPL-3+
Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
Copyright: Copyright (c) 2007 David Hansen
-License: GPL-2
+License: GPL-3+
Files: src/org/openstreetmap/josm/gui/ScrollViewport.java
Copyright: Copyright (c) 2007 Christian Gallioz
-License: GPL-2
+License: GPL-3+
Files: src/org/openstreetmap/josm/gui/FileDrop.java
License: PD
@@ -154,37 +154,45 @@
Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
Copyright: Copyright (c) 2007 Tim Haussmann
-License: GPL-2
+License: GPL-3+
-Files: i18n/po/{ar,bg,cs,da,el,es,fi,he,is,ja,nl,ru,sk,sl,sv}.po
+Files: i18n/po/{ar,bg,cs,da,el,es,et,fi,gl,he,is,ja,nb,nl,ro,ru,sk,sl,sv}.po
Copyright: Copyright (c) 2009 Rosetta Contributers and Canonical Ltd 2009
-License: GPL-2
+License: GPL-3+
+ This file is distributed under the same license as the josm package.
Files: i18n/po/de.po
Copyright: Copyright (c) 2006,2007 Sven Anders
Copyright (c) 2008 Matthias Merz
Copyright (c) 2008, 2009 Dirk Stöcker
-License: GPL-2
+License: GPL-3+
Files: i18n/po/en_GB.po
Copyright: Copyright (c) 2006 Immanuel Scholz
-License: GPL-2
+License: GPL-3+
+ This file is distributed under the same license as the josm package.
Files: i18n/po/fr.po
Copyright: Copyright (c) 2006 Frederic Bonifas
-License: GPL-2
+License: GPL-3+
Files: i18n/po/it.po
Copyright: Copyright (c) 2009 Davide Prade and others
-License: GPL-2
+License: GPL-3+
Files: i18n/po/pl.po
Copyright: Copyright (c) 2008 PAWEŁ MADEJ
Copyright (c) 2008 Nabuchodonozor
Copyright (c) 2008 MARCIN FLORYAN
-License: GPL-2
+License: GPL-3+
Files: i18n/po/tr.po
Copyright: Copyright (c) 2009 ikinokta
Copyright (c) 2009 Cezmi Topaloğlu
-License: GPL-2
+License: GPL-3+
+
+Files: i18n/po/zh_TW.po
+Copyright: Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+ Copyright (c) 2009 Chao-Hsiung Liao
+License: GPL-3+
+ This file is distributed under the same license as the josm package.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2376 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-07-17 13:56:59 + (Fri, 17 Jul 2009)
New Revision: 2376
Modified:
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Log:
Advances to latest upstream revision
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-07-17 13:56:31 UTC (rev 2375)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-07-17 13:56:59 UTC (rev 2376)
@@ -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 @@
@@ -18,35 +30,3 @@
-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();
Modified: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-07-17 13:56:31 UTC (rev 2375)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-07-17 13:56:59 UTC (rev 2376)
@@ -17,87 +17,3 @@
-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.vis
[DebianGIS-dev] r2375 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-07-17 13:56:31 + (Fri, 17 Jul 2009)
New Revision: 2375
Modified:
packages/josm-plugins/trunk/debian/control
Log:
Dependencies set to latest josm revision
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-07-17 13:42:03 UTC (rev
2374)
+++ packages/josm-plugins/trunk/debian/control 2009-07-17 13:56:31 UTC (rev
2375)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
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 @@
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.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2374 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-07-17 13:42:03 + (Fri, 17 Jul 2009) New Revision: 2374 Modified: packages/josm/trunk/debian/copyright Log: New copyright info Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-07-17 13:25:26 UTC (rev 2373) +++ packages/josm/trunk/debian/copyright2009-07-17 13:42:03 UTC (rev 2374) @@ -26,6 +26,30 @@ Copyright: Copyright (c) 2008 Jan Peter Stotz License: GPL-2 +File: src/org/apache/* +Copyright: Copyright 2000-2008 Apache Foundation +License: Apache-2.0 + This file has been taken from the ANT project. The original license + follows. + . + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems the full test of the Apache 2.0 license can be found + in the `/usr/share/common-licenses/Apache-2.0' file. + Files: debian/* Copyright: Copyright (c) 2007-2009 Andreas Putzo Copyright (c) 2008 Petter Reinholdtsen ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2373 - packages/josm-plugins/tarballs
Author: gmascellani-guest Date: 2009-07-17 13:25:26 + (Fri, 17 Jul 2009) New Revision: 2373 Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn16517.orig.tar.gz Modified: packages/josm-plugins/tarballs/josm-plugins_0.0.svn13741.orig.tar.gz Log: josm-plugins latest revision Modified: packages/josm-plugins/tarballs/josm-plugins_0.0.svn13741.orig.tar.gz === (Binary files differ) Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn16517.orig.tar.gz === (Binary files differ) Property changes on: packages/josm-plugins/tarballs/josm-plugins_0.0.svn16517.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2372 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-07-17 13:21:58 + (Fri, 17 Jul 2009) New Revision: 2372 Modified: packages/josm/trunk/debian/changelog Log: Changelog updated Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-07-17 12:29:50 UTC (rev 2371) +++ packages/josm/trunk/debian/changelog2009-07-17 13:21:58 UTC (rev 2372) @@ -1,9 +1,10 @@ -josm (0.0.svn1788-1) unstable; urgency=low +josm (0.0.svn1788-1) UNRELEASED; urgency=low * New upstream release * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). Thanks to Ross Burton for the report. * debian/josm.sh: use java alternative if known to work (closes: #521125). + * Plugin list update fixed (closes: #532742) -- Giovanni Mascellani Wed, 15 Jul 2009 19:21:54 +0200 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2371 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-07-17 12:29:50 + (Fri, 17 Jul 2009)
New Revision: 2371
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Patches moved to latest upstream revision (problem fixed)
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-16 13:01:23 UTC
(rev 2370)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-17 12:29:50 UTC
(rev 2371)
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad trunk~/build.xml trunk/build.xml
--- trunk~/build.xml 2009-07-08 22:06:58.0 +0200
-+++ trunk/build.xml2009-07-15 21:04:28.0 +0200
-@@ -4,47 +4,41 @@
trunk/build.xml2009-07-17 14:22:54.0 +0200
+@@ -4,47 +4,40 @@
@@ -59,20 +59,17 @@
+
+
--
--
+
+
-
-
-
-
-
-+
-+
-+
-@@ -66,7 +60,8 @@
+@@ -66,7 +59,8 @@
@@ -82,7 +79,7 @@
-@@ -76,7 +71,8 @@
+@@ -76,7 +70,8 @@
@@ -94,7 +91,7 @@
diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
--- trunk~/i18n/build.xml 2009-07-09 10:54:34.0 +0200
-+++ trunk/i18n/build.xml 2009-07-15 21:04:02.0 +0200
trunk/i18n/build.xml 2009-07-17 14:22:41.0 +0200
@@ -58,10 +58,14 @@
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-07-16 13:01:23 UTC
(rev 2370)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-07-17 12:29:50 UTC
(rev 2371)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-05-18
19:47:22.0 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-11
15:38:55.0 +0200
-@@ -48,6 +48,7 @@
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-09
10:53:33.0 +0200
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-17
14:23:15.0 +0200
+@@ -49,6 +49,7 @@
public class AboutAction extends JosmAction {
private static final String version;
@@ -16,7 +16,7 @@
private final static JTextArea revision;
private static String time;
-@@ -70,6 +71,10 @@
+@@ -71,6 +72,10 @@
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
@@ -27,7 +27,7 @@
Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
match = timePattern.matcher(revision.getText());
time = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -133,6 +138,8 @@
+@@ -134,6 +139,8 @@
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Version {0}",version)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
@@ -36,7 +36,7 @@
info.add(new JLabel(tr("Last change at {0}",time)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Java Version
{0}",System.getProperty("java.version"))),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -140,7 +147,7 @@
+@@ -141,7 +148,7 @@
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
info.add(new UrlLabel("http://josm.openstreetmap.de";),
GBC.eol().fill(GBC.HORIZONTAL));
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
@@ -46,9 +46,9 @@
about.addTab(tr("Info"), info);
about.addTab(tr("Readme"), createScrollPane(readme));
diff -urNad
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-02-16 15:14:34.0 +0100
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-07-11 15:38:55.0 +0200
-@@ -49,8 +49,8 @@
+--- trunk~/src
[DebianGIS-dev] r2362 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2009-07-15 19:11:02 + (Wed, 15 Jul 2009) New Revision: 2362 Modified: packages/josm/trunk/debian/patches/10_build.dpatch packages/josm/trunk/debian/patches/20_bts.dpatch packages/josm/trunk/debian/patches/40_elemstyles.dpatch Log: Patches update for new release (bugs still to fix are present) Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-15 19:07:33 UTC (rev 2361) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-15 19:11:02 UTC (rev 2362) @@ -6,96 +6,95 @@ @DPATCH@ diff -urNad trunk~/build.xml trunk/build.xml trunk~/build.xml 2009-03-16 13:35:20.0 +0100 -+++ trunk/build.xml2009-04-01 15:09:59.0 +0200 -@@ -1,39 +1,22 @@ - - -- -- -- -- -- -- - - -- -- +--- trunk~/build.xml 2009-07-08 22:06:58.0 +0200 trunk/build.xml2009-07-15 21:04:28.0 +0200 +@@ -4,47 +4,41 @@ + + + +- +- +- ++ + + -+ - - - - -- -- -- -- -- -- -- -- -- -- -- - -- -+ - -- - - - -@@ -51,16 +34,21 @@ - - - -+ ++ + + + + +- +- +- +- +- +- +- + +- + + + + + +- ++ + - - - -+ ++ + + +- ++ + - -- - - - - - ++ + + +- + + + + +- ++ + -+ - - - -@@ -84,6 +72,7 @@ - target="1.5" source="1.5" debug="on" encoding="UTF-8"> - - -+ - - - -@@ -94,6 +83,7 @@ - - - -+ - - - ++ + +- +- +- +- +- +- +- ++ ++ ++ + + + +@@ -66,7 +60,8 @@ + + +- ++ ++ + + + +@@ -76,7 +71,8 @@ + + + +- ++ ++ + + + diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml trunk~/i18n/build.xml 2009-03-18 19:06:54.0 +0100 -+++ trunk/i18n/build.xml 2009-04-01 15:19:52.0 +0200 +--- trunk~/i18n/build.xml 2009-07-09 10:54:34.0 +0200 trunk/i18n/build.xml 2009-07-15 21:04:02.0 +0200 @@ -58,10 +58,14 @@ @@ -114,9 +113,9 @@ -@@ -88,10 +92,13 @@ - +@@ -93,10 +97,13 @@ + + + @@ -129,7 +128,7 @@ -@@ -104,6 +111,13 @@ +@@ -109,6 +116,13 @@ @@ -143,7 +142,7 @@ -@@ -119,6 +133,7 @@ +@@ -124,6 +138,7 @@ Modified: packages/josm/trunk/debian/patches/20_bts.dpatch === --- packages/josm/trunk/debian/patches/20_bts.dpatch2009-07-15 19:07:33 UTC (rev 2361) +++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-07-15 19:11:02 UTC (rev 2362) @@ -6,8 +6,8 @@ @DPATCH@ diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java trunk/src/org/openstreetmap/josm/actions/AboutAction.java trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-03-13 09:19:31.0 +0100 -+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-04-01 15:22:10.0 +0200 +--- trunk~/src/org/openstreetmap/josm/actions/AboutActio
[DebianGIS-dev] r2363 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-07-15 19:12:29 + (Wed, 15 Jul 2009) New Revision: 2363 Modified: packages/josm-plugins/trunk/debian/changelog Log: New upstream release Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-07-15 19:11:02 UTC (rev 2362) +++ packages/josm-plugins/trunk/debian/changelog2009-07-15 19:12:29 UTC (rev 2363) @@ -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 @@ * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani Sun, 24 May 2009 11:45:31 +0200 + -- Giovanni Mascellani Wed, 15 Jul 2009 21:11:36 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2361 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-07-15 19:07:33 + (Wed, 15 Jul 2009) New Revision: 2361 Modified: packages/josm/trunk/debian/changelog Log: Preparing new upstream release Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-07-15 19:06:37 UTC (rev 2360) +++ packages/josm/trunk/debian/changelog2009-07-15 19:07:33 UTC (rev 2361) @@ -1,10 +1,11 @@ -josm (0.0.svn1529-2) unstable; urgency=low +josm (0.0.svn1788-1) unstable; urgency=low + * New upstream release * debian/josm.sh: wrong java executable path for java 1.5.0 (closes: #525020). Thanks to Ross Burton for the report. * debian/josm.sh: use java alternative if known to work (closes: #521125). - -- Giovanni Mascellani Wed, 20 May 2009 17:13:51 +0200 + -- Giovanni Mascellani Wed, 15 Jul 2009 19:21:54 +0200 josm (0.0.svn1529-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2360 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-07-15 19:06:37 + (Wed, 15 Jul 2009) New Revision: 2360 Added: packages/josm/tarballs/josm_0.0.svn1788.orig.tar.gz Log: New upstream tarball Added: packages/josm/tarballs/josm_0.0.svn1788.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn1788.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2268 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-06-07 13:40:30 + (Sun, 07 Jun 2009)
New Revision: 2268
Modified:
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
Log:
Backporting plugin validator
Modified: packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-06-07 13:32:22 UTC (rev 2267)
+++ packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
2009-06-07 13:40:30 UTC (rev 2268)
@@ -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 @@
@@ -17,3 +17,87 @@
+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 @@
+ import java.util.LinkedList;
+
+ import org.openstreetmap.josm.data.osm.*;
+-import org.openstreetmap.josm.data.osm.visitor.Visitor;
++import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+
+ /**
+ * A visitor that aggregates all primitives
[DebianGIS-dev] r2267 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-06-07 13:32:22 + (Sun, 07 Jun 2009)
New Revision: 2267
Modified:
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
Log:
Backporting recent code for pluing surveyor
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-06-07 13:20:17 UTC (rev 2266)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-06-07 13:32:22 UTC (rev 2267)
@@ -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/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();
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2266 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-06-07 13:20:17 + (Sun, 07 Jun 2009)
New Revision: 2266
Modified:
packages/josm-plugins/trunk/debian/control
Log:
Josm version on which josm-plugins depends updated.
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-06-06 12:01:06 UTC (rev
2265)
+++ packages/josm-plugins/trunk/debian/control 2009-06-07 13:20:17 UTC (rev
2266)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
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 @@
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.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2231 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-05-24 09:46:03 + (Sun, 24 May 2009) New Revision: 2231 Modified: packages/josm-plugins/trunk/debian/changelog Log: Updated changelog Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-05-23 18:22:29 UTC (rev 2230) +++ packages/josm-plugins/trunk/debian/changelog2009-05-24 09:46:03 UTC (rev 2231) @@ -16,13 +16,15 @@ (integrated in josm or in other plugins, not more maintained on upstream SVN) * dpatches updated consequently + * Added both build and binary dependencies on the exact version of josm +(closes #530305) [ Andreas Putzo ] * Update packaging copyright year. * Mention added plugins in long description. * Use openjdk in debian/rules to be consistent with build dependency. - -- Giovanni Mascellani Sat, 04 Apr 2009 20:42:13 +0200 + -- Giovanni Mascellani Sun, 24 May 2009 11:45:31 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2227 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-05-21 22:14:07 + (Thu, 21 May 2009) New Revision: 2227 Modified: packages/josm-plugins/trunk/debian/TODO.Debian Log: Information on many plugins filled Modified: packages/josm-plugins/trunk/debian/TODO.Debian === --- packages/josm-plugins/trunk/debian/TODO.Debian 2009-05-21 16:01:26 UTC (rev 2226) +++ packages/josm-plugins/trunk/debian/TODO.Debian 2009-05-21 22:14:07 UTC (rev 2227) @@ -1,18 +1,83 @@ * Add more plugins: which are the problems? + + cadastre_fr +- license: MAYBE, there is GPL-2 license file, but nothing is said in sources +- build.xml: OK, needs anti-SVN patch + + create_grid_of_ways +- license: unknown, copyright holder unknown too +- build.xml: OK, needs anti-SVN patch + + DirectUpload +- license: GPL, version not specified, although there is the text of GPL-2 (Copyright by Subhodip Biswas) +- build.xml: OK, needs anti-SVN patch + editgpx -- license: OK, GPL (Copyright 2008. Martin Garbe (leo at running-sheep dot com)) +- license: GPL, version not specified (Copyright 2008. Martin Garbe (leo at running-sheep dot com)) - build.xml: OK, needs anti-SVN patch + + globalsat +- license: quite confusing. In plugin root there is a LICENSE file, that states + the plugin is "copyrighted 2007-2009 by Stafan Kaintoch and Raphael Mack " + and is distributed GPL-3+. Many .java files are copyrighted by Kaintoch or Mack + and don't specify any license. A file (copyright by Mack), says "License: GPL v2 or later (v3 preferred)" + and another (copyrighted by Mack and Immanuel Scholz) is GPL-2+. I think + redistribution of the whole plugin is allowed under GPL-3+ terms. +- build.xml: OK, needs anti-SVN patch and specification of build dependencies +- dependencies: depends on rxtx, which is in Debian + grid - license: unknown, copyright holder too - build.xml: OK, needs anti-SVN patch + + imagewaypoint +- license: unknown, copyright holder unknown too +- build.xml: OK, needs anti-SVN patch + + lakewalker +- license: unclear. Some files are "Copyright (c) 2000-2007 by Rodney Kinney, Brent Easton" + and LGPL (version unknown), other have no copyright or license specification +- build.xml: OK, needs anti-SVN patch + + nearclick +- license: unknown, copyright holder unknown 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 + + osmarender +- license: unknown, copyright holder unknown too +- build.xml: OK, needs anti-SVN patch +- dependencies: Firefox or other browser? + + piclayer +- license: OK, GPL-2+ (Copyright (C) 2009 by Tomasz Stelmach) +- build.xml: OK, needs anti-SVN patch + + plastic_laf +- license: unknown, copyright holder unknown too +- build.xml: OK, needs anti-SVN patch +- dependencies: depends on looks, which is in Debian + + remotecontrol +- license: MAYBE, GPL-2+ and copyright holder (Frederik Ramm) stated in + LICENSE and CONTRIBUTION files, but not on source files themselves. +- build.xml: OK, needs anti-SVN patch + routing -- license: MAYBE: GPL-2+ text is clearly stated, but copyright string +- 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 + + tageditor +- licese: copyright holder unknown; LICENSE contains GPL-2 text, but no + indication of license is present on sources +- build.xml: OK, needs anti-SVN patch + + tcxplugin +- license: quite confusing. A source says "License: GPL. For details, see LICENSE file.", + but there is no LICENSE file. It reports no copyright holder indication. + Conversely, the other states "(c) Copyright by M.IT 2002-2008" and has a link + to www.emaitie.de, but without telling nothing about the license +- build.xml: MAYBE. The build.xml could be used as is, just like most of the + other plugins (with the usual anti-SVN patch), but many source files appears + to be generated automatically by JAXB. build.xml doesn't take care of + regenerating them, but I think we should, as these sources aren't really + a "source", but rather an intermediate form. So build.xml needs patching + and I don't know how extensively this must be done. +- dependencies: depends on JAXB, which I think is not available in Debian; I don't + know whether libjaxme-java is an acceptable alternative. Morover tcxplugin
[DebianGIS-dev] r2226 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-05-21 16:01:26 + (Thu, 21 May 2009) New Revision: 2226 Added: packages/josm-plugins/trunk/debian/TODO.Debian Log: Added TODO for next plugins to add Added: packages/josm-plugins/trunk/debian/TODO.Debian === --- packages/josm-plugins/trunk/debian/TODO.Debian (rev 0) +++ packages/josm-plugins/trunk/debian/TODO.Debian 2009-05-21 16:01:26 UTC (rev 2226) @@ -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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2223 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-05-20 15:16:12 + (Wed, 20 May 2009)
New Revision: 2223
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/josm.sh
Log:
Use java alternative if known to work
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-05-20 15:14:42 UTC (rev
)
+++ packages/josm/trunk/debian/changelog2009-05-20 15:16:12 UTC (rev
2223)
@@ -2,8 +2,9 @@
* debian/josm.sh: wrong java executable path for java 1.5.0 (closes:
#525020).
Thanks to Ross Burton for the report.
+ * debian/josm.sh: use java alternative if known to work (closes: #521125).
- -- Giovanni Mascellani Tue, 21 Apr 2009 17:52:55
+0200
+ -- Giovanni Mascellani Wed, 20 May 2009 17:13:51
+0200
josm (0.0.svn1529-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/josm.sh
===
--- packages/josm/trunk/debian/josm.sh 2009-05-20 15:14:42 UTC (rev )
+++ packages/josm/trunk/debian/josm.sh 2009-05-20 15:16:12 UTC (rev 2223)
@@ -2,10 +2,17 @@
# Simple wrapper script used to start JOSM in Debian
set -e
-# First, the users preference as defined by $JAVA_HOME. Next, use OpenJDK.
+# First, the alternative (if known to work) or users preference as defined by
$JAVA_HOME. Next, use OpenJDK or Sun's proprietary JDK.
# Override to a specific one using $JAVACMD
+ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java
/usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/bin/java"
+for jcmd in $JAVA_CMDS; do
+ if [[ "z$ALTERNATIVE_JDK" == "z`readlink -n -f $jcmd`" ]] && [ -z
"${JAVACMD}" ]; then
+JAVACMD="$jcmd"
+fi
+done
+
for jcmd in $JAVA_CMDS; do
if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
JAVACMD="$jcmd"
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2184 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-04-21 15:54:20 + (Tue, 21 Apr 2009)
New Revision: 2184
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/josm.sh
Log:
Wrong java 1.5.0 path
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-04-20 11:52:17 UTC (rev
2183)
+++ packages/josm/trunk/debian/changelog2009-04-21 15:54:20 UTC (rev
2184)
@@ -1,3 +1,10 @@
+josm (0.0.svn1529-2) unstable; urgency=low
+
+ * debian/josm.sh: wrong java executable path for java 1.5.0 (closes:
#525020).
+Thanks to Ross Burton for the report.
+
+ -- Giovanni Mascellani Tue, 21 Apr 2009 17:52:55
+0200
+
josm (0.0.svn1529-1) unstable; urgency=low
[ Giovanni Mascellani ]
Modified: packages/josm/trunk/debian/josm.sh
===
--- packages/josm/trunk/debian/josm.sh 2009-04-20 11:52:17 UTC (rev 2183)
+++ packages/josm/trunk/debian/josm.sh 2009-04-21 15:54:20 UTC (rev 2184)
@@ -4,7 +4,7 @@
# First, the users preference as defined by $JAVA_HOME. Next, use OpenJDK.
# Override to a specific one using $JAVACMD
-JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java
/usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/lib/java"
+JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java
/usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/bin/java"
for jcmd in $JAVA_CMDS; do
if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2177 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-04-19 09:22:10 + (Sun, 19 Apr 2009) New Revision: 2177 Modified: packages/josm/trunk/debian/changelog Log: Thanks to Damien Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-04-19 09:18:36 UTC (rev 2176) +++ packages/josm/trunk/debian/changelog2009-04-19 09:22:10 UTC (rev 2177) @@ -1,7 +1,8 @@ josm (0.0.svn1529-1) unstable; urgency=low * New upstream release -+ Fix bug in uploading with 0.6 API (closes: #524628) ++ Fix bug in uploading with 0.6 API (closes: #524628). Thanks to + Damien Raude-Morvan for the report. -- Giovanni Mascellani Sun, 19 Apr 2009 10:46:12 +0200 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2176 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-04-19 09:18:36 + (Sun, 19 Apr 2009) New Revision: 2176 Added: packages/josm/tarballs/josm_0.0.svn1529.orig.tar.gz Log: New upstream release Added: packages/josm/tarballs/josm_0.0.svn1529.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn1529.orig.tar.gz ___ Added: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2175 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-04-19 09:14:01 + (Sun, 19 Apr 2009) New Revision: 2175 Modified: packages/josm/trunk/debian/changelog Log: Bump to new upstream release (API 0.6 bug) Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-04-17 23:07:51 UTC (rev 2174) +++ packages/josm/trunk/debian/changelog2009-04-19 09:14:01 UTC (rev 2175) @@ -1,3 +1,10 @@ +josm (0.0.svn1529-1) unstable; urgency=low + + * New upstream release ++ Fix bug in uploading with 0.6 API (closes: #524628) + + -- Giovanni Mascellani Sun, 19 Apr 2009 10:46:12 +0200 + josm (0.0.svn1515-1) unstable; urgency=low [ Giovanni Mascellani ] ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2172 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-04-17 20:26:37 + (Fri, 17 Apr 2009) New Revision: 2172 Modified: packages/josm-plugins/trunk/debian/README.Debian Log: Small typo Modified: packages/josm-plugins/trunk/debian/README.Debian === --- packages/josm-plugins/trunk/debian/README.Debian2009-04-17 20:25:58 UTC (rev 2171) +++ packages/josm-plugins/trunk/debian/README.Debian2009-04-17 20:26:37 UTC (rev 2172) @@ -10,4 +10,4 @@ Plugins that resides in your HOME directory take always precedence and will be used in favour of the plugins included in this package. - -- Andreas Putzo So, 13 Apr 2008 12:10:12 + + -- Andreas Putzo Sun, 13 Apr 2008 12:10:12 + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2171 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-04-17 20:25:58 + (Fri, 17 Apr 2009) New Revision: 2171 Modified: packages/josm-plugins/trunk/debian/master.xml Log: usertools needs not to be cleaned (as it doesn't exist!) Modified: packages/josm-plugins/trunk/debian/master.xml === --- packages/josm-plugins/trunk/debian/master.xml 2009-04-17 20:22:59 UTC (rev 2170) +++ packages/josm-plugins/trunk/debian/master.xml 2009-04-17 20:25:58 UTC (rev 2171) @@ -66,7 +66,6 @@ - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2170 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-04-17 20:22:59 + (Fri, 17 Apr 2009) New Revision: 2170 Modified: packages/josm/trunk/debian/copyright Log: Little encoding fix Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-04-17 10:17:25 UTC (rev 2169) +++ packages/josm/trunk/debian/copyright2009-04-17 20:22:59 UTC (rev 2170) @@ -155,12 +155,12 @@ License: GPL-2 Files: i18n/po/pl.po -Copyright: Copyright (c) 2008 PAWEÅ MADEJ +Copyright: Copyright (c) 2008 PAWEŁ MADEJ Copyright (c) 2008 Nabuchodonozor Copyright (c) 2008 MARCIN FLORYAN License: GPL-2 Files: i18n/po/tr.po Copyright: Copyright (c) 2009 ikinokta - Copyright (c) 2009 Cezmi TopaloÄlu + Copyright (c) 2009 Cezmi Topaloğlu License: GPL-2 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2138 - packages/josm-plugins/tarballs
Author: gmascellani-guest Date: 2009-04-04 23:38:30 + (Sat, 04 Apr 2009) New Revision: 2138 Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn14400.orig.tar.gz Log: Adding latest josm-plugins tarball Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn14400.orig.tar.gz === (Binary files differ) Property changes on: packages/josm-plugins/tarballs/josm-plugins_0.0.svn14400.orig.tar.gz ___ Name: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2137 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-04-04 23:37:46 + (Sat, 04 Apr 2009)
New Revision: 2137
Modified:
packages/josm-plugins/trunk/debian/control
Log:
Fixed too strict conflicting bound
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-04-04 23:36:02 UTC (rev
2136)
+++ packages/josm-plugins/trunk/debian/control 2009-04-04 23:37:46 UTC (rev
2137)
@@ -5,6 +5,7 @@
Uploaders: Giovanni Mascellani , Andreas Putzo
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 @@
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.
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2136 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-04-04 23:36:02 + (Sat, 04 Apr 2009) New Revision: 2136 Added: packages/josm/tarballs/josm_0.0.svn1515.orig.tar.gz Log: Adding last SVN revision Added: packages/josm/tarballs/josm_0.0.svn1515.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn1515.orig.tar.gz ___ Name: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2135 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-04-04 23:34:35 + (Sat, 04 Apr 2009) New Revision: 2135 Modified: packages/josm-plugins/trunk/debian/master.xml Log: Deleted usertools from master.xml Modified: packages/josm-plugins/trunk/debian/master.xml === --- packages/josm-plugins/trunk/debian/master.xml 2009-04-04 23:33:39 UTC (rev 2134) +++ packages/josm-plugins/trunk/debian/master.xml 2009-04-04 23:34:35 UTC (rev 2135) @@ -44,10 +44,6 @@ - - - - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2134 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-04-04 23:33:39 + (Sat, 04 Apr 2009) New Revision: 2134 Modified: packages/josm-plugins/trunk/debian/rules Log: Missing link to libmetadata-extractor-java Modified: packages/josm-plugins/trunk/debian/rules === --- packages/josm-plugins/trunk/debian/rules2009-04-04 23:30:56 UTC (rev 2133) +++ packages/josm-plugins/trunk/debian/rules2009-04-04 23:33:39 UTC (rev 2134) @@ -8,6 +8,7 @@ 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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2133 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest Date: 2009-04-04 23:30:56 + (Sat, 04 Apr 2009) New Revision: 2133 Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch packages/josm-plugins/trunk/debian/patches/50_validator.dpatch packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch Log: Patches updated to last revision Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch === --- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch 2009-04-04 23:14:36 UTC (rev 2132) +++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch 2009-04-04 23:30:56 UTC (rev 2133) @@ -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 @@ + - -- -- -- -- -- -- -- -- +- ++ Modified: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch === --- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch 2009-04-04 23:14:36 UTC (rev 2132) +++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch 2009-04-04 23:30:56 UTC (rev 2133) @@ -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 @@ + + + +- + + + + + +- ++ + + + Modified: packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch === --- packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch 2009-04-04 23:14:36 UTC (rev 2132) +++ packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch 2009-04-04 23:30:56 UTC (rev 2133) @@ -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 @@ - - - -- -- -- -- -- -- -- -- - - - -@@ -60,12 +52,7 @@ - - - -- -- -- -- -- -- -+ - +--- trunk~/livegps/build.xml 2009-03-18 15:55:16.0 +0100 trunk/livegps/build.xml2009-04-05 01:21:45.0 +0200 +@@ -14,7 +14,7 @@ + +- ++ + + + Modified: packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch === --- packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch 2009-04-04 23:14:36 UTC (rev 2132) +++ packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch 2009-04-04 23:30:56 UTC (rev 2133) @@ -7,29 +7,14 @@ @DPATCH@ diff -urNad trunk~/slippymap/build.xml trunk/slippymap/build.xml trunk~/slippymap/build.xml 2009-01-01 18:55:45.0 +0100 -+++ trunk/slippymap/build.xml 2009-02-15 19:59:59.0 +0100 -@@ -20,14 +20,6 @@ - - - -- -- -- -- -- -- -- -- - - - -@@ -41,7 +33,7 @@ - - - -- -+ - +--- trunk~/slippymap/build.xml 2009-03-08 14:39:18.0 +0100 trunk/slippymap/build.xml 2009-04-05 01:22:45.0 +0200 +@@ -14,7 +14,7 @@ + +- ++ + + + Modified: packages/josm-plugins/trunk/debian/patches
[DebianGIS-dev] r2132 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest Date: 2009-04-04 23:14:36 + (Sat, 04 Apr 2009) New Revision: 2132 Modified: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch Log: Removed .rej file from patch Modified: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch === --- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch 2009-04-04 23:14:12 UTC (rev 2131) +++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch 2009-04-04 23:14:36 UTC (rev 2132) @@ -6,47 +6,3 @@ ## DP: * Fix wrong classpath and dependencies @DPATCH@ -diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml trunk~/colorscheme/build.xml 2009-01-01 18:55:45.0 +0100 -+++ trunk/colorscheme/build.xml2009-02-15 19:57:22.0 +0100 -@@ -15,7 +15,7 @@ - http://www.tegmento.org/~cdaller/josm/colorscheme/"/> - - -- -+ - - - - - -@@ -48,14 +40,11 @@ - - - -- -+ - - - -- -- -- -- -+ - - - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2131 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-04-04 23:14:12 + (Sat, 04 Apr 2009) New Revision: 2131 Modified: packages/josm-plugins/trunk/debian/changelog Log: Updated changelog Modified: packages/josm-plugins/trunk/debian/changelog === --- packages/josm-plugins/trunk/debian/changelog2009-04-04 23:13:59 UTC (rev 2130) +++ packages/josm-plugins/trunk/debian/changelog2009-04-04 23:14:12 UTC (rev 2131) @@ -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 Wed, 25 Feb 2009 21:43:30 + + -- Giovanni Mascellani Sat, 04 Apr 2009 20:42:13 +0200 josm-plugins (0.0.0.20080518-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2130 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-04-04 23:13:59 + (Sat, 04 Apr 2009)
New Revision: 2130
Modified:
packages/josm-plugins/trunk/debian/control
packages/josm-plugins/trunk/debian/copyright
packages/josm-plugins/trunk/debian/rules
Log:
* Removed plugin usertools because of unspecified license (author not
responding)
* Forcing josm-plugins to be installed with the correct josm version
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-04-04 23:12:49 UTC (rev
2129)
+++ packages/josm-plugins/trunk/debian/control 2009-04-04 23:13:59 UTC (rev
2130)
@@ -4,7 +4,7 @@
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
- josm (>= 0.0.svn1387), libmetadata-extractor-java
+ josm (>= 0.0.svn1515), libmetadata-extractor-java
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,8 +12,9 @@
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 @@
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.
Modified: packages/josm-plugins/trunk/debian/copyright
===
--- packages/josm-plugins/trunk/debian/copyright2009-04-04 23:12:49 UTC
(rev 2129)
+++ packages/josm-plugins/trunk/debian/copyright2009-04-04 23:13:59 UTC
(rev 2130)
@@ -36,8 +36,8 @@
License: GPL-3+
Files: openvisible/*
-Copyright: © Dallermassl (???)
-License: ???
+Copyright: © Christof Dallermassl
+License: GPL-2+
Files: slippymap/*
Copyright: © 2007 Hakan Tandogan
@@ -50,10 +50,6 @@
Copyright: © Christof Dallermassl
License: GPL-2+
-Files: usertools/*
-Copyright: ???
-License: ???
-
Files: utilsplugin/*
Copyright: © 2007 Frederik Ramm
© 2007 Gabriel Ebner
Modified: packages/josm-plugins/trunk/debian/rules
===
--- packages/josm-plugins/trunk/debian/rules2009-04-04 23:12:49 UTC (rev
2129)
+++ packages/josm-plugins/trunk/debian/rules2009-04-04 23:13:59 UTC (rev
2130)
@@ -14,7 +14,7 @@
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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2129 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest Date: 2009-04-04 23:12:49 + (Sat, 04 Apr 2009) New Revision: 2129 Removed: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch Modified: packages/josm-plugins/trunk/debian/patches/00list Log: Removed patch for usertools Modified: packages/josm-plugins/trunk/debian/patches/00list === --- packages/josm-plugins/trunk/debian/patches/00list 2009-04-02 19:10:15 UTC (rev 2128) +++ packages/josm-plugins/trunk/debian/patches/00list 2009-04-04 23:12:49 UTC (rev 2129) @@ -8,4 +8,3 @@ 80_measurement 90_openvisible 100_surveyor -110_usertools Deleted: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch === --- packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch 2009-04-02 19:10:15 UTC (rev 2128) +++ packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch 2009-04-04 23:12:49 UTC (rev 2129) @@ -1,25 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 110_usertools.dpatch by -## -## DP: Patch for plugin usertools -## DP: * Disable upstream SVN access - -...@dpatch@ -diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml trunk~/usertools/build.xml 2009-01-09 10:04:33.0 +0100 -+++ trunk/usertools/build.xml 2009-02-16 11:08:10.0 +0100 -@@ -16,14 +16,6 @@ - - - -- -- -- -- -- -- -- -- - - - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2127 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-04-01 15:13:12 + (Wed, 01 Apr 2009) New Revision: 2127 Modified: packages/josm/trunk/debian/copyright Log: Copyright stanzas for new code Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-04-01 15:12:55 UTC (rev 2126) +++ packages/josm/trunk/debian/copyright2009-04-01 15:13:12 UTC (rev 2127) @@ -22,6 +22,10 @@ systems, the complete text of the GNU General Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'. +Files: src/org/openstreetmap/gui/* +Copyright: Copyright (c) 2008 Jan Peter Stotz +License: GPL-2 + Files: debian/* Copyright: Copyright (c) 2007-2009 Andreas Putzo Copyright (c) 2008 Petter Reinholdtsen @@ -123,3 +127,7 @@ can do whatever you want with it. Really. You don't have to match it up with any other open source license - just use it. You can rename the files, move the Java packages, whatever you want. + +Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java +Copyright: Copyright (c) 2007 Tim Haussmann +License: GPL-2 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2126 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-04-01 15:12:55 + (Wed, 01 Apr 2009)
New Revision: 2126
Modified:
packages/josm/trunk/debian/changelog
Log:
Little typo
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-04-01 15:04:37 UTC (rev
2125)
+++ packages/josm/trunk/debian/changelog2009-04-01 15:12:55 UTC (rev
2126)
@@ -2,7 +2,7 @@
[ Giovanni Mascellani ]
* New upstream SVN release. (Closes: #509239)
-- dpatch/*: fixed to comply with new upstream code.
+- patches/*: fixed to comply with new upstream code.
* Added ${misc:Depends} into dependencies.
* Added optional dependencies against sun-java5-jre and sun-java6-jre.
(Closes: #496861)
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r2125 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-04-01 15:04:37 + (Wed, 01 Apr 2009)
New Revision: 2125
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Patches updated for last tested revision
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-04-01 15:04:22 UTC
(rev 2124)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-04-01 15:04:37 UTC
(rev 2125)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/build.xml trunk/build.xml
trunk~/build.xml 2008-12-16 09:38:35.0 +0100
-+++ trunk/build.xml2009-02-15 18:28:50.0 +0100
+--- trunk~/build.xml 2009-03-16 13:35:20.0 +0100
trunk/build.xml2009-04-01 15:09:59.0 +0200
@@ -1,39 +1,22 @@
@@ -77,7 +77,7 @@
-@@ -70,6 +58,7 @@
+@@ -84,6 +72,7 @@
target="1.5" source="1.5" debug="on"
encoding="UTF-8">
@@ -85,7 +85,7 @@
-@@ -80,6 +69,7 @@
+@@ -94,6 +83,7 @@
@@ -94,24 +94,27 @@
diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
trunk~/i18n/build.xml 2009-02-08 22:44:59.0 +0100
-+++ trunk/i18n/build.xml 2009-02-15 18:33:34.0 +0100
-@@ -45,7 +45,13 @@
-
+--- trunk~/i18n/build.xml 2009-03-18 19:06:54.0 +0100
trunk/i18n/build.xml 2009-04-01 15:19:52.0 +0200
+@@ -58,10 +58,14 @@
+
--
+-
+-
+
+
+
+
+
-+
+
+-
+
-
++
-
-@@ -69,10 +75,13 @@
+
+@@ -88,10 +92,13 @@
@@ -126,34 +129,24 @@
-@@ -85,14 +94,23 @@
+@@ -104,6 +111,13 @@
-+-->
-
-
-
++ -->
++
++
+
+
+
+
-+
-+
-
-
-+
+
-
-
-@@ -107,6 +125,7 @@
-
+
+@@ -119,6 +133,7 @@
+
+
-
+
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-04-01 15:04:22 UTC
(rev 2124)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-04-01 15:04:37 UTC
(rev 2125)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-01-23
22:22:10.0 +0100
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-02-15
18:50:17.0 +0100
-@@ -47,6 +47,7 @@
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-03-13
09:19:31.0 +0100
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-04-01
15:22:10.0 +0200
+@@ -48,6 +48,7 @@
public class AboutAction extends JosmAction {
private static final String version;
@@ -16,7 +16,7 @@
private final static JTextArea revision;
private static String time;
-@@ -67,6 +68,10 @@
+@@ -70,6 +71,10 @@
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
@@ -27,7 +27,7 @@
Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
match = timePattern.matcher(revision.getText());
time = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -124,6 +129,8 @@
+@@ -133,6 +138,8 @@
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Version {0}",version)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
@@ -36,19 +36,19 @@
info.add(new JLabel(tr("Last change at {0}",time)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Java Version
{0}",System.getProperty("java.version"))),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -131,7 +138,7 @@
+@@ -140,7 +147,7 @@
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
info.add(new UrlLabel("http://josm.openstreetmap.de";),
GBC.eol().fill(GBC.HORIZONTAL));
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
-info.add(new UrlLabel("http://josm.openstreetmap.de/newticket";),
GBC.eol().fill(GBC.HORIZONTAL));
-+ info.add(new UrlLabel("http://bugs.debian.org";),
GBC.eol().fill(GBC.HORIZONTAL
[DebianGIS-dev] r2124 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2009-04-01 15:04:22 + (Wed, 01 Apr 2009)
New Revision: 2124
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/rules
Log:
Updated to last tested revision
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2009-03-31 15:06:52 UTC (rev
2123)
+++ packages/josm/trunk/debian/changelog2009-04-01 15:04:22 UTC (rev
2124)
@@ -1,4 +1,4 @@
-josm (0.0.svn1387-1) unstable; urgency=low
+josm (0.0.svn1515-1) unstable; urgency=low
[ Giovanni Mascellani ]
* New upstream SVN release. (Closes: #509239)
@@ -17,7 +17,7 @@
* Add README.source file to comply with policy.
* Add command line arguments and environment section to manpage.
- -- Andreas Putzo Mon, 23 Feb 2009 22:07:42 +
+ -- Giovanni Mascellani Wed, 01 Apr 2009 15:05:30
+0200
josm (0.0.0.20080713-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/rules
===
--- packages/josm/trunk/debian/rules2009-03-31 15:06:52 UTC (rev 2123)
+++ packages/josm/trunk/debian/rules2009-04-01 15:04:22 UTC (rev 2124)
@@ -40,12 +40,12 @@
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm from ${SVNREPO}
- svn export -r ${SVNREV} --ignore-externals ${SVNREPO} ${DESTDIR}
+ svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
@echo Removing jar files and test data
find ${DESTDIR} -name "*.jar" -exec rm -v {} \;
rm -f ${DESTDIR}/data/*
@echo Removing icons directory
- rm -rf ${DESTDIR}/styles/standard/icons/
+ rm -rf ${DESTDIR}/images/styles/standard
@echo Fetching revision metadata
svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
@echo Fetching internalization data...
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1955 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-03-03 16:55:18 + (Tue, 03 Mar 2009) New Revision: 1955 Modified: packages/josm-plugins/trunk/debian/copyright Log: License for plugin measurement (stated in a more recent SVN revision) Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-03-03 16:50:33 UTC (rev 1954) +++ packages/josm-plugins/trunk/debian/copyright2009-03-03 16:55:18 UTC (rev 1955) @@ -33,7 +33,7 @@ Files: measurement/* Copyright: © Raphael Mack -License: ??? +License: GPL-3+ Files: openvisible/* Copyright: © Dallermassl (???) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1950 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-03-03 13:32:22 + (Tue, 03 Mar 2009) New Revision: 1950 Modified: packages/josm-plugins/trunk/debian/copyright Log: License checked on upstream NOTICE file Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-03-02 16:45:47 UTC (rev 1949) +++ packages/josm-plugins/trunk/debian/copyright2009-03-03 13:32:22 UTC (rev 1950) @@ -67,8 +67,11 @@ 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. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1903 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-02-16 14:00:13 + (Mon, 16 Feb 2009) New Revision: 1903 Modified: packages/josm-plugins/trunk/debian/copyright Log: d/copyright partially fixed, but still requiring love Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-02-16 13:23:49 UTC (rev 1902) +++ packages/josm-plugins/trunk/debian/copyright2009-02-16 14:00:13 UTC (rev 1903) @@ -12,6 +12,15 @@ License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later. +Files: agpifoj/* +Copyright: © 2007 Christian Gallioz + © Rob Neild + © Immanuel Scholz +License: GPL-2 + License: GPL. Copyright 2007 by Christian Gallioz (aka khris78) + Parts of code from Geotagged plugin (by Rob Neild) + and the core JOSM source code (by Immanuel Scholz and others) + Files: colorscheme/* Copyright: © 2007,2008 Christof Dallermassl License: GPL-2 @@ -22,15 +31,33 @@ License: PD The livegps plugin was put in the public domain by its authors. +Files: measurement/* +Copyright: © Raphael Mack +License: ??? + +Files: openvisible/* +Copyright: © Dallermassl (???) +License: ??? + Files: slippymap/* Copyright: © 2007 Hakan Tandogan © 2007 Frederik Ramm + © LuVar License: PD The slippymap plugin was put in the public domain by its authors. +Files: surveyor/* +Copyright: © Christof Dallermassl +License: GPL-2+ + +Files: usertools/* +Copyright: ??? +License: ??? + Files: utilsplugin/* Copyright: © 2007 Frederik Ramm © 2007 Gabriel Ebner + © Martijn van Oosterhout License: GPL-2+ Files: validator/* @@ -39,10 +66,33 @@ © 2007,2008 Gabriel Ebner License: GPL-2 +Files: validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java +Copyright: Licensed to the Apache Software Foundation +License: Apache-2.0 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems the full test of the Apache 2.0 license can be found + in the `/usr/share/common-licenses/Apache-2.0' file. + Files: wmsplugin/* Copyright: © 2007 Tim Waters © 2007 Frederik Ramm © 2007 Jonathan Stott © 2007 Ulf Lamping © 2007,2008 Gabriel Ebner + © Petr Dlouhý + © Nick Whitelegg License: GPL-2+ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1902 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest Date: 2009-02-16 13:23:49 + (Mon, 16 Feb 2009) New Revision: 1902 Modified: packages/josm-plugins/trunk/debian/copyright Log: Fixing things in d/copyright Modified: packages/josm-plugins/trunk/debian/copyright === --- packages/josm-plugins/trunk/debian/copyright2009-02-16 13:18:38 UTC (rev 1901) +++ packages/josm-plugins/trunk/debian/copyright2009-02-16 13:23:49 UTC (rev 1902) @@ -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 @@ Version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: debian/* -Copyright: © 2008 Giovanni Mascellani +Copyright: © 2008-2009 Giovanni Mascellani © 2008 Andreas Putzo License: GPL-2+ - The Debian packaging information is under the GPL, version 3 or later. - On Debian GNU/Linux systems, the complete text of the GNU General Public License - Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + The Debian packaging information is under the GPL, version 2 or later. Files: colorscheme/* Copyright: © 2007,2008 Christof Dallermassl License: GPL-2 - On Debian GNU/Linux systems, the complete text of the GNU General Public License - Version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: livegps/* Copyright: © 2007,2008 Frederik Ramm @@ -25,11 +22,6 @@ License: PD The livegps plugin was put in the public domain by its authors. -Files: namefinder/* -Copyright: © 2007,2008 Frederik Ramm -License: PD - The namefinder plugin was put in the public domain by Frederik Ramm. - Files: slippymap/* Copyright: © 2007 Hakan Tandogan © 2007 Frederik Ramm @@ -54,15 +46,3 @@ © 2007 Ulf Lamping © 2007,2008 Gabriel Ebner License: GPL-2+ - -Files: ywms/* -Copyright: © 2007 Francisco R. Santos - © 2007 Frederik Ramm - © 2007 Gabriel Ebner - © 2007 Joerg Ostertag -License: GPL-2 - -Files: slippy_map_chooser/* -Copyright: © 2007 Immanuel Scholz - © 2007 Tim Haussmann -License: GPL-2+ ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1901 - in packages/josm-plugins/trunk/debian: . patches
Author: gmascellani-guest
Date: 2009-02-16 13:18:38 + (Mon, 16 Feb 2009)
New Revision: 1901
Modified:
packages/josm-plugins/trunk/debian/control
packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch
packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch
packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch
Log:
Fixed lintian messages:
* added ${misc:Depends} to dependencies
* added patch descriptions
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-02-16 13:12:22 UTC (rev
1900)
+++ packages/josm-plugins/trunk/debian/control 2009-02-16 13:18:38 UTC (rev
1901)
@@ -12,7 +12,7 @@
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.
Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-02-16 13:12:22 UTC (rev 1900)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
2009-02-16 13:18:38 UTC (rev 1901)
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 100_surveyor.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin surveyor
+## DP: * Disable upstream SVN access
@DPATCH@
diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
Modified: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
2009-02-16 13:12:22 UTC (rev 1900)
+++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
2009-02-16 13:18:38 UTC (rev 1901)
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_colorscheme.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin colorscheme
+## DP: * Disable upstream SVN access
+## DP: * Fix wrong classpath and dependencies
@DPATCH@
diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
Modified: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
2009-02-16 13:12:22 UTC (rev 1900)
+++ packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch
2009-02-16 13:18:38 UTC (rev 1901)
@@ -1,8 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 110_usertools.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin usertools
+## DP: * Disable upstream SVN access
@DPATCH@
diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml
Modified: packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
2009-02-16 13:12:22 UTC (rev 1900)
+++ packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
2009-02-16 13:18:38 UTC (rev 1901)
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_livegps.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch for plugin livegps
+## DP: * Disable upstream SVN access
+## DP: * Fix wrong classpath
@DPATCH@
diff -urNad trunk~/livegps/build.xml trunk/livegps/build.xml
Modified: packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
2009-02-16 13:12:22 UTC (rev 1900)
+++ packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
2009-02-16 13:18:38 UTC (rev 1901)
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_slippymap.dpatch by
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No descri
[DebianGIS-dev] r1895 - in packages/josm-plugins/trunk/debian: . patches
Author: gmascellani-guest Date: 2009-02-16 10:26:40 + (Mon, 16 Feb 2009) New Revision: 1895 Modified: packages/josm-plugins/trunk/debian/control packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch Log: Added libmetadata-extractor-java in compilation and as dependency (used by agpifoj) Modified: packages/josm-plugins/trunk/debian/control === --- packages/josm-plugins/trunk/debian/control 2009-02-16 10:13:35 UTC (rev 1894) +++ packages/josm-plugins/trunk/debian/control 2009-02-16 10:26:40 UTC (rev 1895) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project Uploaders: Giovanni Mascellani , Andreas Putzo Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk, - josm (>= 0.0.svn1387) + josm (>= 0.0.svn1387), libmetadata-extractor-java Standards-Version: 3.8.0 Homepage: http://josm.openstreetmap.de Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/ @@ -12,7 +12,7 @@ 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. Modified: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch === --- packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch 2009-02-16 10:13:35 UTC (rev 1894) +++ packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch 2009-02-16 10:26:40 UTC (rev 1895) @@ -7,7 +7,7 @@ @DPATCH@ diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml --- trunk~/agpifoj/build.xml 2009-01-01 18:55:45.0 +0100 -+++ trunk/agpifoj/build.xml2009-02-16 11:08:56.0 +0100 trunk/agpifoj/build.xml2009-02-16 11:23:37.0 +0100 @@ -27,14 +27,6 @@ @@ -23,3 +23,14 @@ +@@ -50,6 +42,10 @@ + + + ++ ++ ++ ++ + + + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1894 - in packages/josm-plugins/trunk/debian: . patches
Author: gmascellani-guest Date: 2009-02-16 10:13:35 + (Mon, 16 Feb 2009) New Revision: 1894 Added: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch packages/josm-plugins/trunk/debian/patches/80_measurement.dpatch packages/josm-plugins/trunk/debian/patches/90_openvisible.dpatch Modified: packages/josm-plugins/trunk/debian/master.xml packages/josm-plugins/trunk/debian/patches/00list packages/josm-plugins/trunk/debian/rules Log: * Added new plugins: agpifoj, measurement, openvisible, surveyor, usertools * d/rules: HEAD was checked out instead of specified version Modified: packages/josm-plugins/trunk/debian/master.xml === --- packages/josm-plugins/trunk/debian/master.xml 2009-02-15 23:22:53 UTC (rev 1893) +++ packages/josm-plugins/trunk/debian/master.xml 2009-02-16 10:13:35 UTC (rev 1894) @@ -15,6 +15,10 @@ + + + + @@ -22,11 +26,28 @@ + + + + + + + + + + + + + + + + + @@ -40,10 +61,16 @@ + + + + + + Modified: packages/josm-plugins/trunk/debian/patches/00list === --- packages/josm-plugins/trunk/debian/patches/00list 2009-02-15 23:22:53 UTC (rev 1893) +++ packages/josm-plugins/trunk/debian/patches/00list 2009-02-16 10:13:35 UTC (rev 1894) @@ -4,3 +4,8 @@ 40_utilsplugin 50_validator 60_wmsplugin +70_agpifoj +80_measurement +90_openvisible +100_surveyor +110_usertools Added: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch === --- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch (rev 0) +++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch 2009-02-16 10:13:35 UTC (rev 1894) @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100_surveyor.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml +--- trunk~/surveyor/build.xml 2009-01-23 22:36:04.0 +0100 trunk/surveyor/build.xml 2009-02-16 11:06:30.0 +0100 +@@ -20,14 +20,6 @@ + + + +- +- +- +- +- +- +- +- + + + Property changes on: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch ___ Name: svn:executable + * Added: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch === --- packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch (rev 0) +++ packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch 2009-02-16 10:13:35 UTC (rev 1894) @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 110_usertools.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad trunk~/usertools/build.xml trunk/usertools/build.xml +--- trunk~/usertools/build.xml 2009-01-09 10:04:33.0 +0100 trunk/usertools/build.xml 2009-02-16 11:08:10.0 +0100 +@@ -16,14 +16,6 @@ + + + +- +- +- +- +- +- +- +- + + + Property changes on: packages/josm-plugins/trunk/debian/patches/110_usertools.dpatch ___ Name: svn:executable + * Added: packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch === --- packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch (rev 0) +++ packages/josm-plugins/trunk/debian/patches/70_agpifoj.dpatch 2009-02-16 10:13:35 UTC (rev 1894) @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_agpifoj.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad trunk~/agpifoj/build.xml trunk/agpifoj/build.xml +--- trunk~/agpifoj/build.xml 2009-01-01 18:55:45.
[DebianGIS-dev] r1891 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-02-15 19:14:34 + (Sun, 15 Feb 2009) New Revision: 1891 Added: packages/josm/tarballs/josm_0.0.svn1387.orig.tar.gz Log: Added last josm tarball Added: packages/josm/tarballs/josm_0.0.svn1387.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn1387.orig.tar.gz ___ Name: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1890 - packages/josm-plugins/tarballs
Author: gmascellani-guest Date: 2009-02-15 19:14:02 + (Sun, 15 Feb 2009) New Revision: 1890 Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn13741.orig.tar.gz Log: Added last josm-plugins tarball Added: packages/josm-plugins/tarballs/josm-plugins_0.0.svn13741.orig.tar.gz === (Binary files differ) Property changes on: packages/josm-plugins/tarballs/josm-plugins_0.0.svn13741.orig.tar.gz ___ Name: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1889 - packages/josm-plugins/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-02-15 19:07:30 + (Sun, 15 Feb 2009)
New Revision: 1889
Added:
packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
packages/josm-plugins/trunk/debian/patches/20_livegps.dpatch
packages/josm-plugins/trunk/debian/patches/30_slippymap.dpatch
packages/josm-plugins/trunk/debian/patches/40_utilsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/50_validator.dpatch
packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Removed:
packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
packages/josm-plugins/trunk/debian/patches/30_build.dpatch
Modified:
packages/josm-plugins/trunk/debian/patches/00list
Log:
Patches updated to last SVN release
Modified: packages/josm-plugins/trunk/debian/patches/00list
===
--- packages/josm-plugins/trunk/debian/patches/00list 2009-02-15 19:05:56 UTC
(rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/00list 2009-02-15 19:07:30 UTC
(rev 1889)
@@ -1,3 +1,6 @@
-10_validator
-20_disable_svn
-30_build
+10_colorscheme
+20_livegps
+30_slippymap
+40_utilsplugin
+50_validator
+60_wmsplugin
Added: packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
(rev 0)
+++ packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
2009-02-15 19:07:30 UTC (rev 1889)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_colorscheme.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
+--- trunk~/colorscheme/build.xml 2009-01-01 18:55:45.0 +0100
trunk/colorscheme/build.xml2009-02-15 19:57:22.0 +0100
+@@ -15,7 +15,7 @@
+ http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
+
+
+-
++
+
+
+
+
+
+@@ -48,14 +40,11 @@
+
+
+
+-
++
+
+
+
+-
+-
+-
+-
++
+
+
+
Property changes on:
packages/josm-plugins/trunk/debian/patches/10_colorscheme.dpatch
___
Name: svn:executable
+ *
Deleted: packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
2009-02-15 19:05:56 UTC (rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/10_validator.dpatch
2009-02-15 19:07:30 UTC (rev 1889)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 21_validator.dpatch by Andreas Putzo
-##
-## DP: Add cast operator for OsmPrimitive.
-## DP: This is necessary to compile with gcj.
-
-...@dpatch@
-diff -urNad
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
josm-plugins-0.0.0.20080326~/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-01-14 11:16:12.0 +
-+++
josm-plugins-0.0.0.20080326/validator/src/org/openstreetmap/josm/plugins/validator/tests/SpellCheck.java
2008-03-27 18:26:55.0 +
-@@ -504,7 +504,7 @@
- String key = prop.getKey();
- String value = prop.getValue();
- if( value == null || value.trim().length() == 0
)
-- commands.add( new
ChangePropertyCommand(Collections.singleton(primitives.get(i)), key, null) );
-+ commands.add( new
ChangePropertyCommand(Collections.singleton((OsmPrimitive)primitives.get(i)),
key, null) );
- else
- {
- String replacementKey =
spellCheckKeyData.get(key);
Deleted: packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
===
--- packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
2009-02-15 19:05:56 UTC (rev 1888)
+++ packages/josm-plugins/trunk/debian/patches/20_disable_svn.dpatch
2009-02-15 19:07:30 UTC (rev 1889)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_disable_svn.dpatch by Andreas Putzo
-##
-## DP: The validator and ywms plugins try to execute the svn command during
build.
-## DP: This patch disables t
[DebianGIS-dev] r1888 - packages/josm-plugins/trunk/debian
Author: gmascellani-guest
Date: 2009-02-15 19:05:56 + (Sun, 15 Feb 2009)
New Revision: 1888
Modified:
packages/josm-plugins/trunk/debian/changelog
packages/josm-plugins/trunk/debian/control
packages/josm-plugins/trunk/debian/master.xml
packages/josm-plugins/trunk/debian/rules
Log:
Bumping to last SVN release
Modified: packages/josm-plugins/trunk/debian/changelog
===
--- packages/josm-plugins/trunk/debian/changelog2009-02-15 18:18:46 UTC
(rev 1887)
+++ packages/josm-plugins/trunk/debian/changelog2009-02-15 19:05:56 UTC
(rev 1888)
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn13741-1) UNRELEASED; urgency=low
+
+ * New upstream revision
+
+ -- Giovanni Mascellani Sun, 15 Feb 2009 19:34:54
+0100
+
josm-plugins (0.0.0.20080518-1) unstable; urgency=low
* Upstream SVN revision number again available for plugins ywms and
Modified: packages/josm-plugins/trunk/debian/control
===
--- packages/josm-plugins/trunk/debian/control 2009-02-15 18:18:46 UTC (rev
1887)
+++ packages/josm-plugins/trunk/debian/control 2009-02-15 19:05:56 UTC (rev
1888)
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: Debian GIS Project
Uploaders: Giovanni Mascellani , Andreas Putzo
-Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev,
- josm (>= 0.0.0.20080512)
+Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), openjdk-6-jdk,
+ josm (>= 0.0.svn1387)
Standards-Version: 3.8.0
Homepage: http://josm.openstreetmap.de
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/josm-plugins/
@@ -12,7 +12,7 @@
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 @@
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
Modified: packages/josm-plugins/trunk/debian/master.xml
===
--- packages/josm-plugins/trunk/debian/master.xml 2009-02-15 18:18:46 UTC
(rev 1887)
+++ packages/josm-plugins/trunk/debian/master.xml 2009-02-15 19:05:56 UTC
(rev 1888)
@@ -14,58 +14,39 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
+
+
+
Modified: packages/josm-plugins/trunk/debian/rules
===
--- packages/josm-plugins/trunk/debian/rules2009-02-15 18:18:46 UTC (rev
1887)
+++ packages/josm-plugins/trunk/debian/rules2009-02-15 19:05:56 UTC (rev
1888)
@@ -14,29 +14,36 @@
DEB_ANT_CLEAN_TARGET := clean
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := colorscheme livegps namefinder slippymap utilsplugin validator
wmsplugin ywms slippy_map_chooser
+PLUGINS := colorscheme livegps slippymap utilsplugin validator wmsplugin
DATE := $(shell date +%Y%m%d)
+ifdef SVNREV
+VERSION := 0.0.svn${SVNREV}
+else
+VERSION := 0.0.0.${DATE}
+endif
+DESTDIR := ../tarballs/josm-plugins-${VERSION}
+DESTTGZ := ../tarballs/josm-plugins_${VERSION}.orig.tar.gz
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm-plugins from ${SVNREPO}
- @mkdir ../tarballs/josm-plugins-0.0.0.${DATE}
+ @mkdir ${DESTDIR}
@for plugin in $(PLUGINS); do \
echo "Fetching $$plugin plugin"; \
- svn export -r HEAD ${SVNREPO}/"$$plugin"
../tarballs/josm-plugins-0.0.0.${DATE}/"$$plugin"; \
+
[DebianGIS-dev] r1887 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-02-15 18:18:46 + (Sun, 15 Feb 2009) New Revision: 1887 Modified: packages/josm/trunk/debian/copyright Log: Copyright updated Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-02-15 17:51:01 UTC (rev 1886) +++ packages/josm/trunk/debian/copyright2009-02-15 18:18:46 UTC (rev 1887) @@ -108,3 +108,18 @@ Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java Copyright: Copyright (c) 2007 David Hansen License: GPL-2 + +Files: src/org/openstreetmap/josm/gui/ScrollViewport.java +Copyright: Copyright (c) 2007 Christian Gallioz +License: GPL-2 + +Files: src/org/openstreetmap/josm/gui/FileDrop.java +License: PD + code from: http://iharder.sourceforge.net/current/java/filedrop/ + (public domain) with only very small additions + . + The site linked above states: + I have released this software into the Public Domain. That means you + can do whatever you want with it. Really. You don't have to match it + up with any other open source license - just use it. You can rename + the files, move the Java packages, whatever you want. ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1886 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-02-15 17:51:01 + (Sun, 15 Feb 2009)
New Revision: 1886
Modified:
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Removing stale backup files from patches
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-02-15 17:48:25 UTC
(rev 1885)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-02-15 17:51:01 UTC
(rev 1886)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-01-23
22:22:10.0 +0100
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-02-15
18:45:19.0 +0100
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-02-15
18:50:17.0 +0100
@@ -47,6 +47,7 @@
public class AboutAction extends JosmAction {
@@ -45,223 +45,9 @@
info.add(new JLabel(tr("News about JOSM")),
GBC.std().insets(10,0,10,0));
info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";),
GBC.eol().fill(GBC.HORIZONTAL));
-diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java~
trunk/src/org/openstreetmap/josm/actions/AboutAction.java~
trunk~/src/org/openstreetmap/josm/actions/AboutAction.java~
1970-01-01 01:00:00.0 +0100
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java~ 2009-02-15
18:42:48.0 +0100
-@@ -0,0 +1,210 @@
-+//License: GPL. Copyright 2007 by Immanuel Scholz and others
-+package org.openstreetmap.josm.actions;
-+
-+import static org.openstreetmap.josm.tools.I18n.tr;
-+
-+import java.awt.Dimension;
-+import java.awt.Font;
-+import java.awt.GridBagLayout;
-+import java.awt.event.ActionEvent;
-+import java.awt.event.KeyEvent;
-+import java.io.BufferedReader;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.net.MalformedURLException;
-+import java.net.URL;
-+import java.util.regex.Matcher;
-+import java.util.regex.Pattern;
-+
-+import javax.swing.BorderFactory;
-+import javax.swing.JLabel;
-+import javax.swing.JOptionPane;
-+import javax.swing.JPanel;
-+import javax.swing.JScrollPane;
-+import javax.swing.JTabbedPane;
-+import javax.swing.JTextArea;
-+
-+import org.openstreetmap.josm.Main;
-+import org.openstreetmap.josm.plugins.PluginHandler;
-+import org.openstreetmap.josm.tools.GBC;
-+import org.openstreetmap.josm.tools.ImageProvider;
-+import org.openstreetmap.josm.tools.UrlLabel;
-+import org.openstreetmap.josm.tools.Shortcut;
-+
-+/**
-+ * Nice about screen. I guess every application need one these days.. *sigh*
-+ *
-+ * The REVISION resource is read and if present, it shows the revision
-+ * information of the jar-file.
-+ *
-+ * @author imi
-+ */
-+/**
-+ * @author Stephan
-+ *
-+ */
-+public class AboutAction extends JosmAction {
-+
-+private static final String version;
-+ public static final String debianRelease;
-+
-+private final static JTextArea revision;
-+private static String time;
-+
-+static {
-+URL u = Main.class.getResource("/REVISION");
-+if(u == null) {
-+try {
-+u = new URL("jar:" +
Main.class.getProtectionDomain().getCodeSource().getLocation().toString()
-++ "!/META-INF/MANIFEST.MF");
-+} catch (MalformedURLException e) {
-+e.printStackTrace();
-+}
-+}
-+revision = loadFile(u);
-+
-+Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+Matcher match = versionPattern.matcher(revision.getText());
-+version = match.matches() ? match.group(1) : tr("UNKNOWN");
-+
-+ Pattern debianReleasePattern =
Pattern.compile(".*?(?:Debian-Release): ([^\n]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+ match = debianReleasePattern.matcher(revision.getText());
-+ debianRelease = match.matches() ? match.group(1) :
tr("UNKNOWN");
-+
-+Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+match = timePattern.matcher(revision.getText());
-+time = match.matches() ? match.group(1) : tr("UNKNOWN");
-+}
-+
-+/**
-+ * Return string describing version.
-+ * Note that the strinc contains the version number plus an optional
suffix of " SVN" to indicate an unofficial development build.
-+ * @return version string
-+ */
-+static public String getVersionStrin
[DebianGIS-dev] r1885 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2009-02-15 17:48:25 + (Sun, 15 Feb 2009)
New Revision: 1885
Modified:
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Hope this is the last...
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2009-02-15 17:34:34 UTC
(rev 1884)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2009-02-15 17:48:25 UTC
(rev 1885)
@@ -5,90 +5,393 @@
## DP: Pattern match debian version in about dialog.
@DPATCH@
-diff -urNad
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-25 12:19:43.0 +0100
-+++ josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-25 12:20:52.0 +0100
-@@ -12,6 +12,7 @@
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.InputStreamReader;
-+import java.net.MalformedURLException;
- import java.net.URL;
- import java.util.Map.Entry;
- import java.util.regex.Matcher;
-@@ -46,19 +47,31 @@
+diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-01-23
22:22:10.0 +0100
trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-02-15
18:45:19.0 +0100
+@@ -47,6 +47,7 @@
public class AboutAction extends JosmAction {
- public static final String version;
+ private static final String version;
+ public static final String debianRelease;
- private final static JTextArea revision;
- private static String time;
+ private final static JTextArea revision;
+ private static String time;
+@@ -67,6 +68,10 @@
+ Matcher match = versionPattern.matcher(revision.getText());
+ version = match.matches() ? match.group(1) : tr("UNKNOWN");
- static {
- URL u = Main.class.getResource("/REVISION");
-- if(u == null) u =
Main.class.getResource("/META-INF/MANIFEST.MF");
++ Pattern debianReleasePattern =
Pattern.compile(".*?(?:Debian-Release): ([^\n]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ match = debianReleasePattern.matcher(revision.getText());
++ debianRelease = match.matches() ? match.group(1) :
tr("UNKNOWN");
++
+ Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+ match = timePattern.matcher(revision.getText());
+ time = match.matches() ? match.group(1) : tr("UNKNOWN");
+@@ -124,6 +129,8 @@
+ info.add(GBC.glue(0,10), GBC.eol());
+ info.add(new JLabel(tr("Version {0}",version)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
+ info.add(GBC.glue(0,5), GBC.eol());
++info.add(new JLabel(tr("Debian release: {0}",debianRelease)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
++info.add(GBC.glue(0,5), GBC.eol());
+ info.add(new JLabel(tr("Last change at {0}",time)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
+ info.add(GBC.glue(0,5), GBC.eol());
+ info.add(new JLabel(tr("Java Version
{0}",System.getProperty("java.version"))),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
+@@ -131,7 +138,7 @@
+ info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
+ info.add(new UrlLabel("http://josm.openstreetmap.de";),
GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
+-info.add(new UrlLabel("http://josm.openstreetmap.de/newticket";),
GBC.eol().fill(GBC.HORIZONTAL));
++ info.add(new UrlLabel("http://bugs.debian.org";),
GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(new JLabel(tr("News about JOSM")),
GBC.std().insets(10,0,10,0));
+ info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";),
GBC.eol().fill(GBC.HORIZONTAL));
+
+diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java~
trunk/src/org/openstreetmap/josm/actions/AboutAction.java~
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java~
1970-01-01 01:00:00.0 +0100
trunk/src/org/openstreetmap/josm/actions/AboutAction.java~ 2009-02-15
18:42:48.0 +0100
+@@ -0,0 +1,210 @@
++//License: GPL. Copyright 2007 by Immanuel Scholz and others
++package org.openstreetmap.josm.actions;
++
++import static org.openstreetmap.josm.tools.I18n.tr;
+
[DebianGIS-dev] r1884 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2009-02-15 17:34:34 + (Sun, 15 Feb 2009) New Revision: 1884 Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: Patch fixing should be over! :-) Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:27:02 UTC (rev 1883) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:34:34 UTC (rev 1884) @@ -5,10 +5,10 @@ ## DP: the dependencies into the target jar file. @DPATCH@ -diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml josm-0.0.svn1137~/build.xml2008-12-23 21:20:01.0 +0100 -+++ josm-0.0.svn1137/build.xml 2008-12-23 21:20:09.0 +0100 -@@ -1,41 +1,24 @@ +diff -urNad trunk~/build.xml trunk/build.xml +--- trunk~/build.xml 2008-12-16 09:38:35.0 +0100 trunk/build.xml2009-02-15 18:28:50.0 +0100 +@@ -1,39 +1,22 @@ - @@ -54,9 +54,7 @@ - - -@@ -49,16 +34,21 @@ +@@ -51,16 +34,21 @@ @@ -79,7 +77,7 @@ -@@ -68,6 +58,7 @@ +@@ -70,6 +58,7 @@ target="1.5" source="1.5" debug="on" encoding="UTF-8"> @@ -87,7 +85,7 @@ -@@ -78,6 +69,7 @@ +@@ -80,6 +69,7 @@ @@ -95,10 +93,10 @@ -diff -urNad josm-0.0.svn1137~/i18n/build.xml josm-0.0.svn1137/i18n/build.xml josm-0.0.svn1137~/i18n/build.xml 2008-12-23 21:20:01.0 +0100 -+++ josm-0.0.svn1137/i18n/build.xml2008-12-23 21:20:27.0 +0100 -@@ -41,7 +41,13 @@ +diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml +--- trunk~/i18n/build.xml 2009-02-08 22:44:59.0 +0100 trunk/i18n/build.xml 2009-02-15 18:33:34.0 +0100 +@@ -45,7 +45,13 @@ @@ -112,15 +110,15 @@ + - -@@ -55,29 +61,37 @@ - + +@@ -69,10 +75,13 @@ + -- -+ ++ + -+ - -- -+ + ++--> @@ -150,17 +141,18 @@ + + -- -+ + ++--> - -@@ -92,6 +106,7 @@ - - + +@@ -107,6 +125,7 @@ + + + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1883 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2009-02-15 17:27:02 + (Sun, 15 Feb 2009) New Revision: 1883 Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: First chunk of patch modification fixed Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:21:49 UTC (rev 1882) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:27:02 UTC (rev 1883) @@ -51,8 +51,8 @@ + --> - - - + + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1882 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2009-02-15 17:21:49 + (Sun, 15 Feb 2009) New Revision: 1882 Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: Patch was badly updated Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:18:37 UTC (rev 1881) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:21:49 UTC (rev 1882) @@ -8,7 +8,7 @@ diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml --- josm-0.0.svn1137~/build.xml2008-12-23 21:20:01.0 +0100 +++ josm-0.0.svn1137/build.xml 2008-12-23 21:20:09.0 +0100 -@@ -1,39 +1,24 @@ +@@ -1,41 +1,24 @@ - ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1881 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2009-02-15 17:18:37 + (Sun, 15 Feb 2009) New Revision: 1881 Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: Patches updated to last revision Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:17:07 UTC (rev 1880) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-02-15 17:18:37 UTC (rev 1881) @@ -51,8 +51,8 @@ + --> - -+ -+ + + ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1880 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-02-15 17:17:07 + (Sun, 15 Feb 2009) New Revision: 1880 Modified: packages/josm/trunk/debian/changelog Log: Update to last tested revision Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-02-15 17:13:42 UTC (rev 1879) +++ packages/josm/trunk/debian/changelog2009-02-15 17:17:07 UTC (rev 1880) @@ -1,4 +1,4 @@ -josm (0.0.svn1137-1) UNRELEASED; urgency=low +josm (0.0.svn1387-1) UNRELEASED; urgency=low [ Giovanni Mascellani ] * New upstream SVN release. (Closes: #509239) @@ -15,7 +15,7 @@ * Add copyright holders of NmeaReader.java, Changeset.java, TigerUtils.java to debian/copyright. - -- Andreas Putzo Mon, 02 Feb 2009 20:47:19 + + -- Giovanni Mascellani Sun, 15 Feb 2009 18:14:56 +0100 josm (0.0.0.20080713-1) unstable; urgency=low ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1879 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-02-15 17:13:42 + (Sun, 15 Feb 2009) New Revision: 1879 Modified: packages/josm/trunk/debian/changelog Log: Rubbish removed Modified: packages/josm/trunk/debian/changelog === --- packages/josm/trunk/debian/changelog2009-02-15 10:49:41 UTC (rev 1878) +++ packages/josm/trunk/debian/changelog2009-02-15 17:13:42 UTC (rev 1879) @@ -17,39 +17,6 @@ -- Andreas Putzo Mon, 02 Feb 2009 20:47:19 + -josm (0.0.svn1137-0.4) unstable; urgency=low - - * Fixed icons issue? - * Must verify behaivour for unexisting icons - - -- Giovanni Mascellani Tue, 23 Dec 2008 14:31:53 +0100 - -josm (0.0.svn1137-0.3) unstable; urgency=low - - * Fixed classpath issue - * Fixed icons issue? - - -- Giovanni Mascellani Tue, 23 Dec 2008 14:12:37 +0100 - -josm (0.0.svn1137-0.2) unstable; urgency=low - - * Fixed classpath issue? - - -- Giovanni Mascellani Tue, 23 Dec 2008 13:15:50 +0100 - -josm (0.0.svn1137-0.1) unstable; urgency=low - - * New upstream SVN release. (Closes: #509239) -- dpatch/*: fixed to comply with new upstream code - * Added optional dependencies against sun-java5-jre and sun-java6-jre. -(Closes: #496861) - * Added desktop file present in Ubuntu, thanks to Nathan Handler. -(Closes: #498431) - * Shell wrapper now recognizes JAVA_OPTS environment variable. -(Closes: #497559) - - -- Giovanni Mascellani Tue, 23 Dec 2008 12:03:09 +0100 - josm (0.0.0.20080713-1) unstable; urgency=low [ Giovanni Mascellani ] ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1855 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-02-03 13:37:29 + (Tue, 03 Feb 2009) New Revision: 1855 Modified: packages/josm/trunk/debian/copyright Log: Updated my copyright years Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-02-03 00:22:55 UTC (rev 1854) +++ packages/josm/trunk/debian/copyright2009-02-03 13:37:29 UTC (rev 1855) @@ -25,7 +25,7 @@ Files: debian/* Copyright: Copyright (c) 2007-2009 Andreas Putzo Copyright (c) 2008 Petter Reinholdtsen - Copyright (c) 2008 Giovanni Mascellani + Copyright (c) 2008-2009 Giovanni Mascellani License: GPL-2+ The Debian packaging information is under the GPL, version 2 or later. On Debian GNU/Linux systems, the complete text of the GNU General Public License ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1849 - packages/josm/trunk/debian
Author: gmascellani-guest Date: 2009-01-30 11:25:54 + (Fri, 30 Jan 2009) New Revision: 1849 Modified: packages/josm/trunk/debian/copyright Log: Updated to current release status Modified: packages/josm/trunk/debian/copyright === --- packages/josm/trunk/debian/copyright2009-01-19 21:39:38 UTC (rev 1848) +++ packages/josm/trunk/debian/copyright2009-01-30 11:25:54 UTC (rev 1849) @@ -17,6 +17,10 @@ Copyright (c) 2007-2008 David Earl Copyright (c) 2007-2008 Ulf Lamping Copyright (c) 2007-2008 Raphael Mack + Copyright (c) 2008 Christian Gallioz + Copyright (c) 2008 Christoph Brill + Copyright (c) 2007 Martijn van Oosterhout + Copyright (c) 2007 Dave Hansen License: GPL-2+ Josm is distributed under the GPL, version 2 or later. On Debian GNU/Linux systems, the complete text of the GNU General Public License Version 2 can be @@ -92,5 +96,7 @@ not be claimed or implied. Files: src/org/openstreetmap/josm/data/projection/Ellipsoid.java + src/org/openstreetmap/josm/data/projection/LambertEST.java + src/org/openstreetmap/josm/data/projection/Lambert.java Copyright: Copyright (c) 2002 Johan Montagnat License: GPL-2 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1845 - packages/josm-plugins/tags
Author: gmascellani-guest Date: 2009-01-19 13:32:14 + (Mon, 19 Jan 2009) New Revision: 1845 Added: packages/josm-plugins/tags/0.0.0.20080518-1/ Log: Tagging josm-plugins 0.0.0.20080518-1 Copied: packages/josm-plugins/tags/0.0.0.20080518-1 (from rev 1844, packages/josm-plugins/trunk) ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1844 - packages/josm/tarballs
Author: gmascellani-guest Date: 2009-01-19 13:16:24 + (Mon, 19 Jan 2009) New Revision: 1844 Added: packages/josm/tarballs/josm_0.0.svn1137.orig.tar.gz Log: Added josm 0.0.svn1137 tarball Added: packages/josm/tarballs/josm_0.0.svn1137.orig.tar.gz === (Binary files differ) Property changes on: packages/josm/tarballs/josm_0.0.svn1137.orig.tar.gz ___ Name: svn:mime-type + application/octet-stream ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1829 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2008-12-26 14:30:20 + (Fri, 26 Dec 2008)
New Revision: 1829
Modified:
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Version, Debian release and last commit date are shown in the "About" dialog
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2008-12-24 17:11:09 UTC
(rev 1828)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2008-12-26 14:30:20 UTC
(rev 1829)
@@ -6,18 +6,58 @@
@DPATCH@
diff -urNad
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-23 11:56:50.0 +0100
-+++ josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-23 11:57:49.0 +0100
-@@ -55,7 +55,7 @@
- if(u == null) u =
Main.class.getResource("/META-INF/MANIFEST.MF");
+--- josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-25 12:19:43.0 +0100
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-25 12:20:52.0 +0100
+@@ -12,6 +12,7 @@
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
++import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.Map.Entry;
+ import java.util.regex.Matcher;
+@@ -46,19 +47,31 @@
+ public class AboutAction extends JosmAction {
+
+ public static final String version;
++ public static final String debianRelease;
+
+ private final static JTextArea revision;
+ private static String time;
+
+ static {
+ URL u = Main.class.getResource("/REVISION");
+- if(u == null) u =
Main.class.getResource("/META-INF/MANIFEST.MF");
++if(u == null) {
++try {
++u = new URL("jar:" +
Main.class.getProtectionDomain().getCodeSource().getLocation().toString()
+++ "!/META-INF/MANIFEST.MF");
++} catch (MalformedURLException e) {
++e.printStackTrace();
++}
++}
revision = loadFile(u);
- Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+ Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -86,7 +86,7 @@
++ Pattern debianReleasePattern =
Pattern.compile(".*?(?:Debian-Release): ([^\n]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ match = debianReleasePattern.matcher(revision.getText());
++ debianRelease = match.matches() ? match.group(1) :
tr("UNKNOWN");
++
+ Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+ match = timePattern.matcher(revision.getText());
+ time = match.matches() ? match.group(1) : tr("UNKNOWN");
+@@ -80,13 +93,14 @@
+
+ JPanel info = new JPanel(new GridBagLayout());
+ info.add(new JLabel(tr("Java OpenStreetMap Editor Version
{0}",version)), GBC.eol().fill(GBC.HORIZONTAL));
++ info.add(new JLabel(tr("Debian release: {0}",debianRelease)),
GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(new JLabel(tr("last change at {0}",time)),
GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(new JLabel(tr("Java Version
{0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL));
+ info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Homepage")),
GBC.std().insets(0,0,10,0));
info.add(new UrlLabel("http://josm.openstreetmap.de";),
GBC.eol().fill(GBC.HORIZONTAL));
info.add(new JLabel(tr("Bug Reports")),
GBC.std().insets(0,0,10,0));
@@ -27,8 +67,8 @@
info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";),
GBC.eol().fill(GBC.HORIZONTAL));
diff -urNad
josm-0.0.svn1137~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
josm-0.0.svn1137/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
josm-0.0.
[DebianGIS-dev] r1819 - packages/josm/trunk/debian/patches
Author: gmascellani-guest Date: 2008-12-23 20:48:23 + (Tue, 23 Dec 2008) New Revision: 1819 Modified: packages/josm/trunk/debian/patches/10_build.dpatch Log: * Debian release written in the jar's manifest file * Some little refactoring: some compiling stuff was in dist target Modified: packages/josm/trunk/debian/patches/10_build.dpatch === --- packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-23 20:46:27 UTC (rev 1818) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-23 20:48:23 UTC (rev 1819) @@ -6,9 +6,9 @@ @DPATCH@ diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml josm-0.0.svn1137~/build.xml2008-12-23 13:14:33.0 +0100 -+++ josm-0.0.svn1137/build.xml 2008-12-23 13:15:06.0 +0100 -@@ -1,39 +1,25 @@ +--- josm-0.0.svn1137~/build.xml2008-12-23 21:20:01.0 +0100 josm-0.0.svn1137/build.xml 2008-12-23 21:20:09.0 +0100 +@@ -1,39 +1,24 @@ - @@ -32,14 +32,14 @@ - - - - +- - - - - - - -- + - + - -+ --> + + -@@ -49,16 +35,18 @@ +@@ -49,16 +34,21 @@ -+ ++ + ++ ++ - @@ -72,11 +74,20 @@ ++ + -@@ -78,6 +66,7 @@ +@@ -68,6 +58,7 @@ + target="1.5" source="1.5" debug="on" encoding="UTF-8"> + + ++ + + + +@@ -78,6 +69,7 @@ @@ -85,22 +96,30 @@ diff -urNad josm-0.0.svn1137~/i18n/build.xml josm-0.0.svn1137/i18n/build.xml josm-0.0.svn1137~/i18n/build.xml 2008-12-23 13:14:33.0 +0100 -+++ josm-0.0.svn1137/i18n/build.xml2008-12-23 13:14:42.0 +0100 -@@ -41,7 +41,7 @@ +--- josm-0.0.svn1137~/i18n/build.xml 2008-12-23 21:20:01.0 +0100 josm-0.0.svn1137/i18n/build.xml2008-12-23 21:20:27.0 +0100 +@@ -41,7 +41,13 @@ - -+ ++ ++ ++ ++ ++ ++ ++ -@@ -55,29 +55,33 @@ +@@ -55,29 +61,37 @@ - ++ ++ + -+ + + + ++ + + + - - - ++ ++ - +
[DebianGIS-dev] r1818 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2008-12-23 20:46:27 + (Tue, 23 Dec 2008)
New Revision: 1818
Modified:
packages/josm/trunk/debian/rules
Log:
* Revision is got from upstream SVN
* Some refactoring, moving all magic strings to constants
Modified: packages/josm/trunk/debian/rules
===
--- packages/josm/trunk/debian/rules2008-12-23 14:23:06 UTC (rev 1817)
+++ packages/josm/trunk/debian/rules2008-12-23 20:46:27 UTC (rev 1818)
@@ -7,6 +7,7 @@
JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
ANT_HOME := /usr/share/ant
+ANT_ARGS := -Ddebian.version=${DEB_VERSION}
DEB_ANT_BUILD_TARGET := dist
# Dependencies
@@ -17,19 +18,16 @@
SVNREPO := http://josm.openstreetmap.de/svn/trunk
SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/
+
DATE := $(shell date +%Y%m%d)
ifdef SVNREV
VERSION := 0.0.svn${SVNREV}
else
VERSION := 0.0.0.${DATE}
endif
+DESTDIR := ../tarballs/josm-${VERSION}
+DESTTGZ := ../tarballs/josm_${VERSION}.orig.tar.gz
-clean::
- dh_clean $(CURDIR)/REVISION
-
-configure/josm::
- echo Revision: ${DEB_VERSION} > $(CURDIR)/REVISION
-
install/josm::
install -m 644 $(CURDIR)/dist/josm-custom.jar
$(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
usr/share/josm/josm.jar
@@ -42,19 +40,22 @@
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@echo Downloading josm from ${SVNREPO}
- svn export -r ${SVNREV} --ignore-externals ${SVNREPO}
../tarballs/josm-${VERSION}
+ svn export -r ${SVNREV} --ignore-externals ${SVNREPO} ${DESTDIR}
@echo Removing jar files and test data
- find ../tarballs/josm-${VERSION} -name "*.jar" -exec rm -v {} \;
- rm -f ../tarballs/josm-${VERSION}/data/*
+ find ${DESTDIR} -name "*.jar" -exec rm -v {} \;
+ rm -f ${DESTDIR}/data/*
@echo Removing icons directory
- rm -rf ../tarballs/josm-${VERSION}/styles/standard/icons/
+ rm -rf ${DESTDIR}/styles/standard/icons/
+ @echo Fetching revision metadata
+ svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
@echo Fetching internalization data...
- svn export ${SVNI18NREPO} ../tarballs/josm-${VERSION}/i18n
+ svn export ${SVNI18NREPO} ${DESTDIR}/i18n
@echo Building snapshot tarball
- tar czf ../tarballs/josm_${VERSION}.orig.tar.gz -C ../tarballs
josm-${VERSION}
+ tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up
- rm -rf ../tarballs/josm-${VERSION}
+ rm -rf ${DESTDIR}
@echo .
@echo To update debian/changelog type
@echo dch -v ${VERSION}-1
@echo .
+
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1817 - packages/josm/trunk/debian
Author: gmascellani-guest
Date: 2008-12-23 14:23:06 + (Tue, 23 Dec 2008)
New Revision: 1817
Modified:
packages/josm/trunk/debian/changelog
Log:
Last changelog checkin was an error!
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2008-12-23 14:21:07 UTC (rev
1816)
+++ packages/josm/trunk/debian/changelog2008-12-23 14:23:06 UTC (rev
1817)
@@ -1,7 +1,14 @@
-josm (0.0.svn1137-0.5) unstable; urgency=low
+josm (0.0.svn1137-1) UNRELEASED; urgency=low
- * Added ${misc:Depends} into dependencies
- * Fixed icon issue
+ * New upstream SVN release. (Closes: #509239)
+- dpatch/*: fixed to comply with new upstream code.
+ * Added ${misc:Depends} into dependencies.
+ * Added optional dependencies against sun-java5-jre and sun-java6-jre.
+(Closes: #496861)
+ * Added desktop file present in Ubuntu, thanks to Nathan Handler.
+(Closes: #498431)
+ * Shell wrapper now recognizes JAVA_OPTS environment variable.
+(Closes: #497559)
-- Giovanni Mascellani Tue, 23 Dec 2008 15:08:59
+0100
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1816 - in packages/josm/trunk/debian: . patches
Author: gmascellani-guest
Date: 2008-12-23 14:21:07 + (Tue, 23 Dec 2008)
New Revision: 1816
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/control
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Added ${misc:Depends} to dependencies
Modified: packages/josm/trunk/debian/changelog
===
--- packages/josm/trunk/debian/changelog2008-12-23 12:23:04 UTC (rev
1815)
+++ packages/josm/trunk/debian/changelog2008-12-23 14:21:07 UTC (rev
1816)
@@ -1,5 +1,32 @@
-josm (0.0.0.20081222-1) UNRELEASED; urgency=low
+josm (0.0.svn1137-0.5) unstable; urgency=low
+ * Added ${misc:Depends} into dependencies
+ * Fixed icon issue
+
+ -- Giovanni Mascellani Tue, 23 Dec 2008 15:08:59
+0100
+
+josm (0.0.svn1137-0.4) unstable; urgency=low
+
+ * Fixed icons issue?
+ * Must verify behaivour for unexisting icons
+
+ -- Giovanni Mascellani Tue, 23 Dec 2008 14:31:53
+0100
+
+josm (0.0.svn1137-0.3) unstable; urgency=low
+
+ * Fixed classpath issue
+ * Fixed icons issue?
+
+ -- Giovanni Mascellani Tue, 23 Dec 2008 14:12:37
+0100
+
+josm (0.0.svn1137-0.2) unstable; urgency=low
+
+ * Fixed classpath issue?
+
+ -- Giovanni Mascellani Tue, 23 Dec 2008 13:15:50
+0100
+
+josm (0.0.svn1137-0.1) unstable; urgency=low
+
* New upstream SVN release. (Closes: #509239)
- dpatch/*: fixed to comply with new upstream code
* Added optional dependencies against sun-java5-jre and sun-java6-jre.
@@ -9,7 +36,7 @@
* Shell wrapper now recognizes JAVA_OPTS environment variable.
(Closes: #497559)
- -- Giovanni Mascellani Mon, 22 Dec 2008 23:49:41
+0100
+ -- Giovanni Mascellani Tue, 23 Dec 2008 12:03:09
+0100
josm (0.0.0.20080713-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/control
===
--- packages/josm/trunk/debian/control 2008-12-23 12:23:04 UTC (rev 1815)
+++ packages/josm/trunk/debian/control 2008-12-23 14:21:07 UTC (rev 1816)
@@ -12,7 +12,7 @@
Package: josm
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre,
libgettext-commons-java, libmetadata-extractor-java,
openstreetmap-map-icons-classic
+Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre,
libgettext-commons-java, libmetadata-extractor-java,
openstreetmap-map-icons-classic, ${misc:Depends}
Recommends: josm-plugins
Description: Editor for OpenStreetMap
JOSM is an editor for OpenStreetMap (OSM) written in Java.
Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-12-23
12:23:04 UTC (rev 1815)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-12-23
14:21:07 UTC (rev 1816)
@@ -6,14 +6,19 @@
## DP: Point josm to the correct directory so that the icons are found.
@DPATCH@
-diff -urNad
josm-0.0.0.20081222~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
josm-0.0.0.20081222/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
josm-0.0.0.20081222~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
2008-09-21 14:03:38.0 +0200
-+++
josm-0.0.0.20081222/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
2008-12-23 00:00:20.0 +0100
-@@ -149,6 +149,7 @@
- for (int count=0; counthttp://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] r1815 - packages/josm/trunk/debian/patches
Author: gmascellani-guest
Date: 2008-12-23 12:23:04 + (Tue, 23 Dec 2008)
New Revision: 1815
Modified:
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Adapt to upstream rev 1137
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===
--- packages/josm/trunk/debian/patches/20_bts.dpatch2008-12-23 12:22:44 UTC
(rev 1814)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch2008-12-23 12:23:04 UTC
(rev 1815)
@@ -5,19 +5,19 @@
## DP: Pattern match debian version in about dialog.
@DPATCH@
-diff -urNad
josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-22 22:41:42.0 +0100
-+++ josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-22 22:41:50.0 +0100
-@@ -67,7 +67,7 @@
- }
+diff -urNad
josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm-0.0.svn1137~/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-23 11:56:50.0 +0100
josm-0.0.svn1137/src/org/openstreetmap/josm/actions/AboutAction.java
2008-12-23 11:57:49.0 +0100
+@@ -55,7 +55,7 @@
+ if(u == null) u =
Main.class.getResource("/META-INF/MANIFEST.MF");
revision = loadFile(u);
-- Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+ Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*(?: SVN)?).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+- Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ Pattern versionPattern =
Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*).*",
Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -125,7 +125,7 @@
+@@ -86,7 +86,7 @@
info.add(new JLabel(tr("Homepage")),
GBC.std().insets(0,0,10,0));
info.add(new UrlLabel("http://josm.openstreetmap.de";),
GBC.eol().fill(GBC.HORIZONTAL));
info.add(new JLabel(tr("Bug Reports")),
GBC.std().insets(0,0,10,0));
@@ -26,9 +26,9 @@
info.add(new JLabel(tr("News about JOSM")),
GBC.std().insets(0,0,10,0));
info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";),
GBC.eol().fill(GBC.HORIZONTAL));
-diff -urNad
josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2008-12-22 22:41:42.0 +0100
-+++
josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2008-12-22 22:42:28.0 +0100
+diff -urNad
josm-0.0.svn1137~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
josm-0.0.svn1137/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+---
josm-0.0.svn1137~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2008-12-23 11:56:50.0 +0100
josm-0.0.svn1137/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2008-12-23 11:56:59.0 +0100
@@ -91,8 +91,8 @@
Object[] options = new String[]{tr("Do nothing"),
tr("Report Bug")};
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
