The following commit has been merged in the master branch:
commit ebacd6e756cf2ed96d1d9ef9f6137e164e4706ad
Author: David Paleino <da...@debian.org>
Date:   Fri Mar 12 12:24:21 2010 +0100

    debian/patches/* updated to apply to the new code

diff --git a/debian/changelog b/debian/changelog
index 2f6b349..eab9da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ josm (0.0.svn3094-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/patches/*:
     - converted from dpatch to quilt
+    - updated to apply to the new code
   * debian/rules, debian/control: use quilt for patch management.
 
- -- David Paleino <da...@debian.org>  Sat, 06 Mar 2010 19:40:22 +0100
+ -- David Paleino <da...@debian.org>  Fri, 12 Mar 2010 12:24:03 +0100
 
 josm (0.0.svn2561-2) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index d22eea6..07d75cf 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,9 +4,9 @@ Subject: adjustments to the ant build file, mainly to not 
include
 Forwarded: no
 
 ---
- build.xml      |   39 ++++++++++++++-------------------------
- i18n/build.xml |   23 +++++++++++++++++++----
- 2 files changed, 33 insertions(+), 29 deletions(-)
+ build.xml      |   36 +++++++++++++-----------------------
+ i18n/build.xml |   21 +++++++++++++++++++--
+ 2 files changed, 32 insertions(+), 25 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -23,31 +23,29 @@ Forwarded: no
        </path>
  
 @@ -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="."/>
+-                      <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"/>
+                       <format property="build.tstamp" pattern="yyyy-MM-dd 
HH:mm:ss"/>
                </tstamp>
-@@ -60,21 +54,14 @@
- # automatically generated by JOSM build.xml - do not edit                     
+@@ -61,20 +55,13 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
--Build-Date: ${build.tstamp}           
-+Build-Date: ${build.tstamp}
+ Build-Date: ${build.tstamp}
 +Debian-Release: ${debian.version}
- </echo>                                               
+ </echo>
        </target>
-               
+ 
  
        <target name="dist" depends="compile,create-revision">
 -
@@ -61,25 +59,22 @@ Forwarded: no
 -              <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>
-@@ -82,29 +69,29 @@ Build-Date: ${build.tstamp}
+               <echo>Revision ${version.entry.commit.revision}</echo>
+@@ -82,24 +69,25 @@ Build-Date: ${build.tstamp}
                <copy file="README" todir="build"/>
                <copy file="LICENSE" todir="build"/>
  
 +              <ant target="dist" dir="i18n"/>
 +
-         <!-- 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"/>
+               <!-- styles -->
+               <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
  
 +              <property environment="env"/>
 +
                <!-- create josm-custom.jar -->
 -              <delete file="dist/josm-custom.jar"/>
                <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
-         <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
+                       <!-- 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"/>
@@ -87,18 +82,16 @@ Forwarded: no
 +                              <attribute name="Debian-Release" 
value="${debian.version}"/>
 +                              <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar"/>
                        </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) -->
--                      <zipfileset src="lib/gettext-commons-0.9.6.jar" />
 -                      <zipfileset 
src="lib/metadata-extractor-2.3.1-nosun.jar" />
+-                      <zipfileset src="lib/signpost-core-1.1.jar" />
                </jar>
        </target>
  
-@@ -128,6 +115,7 @@ Build-Date: ${build.tstamp}
+@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
                        <compilerarg value="-Xlint:deprecation"/>
                        <compilerarg value="-Xlint:unchecked"/>
                </javac>
@@ -106,7 +99,7 @@ Forwarded: no
        </target>
  
        <target name="init">
-@@ -138,6 +126,7 @@ Build-Date: ${build.tstamp}
+@@ -133,6 +122,7 @@ Build-Date: ${build.tstamp}
        <target name="clean">
                <delete dir="build" />
                <delete dir="dist" />
@@ -116,25 +109,22 @@ Forwarded: no
        <path id="test.classpath">
 --- josm.orig/i18n/build.xml
 +++ josm/i18n/build.xml
-@@ -58,10 +58,14 @@
-     </gettext-extract>
+@@ -63,7 +63,13 @@
+     <gettext-merge keysFile="josm.pot" poDirectory="po"/>
    </target>
  
--  <target name="build" depends="po/josm.pot,init.gettext">
--    <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
+-  <target name="build" depends="prebuild">
 +  <target name="build.check">
 +    <condition property="build.run">
 +      <not><available file="build-timestamp"/></not>
 +    </condition>
 +  </target>
- 
--    <gettext-merge keysFile="josm.pot" poDirectory="po"/>
-+  <target name="build" depends="build.check" if="build.run">
-+    <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
- 
-     <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation"
-                   poDirectory="po" outputDirectory="build"/>-->
-@@ -93,10 +97,13 @@
++
++  <target name="build" depends="build.check,prebuild" if="build.run">
+     <exec executable="perl">
+       <arg line="i18n.pl ${i18n.install.dir}/ po/*.po"/>
+     </exec>
+@@ -102,10 +108,13 @@
      <ant target="build-lang"><property name="language" value="tr"/></ant>
      <ant target="build-lang"><property name="language" value="zh_TW"/></ant>
  
@@ -149,7 +139,7 @@ Forwarded: no
        <arg value="po"/>
      </exec>
      <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
-@@ -109,6 +116,13 @@
+@@ -118,6 +127,13 @@
          <attribute name="Translation-Date" 
value="${version.entry.commit.date}"/>
        </manifest>
      </jar>
@@ -163,7 +153,7 @@ Forwarded: no
    </target>
  
    <target name="build-lang">
-@@ -124,6 +138,7 @@
+@@ -133,6 +149,7 @@
      <delete>
        <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
      </delete>
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 6aa84f6..51a8c08 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -4,10 +4,10 @@ Subject: point to the debian BTS for bug reports.
 Forwarded: no
 
 ---
- src/org/openstreetmap/josm/actions/AboutAction.java             |    7 ++-
+ src/org/openstreetmap/josm/actions/AboutAction.java             |    7 +++
  src/org/openstreetmap/josm/data/Version.java                    |    7 +++
- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   23 
++--------
- 3 files changed, 19 insertions(+), 18 deletions(-)
+ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   20 
+++-------
+ 3 files changed, 19 insertions(+), 15 deletions(-)
 
 --- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
 +++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -41,7 +41,7 @@ Forwarded: no
          revision.setEditable(false);
 --- josm.orig/src/org/openstreetmap/josm/data/Version.java
 +++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -65,6 +65,7 @@ public class Version {
+@@ -66,6 +66,7 @@ public class Version {
  
      private int version;
      private String revision;
@@ -49,7 +49,7 @@ Forwarded: no
      private String time;
      private boolean isLocalBuild;
  
-@@ -110,6 +111,8 @@ public class Version {
+@@ -115,6 +116,8 @@ public class Version {
              version = JOSM_UNKNOWN_VERSION;
          }
  
@@ -58,7 +58,7 @@ Forwarded: no
          // the last changed data
          //
          time = properties.get("Last Changed Date");
-@@ -156,6 +159,10 @@ public class Version {
+@@ -161,6 +164,10 @@ public class Version {
          return  version == 0 ? tr("UNKNOWN") : Integer.toString(version);
      }
  
@@ -71,40 +71,40 @@ Forwarded: no
       *
 --- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
 +++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -57,8 +57,8 @@ public final class BugReportExceptionHan
+@@ -62,8 +62,8 @@ public final class BugReportExceptionHan
+                     Main.parent,
+                     "<html>"
+                     + tr("An unexpected exception occurred.<br>" +
+-                            "This is always a coding error. If you are 
running the latest<br>" +
+-                            "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."
+                     )
+                     + "</html>",
+                     tr("Unexpected Exception"),
+@@ -114,21 +114,13 @@ public final class BugReportExceptionHan
  
-             Object[] options = new String[]{tr("Do nothing"), tr("Report 
Bug")};
-             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,null,
-             options, options[0]);
-             if (answer == 1) {
-@@ -89,21 +89,10 @@ public final class BugReportExceptionHan
-                                                          "UTF-8")));
- 
-                     JPanel p = new JPanel(new GridBagLayout());
--                    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.") +
-+                    "<br>" + tr("Be sure to include the following 
information:") + "</html>"), GBC.eol());
-                     try {
-                         
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new 
StringSelection(text), new ClipboardOwner(){
-                             public void lostOwnership(Clipboard clipboard, 
Transferable contents) {}
+                 JPanel p = new JPanel(new GridBagLayout());
+                 p.add(new JMultilineLabel(
+-                        tr("You have encountered an error in JOSM. Before you 
file a bug report " +
+-                           "make sure you have updated to the latest version 
of JOSM here:")), GBC.eol());
+-                p.add(new UrlLabel("http://josm.openstreetmap.de/#Download";), 
GBC.eop().insets(8,0,0,0));
++                        tr("Please report a bug against josm.")), GBC.eol());
+                 p.add(new JMultilineLabel(
+-                        tr("You should also update your plugins. If neither 
of those help please " +
+-                           "file a bug report in our bugtracker using this 
link:")), GBC.eol());
+-                p.add(new UrlLabel(url.toString(), 
"http://josm.openstreetmap.de/josmticket?...";), GBC.eop().insets(8,0,0,0));
++                         tr("Include your steps to get to the error (as 
detailed as possible)!")), GBC.eol());
+                 p.add(new JMultilineLabel(
+-                        tr("There the error information provided below should 
already be " +
+-                           "filled in for you. Please include information on 
how to reproduce " +
+-                           "the error and try to supply as much detail as 
possible.")), GBC.eop());
++                         tr("Try updating to the newest version of JOSM and 
all plugins before reporting a bug.")), GBC.eol());
+                 p.add(new JMultilineLabel(
+-                        tr("Alternatively, if that does not work you can 
manually fill in the information " +
+-                           "below at this URL:")), GBC.eol());
+-                p.add(new UrlLabel("http://josm.openstreetmap.de/newticket";), 
GBC.eop().insets(8,0,0,0));
++                         tr("Be sure to include the following 
information:")), GBC.eop());
+                 try {
+                     
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new 
StringSelection(text), new ClipboardOwner(){
+                         public void lostOwnership(Clipboard clipboard, 
Transferable contents) {}
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 375fbdf..f3a508f 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -54,8 +54,10 @@ public class MapPaintStyles {
+@@ -64,8 +64,10 @@ public class MapPaintStyles {
          {
              LinkedList<String> f = new LinkedList<String>(iconDirs);
              /* don't prefix icon path, as it should be generic */
diff --git a/debian/patches/50-preferences_world_readable.patch 
b/debian/patches/50-preferences_world_readable.patch
index fa3d243..fa740d2 100644
--- a/debian/patches/50-preferences_world_readable.patch
+++ b/debian/patches/50-preferences_world_readable.patch
@@ -8,7 +8,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
 
 --- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
 +++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -346,6 +346,14 @@ public class Preferences {
+@@ -393,6 +393,14 @@ public class Preferences {
          File tmpFile = new File(prefFile + "_tmp");
          copyFile(tmpFile, prefFile);
          tmpFile.delete();
@@ -23,7 +23,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/4667
      }
  
      /**
-@@ -462,6 +470,13 @@ public class Preferences {
+@@ -509,6 +517,13 @@ public class Preferences {
                  System.err.println(tr("Warning: Failed to initialize 
preferences.Failed to reset preference file to default: {0}", 
getPreferenceFile()));
              }
          }

-- 
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