[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch: commit 57ec0d937319fbebccbaea43727266092d5e9f3d Merge: f38f6cd48927630b45cd17d30611c83a10228933 d934031ef1f16c85b77277ed4ac539601e388903 Author: David Paleino da...@debian.org Date: Fri Apr 5 10:21:25 2013 +0200 Merge tag 'upstream/0.0.svn5759+dfsg1' Upstream version 0.0.svn5759+dfsg1 # gpg: Signature made ven 05 apr 2013 10:21:19 CEST using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch: commit f67e9e5eadc07ac8991a86ab4a5a5e5e4d12c345 Author: David Paleino da...@debian.org Date: Fri Apr 5 10:22:03 2013 +0200 New tested snapshot. diff --git a/debian/changelog b/debian/changelog index 793d9cd..707c515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn5759+dfsg1-1) UNRELEASED; urgency=low + + * New tested snapshot. + + -- David Paleino da...@debian.org Fri, 05 Apr 2013 10:21:52 +0200 + josm (0.0.svn5608+dfsg1-2) unstable; urgency=low * Updated manpage (Closes: #696692). -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch:
commit a824e7547aa5c4a9438331fe2cfa3e3d58f678f4
Author: David Paleino da...@debian.org
Date: Fri Apr 5 10:22:50 2013 +0200
Patches refreshed
diff --git a/debian/patches/02-elemstyles.patch
b/debian/patches/02-elemstyles.patch
index d55d772..01f98a1 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -39,15 +39,15 @@ applications. This patch points josm to the shared
directories.
--- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -65,6 +65,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -72,6 +72,7 @@ import org.openstreetmap.josm.gui.QuadSt
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.preferences.SourceEntry;
+ import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import
org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1284,12 +1285,22 @@ public class TaggingPreset extends Abstr
+@@ -1378,12 +1379,22 @@ public class TaggingPreset extends Abstr
}
protected static ImageIcon loadImageIcon(String iconName, File zipIcons,
Integer maxSize) {
@@ -73,7 +73,7 @@ applications. This patch points josm to the shared
directories.
}
/*
-@@ -1300,8 +1311,15 @@ public class TaggingPreset extends Abstr
+@@ -1394,8 +1405,15 @@ public class TaggingPreset extends Abstr
* and the 16x16 icons for SMALL_ICON.
*/
public void setIcon(final String iconName) {
@@ -91,7 +91,7 @@ applications. This patch points josm to the shared
directories.
imgProv.setDirs(s);
imgProv.setId(presets);
imgProv.setArchive(TaggingPreset.zipIcons);
-@@ -1318,7 +1336,7 @@ public class TaggingPreset extends Abstr
+@@ -1412,7 +1430,7 @@ public class TaggingPreset extends Abstr
}
});
} else {
diff --git a/debian/patches/06-move_data_out_of_jar.patch
b/debian/patches/06-move_data_out_of_jar.patch
index 7489cf7..5ef77c8 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -33,7 +33,7 @@ Forwarded: not-needed
!-- zipfileset src=lib/metadata-extractor-2.3.1-nosun.jar/
--
--- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
+++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -1511,7 +1511,7 @@ public class Preferences {
+@@ -1519,7 +1519,7 @@ public class Preferences {
public void validateXML(Reader in) throws Exception {
SchemaFactory factory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
@@ -44,7 +44,7 @@ Forwarded: not-needed
}
--- josm.orig/src/org/openstreetmap/josm/data/projection/Projections.java
+++ josm/src/org/openstreetmap/josm/data/projection/Projections.java
-@@ -121,7 +121,7 @@ public class Projections {
+@@ -124,7 +124,7 @@ public class Projections {
private static void loadInits() {
Pattern epsgPattern = Pattern.compile((\\d+)(.*));
try {
@@ -122,7 +122,7 @@ Forwarded: not-needed
--- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -1411,7 +1411,7 @@ public class TaggingPreset extends Abstr
+@@ -1505,7 +1505,7 @@ public class TaggingPreset extends Abstr
ListPresetListEntry listEntries = new LinkedListPresetListEntry();
if (validate) {
--
Editor for OpenStreetMap
___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch: commit 38ae847a7ca70bd7db2aecb8c2cac5bb00ddf84c Author: David Paleino da...@debian.org Date: Fri Apr 5 17:28:47 2013 +0200 Fix hyphen-used-as-minus-sign in manpage. diff --git a/debian/changelog b/debian/changelog index 03411d5..f6a6275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn5759+dfsg1-2) UNRELEASED; urgency=low + + * Fix hyphen-used-as-minus-sign in manpage. + + -- David Paleino da...@debian.org Fri, 05 Apr 2013 17:28:31 +0200 + josm (0.0.svn5759+dfsg1-1) experimental; urgency=low * New tested snapshot. diff --git a/debian/josm.1 b/debian/josm.1 index 4a1a0b9..ca89779 100644 --- a/debian/josm.1 +++ b/debian/josm.1 @@ -57,7 +57,7 @@ Set the preference \fIkey\fR to \fIvalue\fR. \fB\-\-language=\fIlanguage\fR Set the language. .SH JAVA PROPERTIES -The following options can be set by using Java system properties (i.e. -Dkey=value +The following options can be set by using Java system properties (i.e. \-Dkey=value passed to \fBjava\fR, or specified inside \fBJAVA_OPTS\fR). .TP \fBjosm.home=\fIpath\fR @@ -69,7 +69,7 @@ Specify an alternate Java environment. .IP JAVA_OPTS Specify Java options. For example, to use a HTTP proxy server with this program, set this environment variable -to something like \fIJAVA_OPTS=-Dhttp.proxyHost=yourProxyURL\fR before starting josm. +to something like \fIJAVA_OPTS=\-Dhttp.proxyHost=yourProxyURL\fR before starting josm. .SH AUTHOR josm was written by Immanuel Scholz. The current maintainer is Dirk Stöcker. -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
