[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4487+dfsg2-2-11-gde5e00f
David Paleino
dapal at debian.org
Sat Nov 5 17:53:58 UTC 2011
The following commit has been merged in the master branch:
commit 9014613eb716c374a29b1b5b91e31dc4f532b7d0
Author: David Paleino <dapal at debian.org>
Date: Sat Nov 5 17:08:45 2011 +0100
Patches refreshed
diff --git a/debian/changelog b/debian/changelog
index af84939..b9af70a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn4550+dfsg1-1) UNRELEASED; urgency=low
* New upstream version (Closes: #647634)
* Added missing dependency on ant (Closes: #644449)
+ * Patches refreshed
- -- David Paleino <dapal at debian.org> Sat, 05 Nov 2011 16:56:04 +0100
+ -- David Paleino <dapal at debian.org> Sat, 05 Nov 2011 17:08:39 +0100
josm (0.0.svn4487+dfsg2-2) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 9e7f288..f55f2af 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -8,8 +8,8 @@ JARs and not depend on Internet connection.
---
build.xml | 48 ++++++++++++++++++++++++------------------------
- i18n/build.xml | 26 ++++++++++++++++----------
- 2 files changed, 40 insertions(+), 34 deletions(-)
+ i18n/build.xml | 33 ++++++++++++++++-----------------
+ 2 files changed, 40 insertions(+), 41 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -175,23 +175,27 @@ JARs and not depend on Internet connection.
- </foreach>
+ <touch file="build-timestamp"/>
</target>
- <target name="coretrans">
- <mkdir dir="${po.build.dir}/core"/>
-@@ -93,11 +93,17 @@
- </then>
+ <target name="buildcore" depends="po/josm.pot,init">
+ <gettext-merge keysFile="josm.pot" poDirectory="po"/>
+@@ -98,15 +98,14 @@
</if>
+ <delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
-+ <target name="dist" depends="build">
-+ <copy todir="../build">
-+ <fileset dir="build"/>
-+ </copy>
-+ </target>
++ <target name="dist" depends="build">
++ <copy todir="../build">
++ <fileset dir="build"/>
++ </copy>
++ </target>
<target name="clean">
<delete dir="${i18n.build.dir}"/>
- <delete file="po/josm.pot"/>
- <delete>
- <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
- </delete>
+- <delete file="po/josm.pot"/>
+- <delete>
+- <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
+- </delete>
+- <delete>
+- <fileset dir="po" includes="*.po" defaultexcludes="false"/>
+- </delete>
+ <delete file="build-timestamp"/>
</target>
- </project>
+ <target name="test">
+ <mkdir dir="${i18n.build.dir}/test"/>
diff --git a/debian/patches/100-fix_SlippyMapBBoxChooser.patch b/debian/patches/100-fix_SlippyMapBBoxChooser.patch
index 494a41a..c997681 100644
--- a/debian/patches/100-fix_SlippyMapBBoxChooser.patch
+++ b/debian/patches/100-fix_SlippyMapBBoxChooser.patch
@@ -4,47 +4,9 @@ Origin: vendor
Forwarded: no
---
- src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java | 6 +++---
- src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java | 10 +++++++---
- 2 files changed, 10 insertions(+), 6 deletions(-)
+ src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
---- josm.orig/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
-+++ josm/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
-@@ -72,12 +72,16 @@ public class SlippyMapBBoxChooser extend
-
- @Override public Image getAttributionImage() { return source.getAttributionImage(); }
-
-+ @Override public String getAttributionImageURL() { return source.getAttributionImageURL(); }
-+
- @Override public String getAttributionText(int zoom, Coordinate topLeft, Coordinate botRight) { return source.getAttributionText(zoom, topLeft, botRight); }
-
- @Override public boolean requiresAttribution() { return source.requiresAttribution(); }
-
- @Override public String getAttributionLinkURL() { return source.getAttributionLinkURL(); }
-
-+ @Override public String getTermsOfUseText() { return source.getTermsOfUseText(); }
-+
- @Override public String getTermsOfUseURL() { return source.getTermsOfUseURL(); }
-
- @Override public double latToTileY(double lat, int zoom) { return source.latToTileY(lat,zoom); }
-@@ -220,14 +224,14 @@ public class SlippyMapBBoxChooser extend
-
- /* TODO: Somehow indicate the link is clickable state to user */
-
-- if ((attrImageBounds != null && attrImageBounds.contains(p))
-- || (attrTextBounds != null && attrTextBounds.contains(p))) {
-+ if ((attribution.attrImageBounds != null && attribution.attrImageBounds.contains(p))
-+ || (attribution.attrTextBounds != null && attribution.attrTextBounds.contains(p))) {
- if (click)
- OpenBrowser.displayUrl(ts.getAttributionLinkURL());
- /*else
- Main.warn(ts.getAttributionLinkURL());*/
- return true;
-- } else if (attrToUBounds != null && attrToUBounds.contains(p)) {
-+ } else if (attribution.attrToUBounds != null && attribution.attrToUBounds.contains(p)) {
- if (click)
- OpenBrowser.displayUrl(ts.getTermsOfUseURL());
- /*else
--- josm.orig/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
+++ josm/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
@@ -27,9 +27,9 @@ public class AttributionSupport {
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index b4350f7..ac70e57 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -2420,7 +2420,7 @@ are supplied, then "values" will be trea
+@@ -2428,7 +2428,7 @@ are supplied, then "values" will be trea
<key key="amenity" value="theatre" />
<text key="name" text="Name" default="" delete_if_empty="true" />
</item>
@@ -18,7 +18,7 @@ Forwarded: not-needed
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
<label text="Edit Library" />
-@@ -2630,7 +2630,7 @@ are supplied, then "values" will be trea
+@@ -2638,7 +2638,7 @@ are supplied, then "values" will be trea
<space />
</item>
<separator/>
diff --git a/debian/patches/series b/debian/patches/series
index 0b885d9..eacd6fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
70-default_look_and_feel.patch
80-fix_images.patch
90-fix_version.patch
-100-fix_SlippyMapBBoxChooser.patch
+#100-fix_SlippyMapBBoxChooser.patch
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list