[DebianGIS-dev] r1585 - in packages/josm/trunk/debian: . patches
gmascellani-guest at alioth.debian.org
gmascellani-guest at alioth.debian.org
Sun May 18 16:03:57 UTC 2008
Author: gmascellani-guest
Date: 2008-05-18 16:03:56 +0000 (Sun, 18 May 2008)
New Revision: 1585
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
New upstream checkout. Patches modified in order to get on well
with upstream changes.
Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog 2008-05-18 16:00:50 UTC (rev 1584)
+++ packages/josm/trunk/debian/changelog 2008-05-18 16:03:56 UTC (rev 1585)
@@ -1,3 +1,9 @@
+josm (0.0.0.20080518-1) UNRELEASED; urgency=low
+
+ * New upstream SVN checkout
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Sun, 18 May 2008 16:49:31 +0200
+
josm (0.0.0.20080510-1) unstable; urgency=low
[ Giovanni Mascellani ]
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch 2008-05-18 16:00:50 UTC (rev 1584)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch 2008-05-18 16:03:56 UTC (rev 1585)
@@ -5,30 +5,30 @@
## DP: Pattern match debian version in about dialog.
@DPATCH@
-diff -urNad josm-1.6~svn320~/src/org/openstreetmap/josm/actions/AboutAction.java josm-1.6~svn320/src/org/openstreetmap/josm/actions/AboutAction.java
---- josm-1.6~svn320~/src/org/openstreetmap/josm/actions/AboutAction.java 2007-09-05 19:16:18.000000000 +0000
-+++ josm-1.6~svn320/src/org/openstreetmap/josm/actions/AboutAction.java 2007-09-05 19:17:17.000000000 +0000
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java 2008-05-18 17:16:19.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java 2008-05-18 17:18:35.000000000 +0200
@@ -52,7 +52,7 @@
- static {
- revision = loadFile(Main.class.getResource("/REVISION"));
-
-- Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+ Pattern versionPattern = Pattern.compile(".*?Revision: ([[0-9].-]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
- Matcher match = versionPattern.matcher(revision.getText());
- version = match.matches() ? match.group(1) : "UNKNOWN";
-
-@@ -79,7 +79,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));
-- 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(0,0,10,0));
- info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL));
-
-diff -urNad josm-1.6~svn320~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java josm-1.6~svn320/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
---- josm-1.6~svn320~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2007-09-05 17:35:16.000000000 +0000
-+++ josm-1.6~svn320/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2007-09-05 19:21:58.000000000 +0000
+ static {
+ revision = loadFile(Main.class.getResource("/REVISION"));
+
+- Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ Pattern versionPattern = Pattern.compile(".*?Revision: ([[0-9].-]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+ Matcher match = versionPattern.matcher(revision.getText());
+ version = match.matches() ? match.group(1) : "UNKNOWN";
+
+@@ -83,7 +83,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));
+- 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(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.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-05-18 17:16:19.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-05-18 17:17:33.000000000 +0200
@@ -84,8 +84,8 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-05-18 16:00:50 UTC (rev 1584)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-05-18 16:03:56 UTC (rev 1585)
@@ -5,60 +5,55 @@
## DP: No description.
@DPATCH@
-diff -urNad josm-0.0.0.20080316~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080316/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
---- josm-0.0.0.20080316~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2008-03-28 22:09:32.000000000 +0100
-+++ josm-0.0.0.20080316/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2008-03-28 22:10:27.000000000 +0100
-@@ -24,7 +24,12 @@
- ImageIcon curIcon = null;
- boolean curIconAnnotate = true;
- long curScaleMax = 1000000000;
-- long curScaleMin = 0;
-+ long curScaleMin = 0;
-+
+diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
+--- josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2008-05-18 17:20:35.000000000 +0200
++++ josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2008-05-18 17:24:31.000000000 +0200
+@@ -26,6 +26,11 @@
+ long curScaleMax = 1000000000;
+ long curScaleMin = 0;
+
+ public final static String[] iconDefaultLocations = {
+ "/usr/share/icons/openstreetmap/classic.small/",
+ "/usr/share/icons/openstreetmap/square.small/"
-+ };
-
- public ElemStyleHandler() {
- inDoc=inRule=inCondition=inElemStyle=inLine=inIcon=inArea=false;
-@@ -84,22 +89,24 @@
- if (f.exists()) {
- //open icon from user directory
- curIcon = new ImageIcon(imageFile);
-- } else {
-- try {
-- URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
-- if (path == null) {
-- /* icon not found, using default */
-- System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
-- path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
-- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-- } else {
-- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-- }
-- }
-- catch (Exception e){
-- URL path = getClass().getResource("/styles/standard/icons/amenity.png");
-- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-+ } else {
++ };
++
+ public ElemStyleHandler() {
+ inDoc=inRule=inCondition=inElemStyle=inLine=inIcon=inArea=false;
+ }
+@@ -85,21 +90,23 @@
+ //open icon from user directory
+ curIcon = new ImageIcon(imageFile);
+ } else {
+- try {
+- URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
+- if (path == null) {
+- /* icon not found, using default */
+- System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+- path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+ for (String location : this.iconDefaultLocations) {
-+ imageFile = location + atts.getValue(count);
++ imageFile = location + atts.getValue(count);
+ f = new File(imageFile);
+ if (f.exists()) {
+ // open icon from system directory
+ curIcon = new ImageIcon(imageFile);
+ break;
-+ } else {
+ } else {
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+ f = null;
-+ }
- }
+ }
+- }
+- catch (Exception e){
+- URL path = getClass().getResource("/styles/standard/icons/amenity.png");
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+- }
++ }
+ if (f == null) {
+ /* icon not found, using default */
+ System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+ imageFile = "/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png";
+ curIcon = new ImageIcon(imageFile);
-+ }
- }
- } else if (atts.getQName(count).equals("annotate")) {
- curIconAnnotate = Boolean.parseBoolean (atts.getValue(count));
++ }
+ }
+ } else if (atts.getQName(count).equals("annotate")) {
+ curIconAnnotate = Boolean.parseBoolean (atts.getValue(count));
More information about the Pkg-grass-devel
mailing list