The following commit has been merged in the master branch:
commit 319f4d4fdab982f634dd4370e66055fa51bfb502
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Fri Dec 4 15:36:58 2009 +0100

    Patches updated

diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch
index 309cb83..b9d4429 100755
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10_build.dpatch
@@ -5,11 +5,11 @@
 ## DP: the dependencies into the target jar file.
 
 @DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml   2009-08-09 22:43:59.000000000 +0200
-+++ trunk/build.xml    2009-09-14 15:42:24.000000000 +0200
-@@ -4,47 +4,40 @@
-       <property name="build.dir" value="build"/>
+diff -urNad josm~/build.xml josm/build.xml
+--- josm~/build.xml    2009-12-04 15:05:10.000000000 +0100
++++ josm/build.xml     2009-12-04 15:36:26.000000000 +0100
+@@ -21,9 +21,10 @@
+     </condition>
  
        <!-- Java classpath addition (all jar files to compile tests with this) 
-->
 -      <path id="classpath">
@@ -22,7 +22,26 @@ diff -urNad trunk~/build.xml trunk/build.xml
                </fileset>
        </path>
  
-       <target name="dist" depends="compile">
+@@ -42,14 +43,7 @@
+         -->     
+       <target name="create-revision">
+               <property name="revision.dir" value="${build.dir}"/>
+-              <exec append="false" output="REVISION.XML" executable="svn" 
failifexecutionfails="false">
+-                              <env key="LANG" value="C"/>
+-                              <arg value="info"/>
+-                              <arg value="--xml"/>
+-                              <arg value="."/>
+-              </exec>
+-              <xmlproperty file="REVISION.XML" prefix="version" 
keepRoot="false" collapseAttributes="true"/>
+-              <delete file="REVISION.XML" />
++              <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
+               <tstamp>
+                     <format property="build.tstamp" pattern="yyyy-MM-dd 
HH:mm:ss"/>
+               </tstamp>
+@@ -66,45 +60,37 @@
+               
+ 
+       <target name="dist" depends="compile,create-revision">
 -
 -              <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
 -                      <env key="LANG" value="C"/>
@@ -34,7 +53,7 @@ diff -urNad trunk~/build.xml trunk/build.xml
 -              <delete file="REVISION"/>
                <property name="version.entry.commit.revision" value="UNKNOWN"/>
                <property name="version.entry.commit.date" value="UNKNOWN"/>
- 
+           <echo>Revision ${version.entry.commit.revision}</echo>
                <copy file="CONTRIBUTION" todir="build"/>
                <copy file="README" todir="build"/>
 -              <copy file="LICENSE" todir="build"/>
@@ -42,15 +61,19 @@ diff -urNad trunk~/build.xml trunk/build.xml
 +
 +              <ant target="dist" dir="i18n"/>
  
-                 <!-- styles -->
--              <copy file="styles/standard/elemstyles.xml" 
todir="build/styles/standard"/>
-+              <copy file="styles/standard/elemstyles.xml" 
todir="build/styles/standard"/>
+         <!-- styles -->
+               <copy file="styles/standard/elemstyles.xml" 
todir="build/styles/standard"/>
+ 
+         <!-- css-->
+-              <copy 
file="src/org/openstreetmap/josm/gui/help/help-browser.css" 
todir="build/org/openstreetmap/josm/gui/help"/>
++              <copy 
file="src/org/openstreetmap/josm/gui/help/help-browser.css" 
todir="build/org/openstreetmap/josm/gui/help"/>
 +
 +              <property environment="env"/>
  
                <!-- create josm-custom.jar -->
 -              <delete file="dist/josm-custom.jar"/>
-               <jar destfile="dist/josm-custom.jar" basedir="build">
+               <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
+         <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
                        <manifest>
                                <attribute name="Main-class" value="JOSM" />
                                <attribute name="Main-Version" 
value="${version.entry.commit.revision} SVN"/>
@@ -61,6 +84,7 @@ diff -urNad trunk~/build.xml trunk/build.xml
                        </manifest>
                        <zipfileset dir="presets" prefix="presets" />
                        <zipfileset dir="images" prefix="images" />
+                       <zipfileset dir="data" prefix="data" />
 -                      <zipfileset src="lib/josm-translation.jar" />
 -
 -                      <!-- All jar files necessary to run only JOSM (no 
tests) -->
@@ -69,7 +93,7 @@ diff -urNad trunk~/build.xml trunk/build.xml
                </jar>
        </target>
  
-@@ -67,7 +60,8 @@
+@@ -127,7 +113,8 @@
                                target="1.5" source="1.5" debug="on" 
encoding="UTF-8">
                        <compilerarg value="-Xlint:deprecation"/>
                        <compilerarg value="-Xlint:unchecked"/>
@@ -79,7 +103,7 @@ diff -urNad trunk~/build.xml trunk/build.xml
        </target>
  
        <target name="init">
-@@ -77,7 +71,8 @@
+@@ -137,7 +124,8 @@
  
        <target name="clean">
                <delete dir="build" />
@@ -89,9 +113,9 @@ diff -urNad trunk~/build.xml trunk/build.xml
        </target>
  
        <path id="test.classpath">
-diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
---- trunk~/i18n/build.xml      2009-07-09 10:54:34.000000000 +0200
-+++ trunk/i18n/build.xml       2009-09-14 15:42:24.000000000 +0200
+diff -urNad josm~/i18n/build.xml josm/i18n/build.xml
+--- josm~/i18n/build.xml       2009-10-02 23:48:41.000000000 +0200
++++ josm/i18n/build.xml        2009-12-04 15:33:07.000000000 +0100
 @@ -58,10 +58,14 @@
      </gettext-extract>
    </target>
