The following commit has been merged in the master branch:
commit 8b8ea6bbee4401939ead03ac8196c68a894d29e0
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Sun Aug 7 11:24:30 2011 +0200

    Patches updated.

diff --git a/debian/changelog b/debian/changelog
index 1b62161..af1f5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 josm (0.0.svn4279-1) UNRELEASED; urgency=low
 
   * New upstream release (closes: #636345).
+  * debian/patches:
+    - refreshed and modified according new upstream version
+    - 50-preferences_world_readable.patch: removed, integrated
+      upstream
 
- -- Giovanni Mascellani <g...@debian.org>  Sat, 06 Aug 2011 22:50:57 +0200
+ -- Giovanni Mascellani <g...@debian.org>  Sun, 07 Aug 2011 11:20:28 +0200
 
 josm (0.0.svn4064-3) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 4dcb912..8cd825a 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -8,179 +8,151 @@ Forwarded: no
  i18n/build.xml |   26 +++++++++++++++++++++-----
  2 files changed, 32 insertions(+), 28 deletions(-)
 
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -21,8 +21,9 @@
- 
-       <!-- Java classpath addition (all jar files to compile tests with this) 
-->
-       <path id="classpath">
--              <fileset dir="lib">
--                      <include name="**/*.jar"/>
-+              <fileset dir="/usr/share/java">
-+                      <include name="gettext-commons.jar"/>
-+                      <include name="metadata-extractor.jar"/>
-               </fileset>
-       </path>
- 
+Index: josm/build.xml
+===================================================================
+--- josm.orig/build.xml        2011-08-07 00:51:19.000000000 +0200
++++ josm/build.xml     2011-08-07 00:51:19.000000000 +0200
+@@ -23,8 +23,9 @@
+     </condition>
+     <!-- Java classpath addition (all jar files to compile tests with this) 
-->
+     <path id="classpath">
+-        <fileset dir="lib">
+-            <include name="**/*.jar"/>
++              <fileset dir="/usr/share/java">
++                      <include name="gettext-commons.jar"/>
++                      <include name="metadata-extractor.jar"/>
+         </fileset>
+     </path>
+ 
 @@ -41,14 +42,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>
-@@ -60,20 +54,13 @@
- Revision: ${version.entry.commit.revision}
- Is-Local-Build: true
- Build-Date: ${build.tstamp}
-+Debian-Release: ${debian.version}
- </echo>
-       </target>
- 
- 
-       <target name="dist" depends="compile,create-revision">
--
--              <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
--                      <env key="LANG" value="C"/>
--                      <arg value="info"/>
--                      <arg value="--xml"/>
--                      <arg value="."/>
--              </exec>
-               <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
--              <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>
-@@ -81,23 +68,22 @@ Build-Date: ${build.tstamp}
-               <copy file="README" todir="build"/>
-               <copy file="LICENSE" todir="build"/>
- 
-+              <ant target="dist" dir="i18n"/>
-+
-               <!-- 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 -->
-                       <manifest>
-                               <attribute name="Main-class" value="JOSM" />
-                               <attribute name="Main-Version" 
value="${version.entry.commit.revision} SVN"/>
-                               <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
-+                              <attribute name="Debian-Release" 
value="${debian.version}"/>
-+                              <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
-                       </manifest>
-                       <zipfileset dir="images" prefix="images" />
-                       <zipfileset dir="data" prefix="data" />
-                       <zipfileset dir="styles" prefix="styles" />
-                       <zipfileset 
dir="src/org/openstreetmap/gui/jmapviewer/images" 
prefix="org/openstreetmap/gui/jmapviewer/images" />
--
--                      <!-- All jar files necessary to run only JOSM (no 
tests) -->
--                      <zipfileset 
src="lib/metadata-extractor-2.3.1-nosun.jar" />
--                      <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
-               </jar>
-       </target>
- 
-@@ -121,6 +107,7 @@ Build-Date: ${build.tstamp}
-                       <compilerarg value="-Xlint:deprecation"/>
-                       <compilerarg value="-Xlint:unchecked"/>
-               </javac>
-+              <ant target="build" dir="i18n"/>
-       </target>
- 
-       <target name="init">
-@@ -131,6 +118,7 @@ Build-Date: ${build.tstamp}
-       <target name="clean">
-               <delete dir="build" />
-               <delete dir="dist" />
-+              <ant target="clean" dir="i18n"/>
-       </target>
- 
-       <target name="javacc">
---- josm.orig/i18n/build.xml
-+++ josm/i18n/build.xml
+         -->
+     <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>
+@@ -59,31 +53,29 @@
+ Revision: ${version.entry.commit.revision}
+ Is-Local-Build: true
+ Build-Date: ${build.tstamp}
++Debian-Release: ${debian.version}
+ </echo>
+     </target>
+     <target name="dist" depends="compile,create-revision">
+-        <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+         <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
+-        <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"/>
++
++              <ant target="dist" dir="i18n"/>
++
+         <!-- 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 -->
+             <manifest>
+                 <attribute name="Main-class" value="JOSM"/>
+                 <attribute name="Main-Version" 
value="${version.entry.commit.revision} SVN"/>
+                 <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
++                              <attribute name="Debian-Release" 
value="${debian.version}"/>
++                              <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
+             </manifest>
+             <zipfileset dir="images" prefix="images"/>
+             <zipfileset dir="data" prefix="data"/>
+@@ -124,6 +116,7 @@
+             <compilerarg value="-Xlint:deprecation"/>
+             <compilerarg value="-Xlint:unchecked"/>
+         </javac>
++              <ant target="build" dir="i18n"/>
+     </target>
+     <target name="init">
+         <mkdir dir="build"/>
+@@ -133,6 +126,7 @@
+         <delete dir="build"/>
+         <delete dir="dist"/>
+         <delete dir="${mapcss.dir}/parsergen"/>
++              <ant target="clean" dir="i18n"/>
+     </target>
+     <path id="test.classpath">
+         <fileset dir="${test.dir}/lib">
+Index: josm/i18n/build.xml
+===================================================================
+--- josm.orig/i18n/build.xml   2011-08-07 00:51:19.000000000 +0200
++++ josm/i18n/build.xml        2011-08-07 00:55:09.000000000 +0200
 @@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
  <project name="JOSM i18n" default="build" basedir=".">
- 
-   <!-- compilation properties -->
--  <property name="josm.build.dir"    value="../core"/>
-+  <property name="josm.build.dir"    value=".."/>
-   <property name="josm.presets"      
value="${josm.build.dir}/data/defaultpresets.xml"/>
-   <property name="josm.style"        
value="${josm.build.dir}/styles/standard/elemstyles.xml"/>
-   <property name="plugin.dir"        value="../plugins"/>
-@@ -16,7 +16,7 @@
- 
-   <property name="ant.build.javac.target" value="1.5"/>
- 
--  <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
-+  <property name="gettexttasks.jar" 
value="/usr/share/java/gettext-ant-tasks.jar"/>
- 
-   <target name="init.gettext" description="Loads the Ant gettext tasks">
-     <taskdef name="gettext-extract" 
classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" 
classpath="${gettexttasks.jar}"/>
-@@ -53,7 +53,6 @@
-     <gettext-extract keysFile="josm.pot" poDirectory="po"
-                      keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr 
-ktrn:1,2 -ktrnc:1c,2,3">
-       <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
--      <fileset dir="${plugin.dir}" includes="**/*.java"/>
-       <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-       <fileset dir="${i18n.build.dir}" includes="trans_*.java"/>
-     </gettext-extract>
-@@ -63,7 +62,13 @@
-     <gettext-merge keysFile="josm.pot" poDirectory="po"/>
-   </target>
- 
--  <target name="build" depends="prebuild">
+     <!-- compilation properties -->
+-    <property name="josm.build.dir" value="../core"/>
++    <property name="josm.build.dir" value=".."/>
+     <property name="josm.presets" 
value="${josm.build.dir}/data/defaultpresets.xml"/>
+     <property name="josm.style" 
value="${josm.build.dir}/styles/standard/elemstyles.xml"/>
+     <property name="plugin.dir" value="../plugins"/>
+@@ -12,7 +12,7 @@
+     <property name="i18n.install.dir" value="${josm.build.dir}/data"/>
+     <property name="po.build.dir" value="${i18n.build.dir}"/>
+     <property name="ant.build.javac.target" value="1.5"/>
+-    <property name="gettexttasks.jar" 
value="lib/gettext-ant-tasks-0.9.7.jar"/>
++    <property name="gettexttasks.jar" 
value="/usr/share/java/gettext-ant-tasks.jar"/>
+     <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
+     <target name="init" description="Loads the Ant gettext and contrib tasks">
+         <taskdef name="gettext-extract" 
classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" 
classpath="${gettexttasks.jar}"/>
+@@ -50,7 +50,12 @@
+             <fileset dir="${plugin.dir}" includes="**/*.java"/>
+         </gettext-extract>
+     </target>
+-    <target name="build" depends="po/josm.pot,init">
 +  <target name="build.check">
 +    <condition property="build.run">
 +      <not><available file="build-timestamp"/></not>
 +    </condition>
 +  </target>
-+
-+  <target name="build" depends="build.check,prebuild" if="build.run">
-     <exec executable="perl">
-       <arg line="i18n.pl ${i18n.install.dir}/ po/*.po"/>
-     </exec>
-@@ -103,10 +108,13 @@
-     <ant target="build-lang"><property name="language" value="tr"/></ant>
-     <ant target="build-lang"><property name="language" value="zh_TW"/></ant>
- 
++    <target name="build" depends="build.check,po/josm.pot,init" 
if="build.run">
+         <gettext-merge keysFile="josm.pot" poDirectory="po"/>
+         <antcall target="coretrans"/>
+         <foreach param="path" target="plugintrans">
+@@ -58,6 +63,7 @@
+                 <dirset dir="${plugin.dir}" includes="*"/>
+             </path>
+         </foreach>
 +     <touch file="build-timestamp"/>
-+
-+    <!--
-     <exec append="false" output="REVISION" executable="svn" 
failifexecutionfails="false">
-       <env key="LANG" value="C"/>
-       <arg value="info"/>
--      <arg value="--xml"/>
-+      <arg value="-xml"/>
-       <arg value="po"/>
-     </exec>
-     <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
-@@ -119,6 +127,13 @@
-         <attribute name="Translation-Date" 
value="${version.entry.commit.date}"/>
-       </manifest>
-     </jar>
-+      -->
-+  </target>
-+
+     </target>
+     <target name="coretrans">
+         <mkdir dir="${po.build.dir}/core"/>
+@@ -93,11 +99,17 @@
+             </then>
+         </if>
+     </target>
 +  <target name="dist" depends="build">
 +    <copy todir="../build">
 +      <fileset dir="build"/>
 +    </copy>
-   </target>
- 
-   <target name="build-lang">
-@@ -134,6 +149,7 @@
-     <delete>
-       <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
-     </delete>
++  </target>
+     <target name="clean">
+         <delete dir="${i18n.build.dir}"/>
+         <delete file="po/josm.pot"/>
+         <delete>
+             <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
+         </delete>
 +    <delete file="build-timestamp"/>
-   </target>
- 
+     </target>
  </project>
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index da58c45..40b1b86 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -9,9 +9,11 @@ Forwarded: no
  src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   19 
+++-------
  3 files changed, 19 insertions(+), 14 deletions(-)
 
---- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
-+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -9,6 +9,9 @@ import java.awt.GridBagLayout;
+Index: josm/src/org/openstreetmap/josm/actions/AboutAction.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java      
2011-06-16 11:10:23.000000000 +0200
++++ josm/src/org/openstreetmap/josm/actions/AboutAction.java   2011-08-07 
01:03:09.000000000 +0200
+@@ -9,6 +9,9 @@
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
  
@@ -21,7 +23,7 @@ Forwarded: no
  import javax.swing.BorderFactory;
  import javax.swing.JLabel;
  import javax.swing.JOptionPane;
-@@ -63,6 +66,8 @@ public class AboutAction extends JosmAct
+@@ -63,6 +66,8 @@
          info.add(GBC.glue(0,10), GBC.eol());
          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());
@@ -30,7 +32,7 @@ Forwarded: no
          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));
-@@ -70,7 +75,7 @@ public class AboutAction extends JosmAct
+@@ -70,7 +75,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));
@@ -39,17 +41,19 @@ Forwarded: no
  
          JTextArea revision = new JTextArea();
          revision.setEditable(false);
---- josm.orig/src/org/openstreetmap/josm/data/Version.java
-+++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -66,6 +66,7 @@ public class Version {
+Index: josm/src/org/openstreetmap/josm/data/Version.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java     2011-08-06 
22:49:15.000000000 +0200
++++ josm/src/org/openstreetmap/josm/data/Version.java  2011-08-07 
01:04:13.000000000 +0200
+@@ -66,6 +66,7 @@
  
      private int version;
-     private String revision;
+     private String releaseDescription;
 +    private String debianVersion;
      private String time;
      private boolean isLocalBuild;
  
-@@ -115,6 +116,8 @@ public class Version {
+@@ -115,6 +116,8 @@
              version = JOSM_UNKNOWN_VERSION;
          }
  
@@ -58,7 +62,7 @@ Forwarded: no
          // the last changed data
          //
          time = properties.get("Last Changed Date");
-@@ -161,6 +164,10 @@ public class Version {
+@@ -160,6 +163,10 @@
          return  version == 0 ? tr("UNKNOWN") : Integer.toString(version);
      }
  
@@ -69,9 +73,11 @@ Forwarded: no
      /**
       * Replies a text with the release attributes
       *
---- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -75,8 +75,8 @@ public final class BugReportExceptionHan
+Index: josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java  
2011-06-16 11:10:23.000000000 +0200
++++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java       
2011-08-07 01:03:09.000000000 +0200
+@@ -75,8 +75,8 @@
                          Main.parent,
                          "<html>"
                          + tr("An unexpected exception occurred.<br>" +
@@ -82,7 +88,7 @@ Forwarded: no
                          )
                          + "</html>",
                          tr("Unexpected Exception"),
-@@ -111,21 +111,14 @@ public final class BugReportExceptionHan
+@@ -111,21 +111,14 @@
  
                      JPanel p = new JPanel(new GridBagLayout());
                      p.add(new JMultilineLabel(
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 3836953..ebf6c9e 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -7,9 +7,11 @@ Subject: the icons have been removed from the JAR file because 
they are already
  src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   13 
++++++++++--
  2 files changed, 19 insertions(+), 5 deletions(-)
 
---- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -126,14 +126,19 @@ public class MapPaintStyles {
+Index: josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java      
2011-08-06 22:49:15.000000000 +0200
++++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java   
2011-08-07 01:05:02.000000000 +0200
+@@ -134,14 +134,19 @@
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -32,9 +34,11 @@ Subject: the icons have been removed from the JAR file 
because they are already
      public static void readFromPreferences() {
          styles.clear();
  
---- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -63,6 +63,7 @@ import org.openstreetmap.josm.gui.QuadSt
+Index: josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java        
2011-08-06 22:49:15.000000000 +0200
++++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java     
2011-08-07 01:05:02.000000000 +0200
+@@ -63,6 +63,7 @@
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -42,7 +46,7 @@ Subject: the icons have been removed from the JAR file 
because they are already
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import 
org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1127,8 +1128,16 @@ public class TaggingPreset extends Abstr
+@@ -1129,8 +1130,16 @@
          ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, 
iconName, zipIcons);
          if (icon == null)
          {
diff --git a/debian/patches/50-preferences_world_readable.patch 
b/debian/patches/50-preferences_world_readable.patch
deleted file mode 100644
index 9b50bb3..0000000
--- a/debian/patches/50-preferences_world_readable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: make the preferences file owner-only readable
-Forwarded: https://josm.openstreetmap.de/ticket/4667
-
----
- src/org/openstreetmap/josm/data/Preferences.java |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
-+++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -384,6 +384,14 @@ public class Preferences {
-         File tmpFile = new File(prefFile + "_tmp");
-         copyFile(tmpFile, prefFile);
-         tmpFile.delete();
-+
-+        setCorrectPermissions();
-+    }
-+
-+    public void setCorrectPermissions() throws IOException {
-+        // Make it owner-only-readable.
-+        // FIXME: newest versions will use JDK 1.6, it has set*() functions.
-+        Runtime.getRuntime().exec("/bin/chmod 600 " + 
getPreferenceFile().getAbsolutePath());
-     }
- 
-     /**
-@@ -508,6 +516,13 @@ public class Preferences {
-                 System.err.println(tr("Warning: Failed to initialize 
preferences.Failed to reset preference file to default: {0}", 
getPreferenceFile()));
-             }
-         }
-+
-+        try {
-+            setCorrectPermissions();
-+        }
-+        catch (IOException e) {
-+            e.printStackTrace();
-+        }
-     }
- 
-     public final void resetToDefault(){
diff --git a/debian/patches/70-default_look_and_feel.patch 
b/debian/patches/70-default_look_and_feel.patch
index d24d3d8..c09e79e 100644
--- a/debian/patches/70-default_look_and_feel.patch
+++ b/debian/patches/70-default_look_and_feel.patch
@@ -9,13 +9,16 @@ Forwarded: no
  src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-+++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -75,6 +75,6 @@ public class PlatformHookUnixoid impleme
+Index: josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java        
2011-08-06 22:49:15.000000000 +0200
++++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java     
2011-08-07 01:11:41.000000000 +0200
+@@ -77,7 +77,7 @@
      }
  
      public String getDefaultStyle() {
 -        return "javax.swing.plaf.metal.MetalLookAndFeel";
 +        return "javax.swing.plaf.gtk.GTKLookAndFeel";
      }
- }
+ 
+     @Override
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index f3f4689..ffad3cb 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -7,9 +7,11 @@ Forwarded: no
  data/defaultpresets.xml |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- josm.orig/data/defaultpresets.xml
-+++ josm/data/defaultpresets.xml
-@@ -2264,7 +2264,7 @@ are supplied, then "values" will be trea
+Index: josm/data/defaultpresets.xml
+===================================================================
+--- josm.orig/data/defaultpresets.xml  2011-08-06 22:49:13.000000000 +0200
++++ josm/data/defaultpresets.xml       2011-08-07 01:11:49.000000000 +0200
+@@ -2272,7 +2272,7 @@
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </item>
@@ -18,7 +20,7 @@ Forwarded: no
              <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" />
-@@ -2463,7 +2463,7 @@ are supplied, then "values" will be trea
+@@ -2471,7 +2471,7 @@
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>
diff --git a/debian/patches/90-fix_version.patch 
b/debian/patches/90-fix_version.patch
index b94a014..1b61ff3 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -8,20 +8,24 @@ Forwarded: no
  src/org/openstreetmap/josm/data/Version.java |    3 ---
  2 files changed, 1 insertion(+), 4 deletions(-)
 
---- josm.orig/build.xml
-+++ josm/build.xml
-@@ -75,7 +75,7 @@ Debian-Release: ${debian.version}
-                       <!-- 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"/>
-+                              <attribute name="Main-Version" 
value="${version.entry.commit.revision}"/>
-                               <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
-                               <attribute name="Debian-Release" 
value="${debian.version}"/>
-                               <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
---- josm.orig/src/org/openstreetmap/josm/data/Version.java
-+++ josm/src/org/openstreetmap/josm/data/Version.java
-@@ -206,9 +206,6 @@ public class Version {
+Index: josm/build.xml
+===================================================================
+--- josm.orig/build.xml        2011-08-07 00:51:19.000000000 +0200
++++ josm/build.xml     2011-08-07 11:15:33.000000000 +0200
+@@ -72,7 +72,7 @@
+             <!-- 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"/>
++                              <attribute name="Main-Version" 
value="${version.entry.commit.revision}"/>
+                 <attribute name="Main-Date" 
value="${version.entry.commit.date}"/>
+                               <attribute name="Debian-Release" 
value="${debian.version}"/>
+                               <attribute name="Class-Path" 
value="/usr/share/java/gettext-commons.jar 
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar"/>
+Index: josm/src/org/openstreetmap/josm/data/Version.java
+===================================================================
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java     2011-08-07 
01:04:13.000000000 +0200
++++ josm/src/org/openstreetmap/josm/data/Version.java  2011-08-07 
11:14:35.000000000 +0200
+@@ -205,9 +205,6 @@
      public String getAgentString() {
          int v = getVersion();
          String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : 
Integer.toString(v);
diff --git a/debian/patches/series b/debian/patches/series
index f6aacf6..a166bf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 10-build.patch
 20-bts.patch
 40-elemstyles.patch
-50-preferences_world_readable.patch
 70-default_look_and_feel.patch
 80-fix_images.patch
 90-fix_version.patch

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

Reply via email to