diff --git a/debian/patches/20_bts.dpatch b/debian/patches/20_bts.dpatch
index 5555fb6..909582d 100755
--- a/debian/patches/20_bts.dpatch
+++ b/debian/patches/20_bts.dpatch
@@ -5,50 +5,52 @@
 ## DP: Pattern match debian version in about dialog.
 
 @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-09-08 
22:56:02.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java  2009-10-11 
18:05:24.000000000 +0200
-@@ -49,6 +49,7 @@
- public class AboutAction extends JosmAction {
+diff -urNad josm~/src/org/openstreetmap/josm/actions/AboutAction.java 
josm/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm~/src/org/openstreetmap/josm/actions/AboutAction.java  2009-12-04 
15:05:10.000000000 +0100
++++ josm/src/org/openstreetmap/josm/actions/AboutAction.java   2009-12-04 
15:40:31.000000000 +0100
+@@ -9,6 +9,9 @@
+ import java.awt.event.ActionEvent;
+ import java.awt.event.KeyEvent;
  
-     private static final String version;
-+      public static final String debianRelease;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++
+ import javax.swing.BorderFactory;
+ import javax.swing.JLabel;
+ import javax.swing.JOptionPane;
+@@ -56,6 +59,10 @@
  
-     private final static JTextArea revision;
-     private static String time;
-@@ -72,6 +73,10 @@
-         Matcher match = versionPattern.matcher(revision.getText());
-         version = match.matches() ? match.group(1) : tr("UNKNOWN");
+         Version version = Version.getInstance();
  
 +              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");
++              Matcher match = 
debianReleasePattern.matcher(revision.getText());
++              String 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");
-@@ -136,6 +141,8 @@
+         JPanel info = new JPanel(new GridBagLayout());
+         JLabel caption = new JLabel("JOSM - " + tr("Java OpenStreetMap 
Editor"));
+         caption.setFont(new Font("Helvetica", Font.BOLD, 20));
+@@ -63,6 +70,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(new JLabel(tr("Version {0}", version.getVersionString())), 
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(new JLabel(tr("Last change at {0}",version.getTime())), 
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));
-@@ -143,7 +150,7 @@
+@@ -70,7 +79,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));
  
-         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-30 19:07:24.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java      
2009-10-11 18:06:37.000000000 +0200
-@@ -52,8 +52,8 @@
+         JTextArea revision = new JTextArea();
+         revision.setEditable(false);
+diff -urNad 
josm~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 
josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+--- josm~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java      
2009-12-04 15:05:12.000000000 +0100
++++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java       
2009-12-04 15:38:23.000000000 +0100
+@@ -57,8 +57,8 @@
  
              Object[] options = new String[]{tr("Do nothing"), tr("Report 
Bug")};
              int answer = JOptionPane.showOptionDialog(Main.parent, tr("An 
unexpected exception occurred.\n\n" +
@@ -59,14 +61,25 @@ diff -urNad 
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.ja
              tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, 
JOptionPane.ERROR_MESSAGE,null,
              options, options[0]);
              if (answer == 1) {
-@@ -65,10 +65,10 @@
-                     + stack.getBuffer().toString();
+@@ -89,21 +89,10 @@
+                                                          "UTF-8")));
  
                      JPanel p = new JPanel(new GridBagLayout());
--                    p.add(new JLabel("<html>" + tr("Please report a ticket at 
{0}","http://josm.openstreetmap.de/newticket";) +
--                            "<br>" + tr("Include your steps to get to the 
error (as detailed as possible)!") +
--                            "<br>" + tr("Try updating to the newest version 
of JOSM and all plugins before reporting a bug.") +
--                            "<br>" + tr("Be sure to include the following 
information:") + "</html>"), GBC.eol());
+-                    p.add(new JLabel(tr("<html>" +
+-                                        "<p>You've encountered an error in 
JOSM. Before you file a bug<br>" +
+-                                        "make sure you've updated to the 
latest version of JOSM here:</p></html>")), GBC.eol());
+-                    p.add(new 
UrlLabel("http://josm.openstreetmap.de/#Download";), GBC.eop().insets(8,0,0,0));
+-                    p.add(new JLabel(tr("<html>You should also update your 
plugins. If neither of those help please<br>" +
+-                                        "file a bug in our bugtracker using 
this link:</p></html>")), GBC.eol());
+-                    p.add(new UrlLabel(url.toString(), 
"http://josm.openstreetmap.de/josmticket?...";), GBC.eop().insets(8,0,0,0));
+-                    p.add(new JLabel(tr("<html><p>" +
+-                                        "There the the error information 
provided below should already be<br>" +
+-                                        "filled out for you. Please include 
information on how to reproduce<br>" +
+-                                        "the error and try to supply as much 
detail as possible.</p></html>")), GBC.eop());
+-                    p.add(new JLabel(tr("<html><p>" +
+-                                        "Alternatively if that doesn't work 
you can manually fill in the information<br>" +
+-                                        "below at this URL:</p></html>")), 
GBC.eol());
+-                    p.add(new 
UrlLabel("http://josm.openstreetmap.de/newticket";), GBC.eop().insets(8,0,0,0));
 +                    p.add(new JLabel("<html>" + tr("Please report a bug 
against josm.") +
 +                    "<br>" + tr("Include your steps to get to the error (as 
detailed as possible)!") +
 +                    "<br>" + tr("Try updating to the newest version of JOSM 
and all plugins before reporting a bug.") +

-- 
Java OpenStreetMap editor

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to