The following commit has been merged in the master branch:
commit 121c57be0e1ecfd40db3e9363819999a8f58169a
Author: David Paleino <[email protected]>
Date: Sat Mar 6 19:39:40 2010 +0100
debian/patches/*: converted from dpatch to quilt
diff --git a/debian/changelog b/debian/changelog
index 3910cc0..69e1f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn2561-3) UNRELEASED; urgency=low
+
+ * debian/patches/*:
+ - converted from dpatch to quilt
+
+ -- David Paleino <[email protected]> Sat, 06 Mar 2010 19:38:43 +0100
+
josm (0.0.svn2561-2) unstable; urgency=low
* debian/watch fixed: implemented a redirector for uscan on Alioth.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1db8396..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-10_build
-20_bts
-40_elemstyles
-50_preferences_world_readable.dpatch
diff --git a/debian/patches/10_build.dpatch b/debian/patches/10-build.patch
old mode 100755
new mode 100644
similarity index 88%
rename from debian/patches/10_build.dpatch
rename to debian/patches/10-build.patch
index 050e28e..7a18b35
--- a/debian/patches/10_build.dpatch
+++ b/debian/patches/10-build.patch
@@ -1,129 +1,130 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_build.dpatch by Andreas Putzo <[email protected]>
-##
-## DP: Adjustments to the ant build file, mainly to not include
-## DP: the dependencies into the target jar file.
+From: Andreas Putzo <[email protected]>
+Subject: adjustments to the ant build file, mainly to not include
+ the dependencies into the target jar file.
+Forwarded: no
-...@dpatch@
-diff -urNad josm~/build.xml josm/build.xml
---- josm~/build.xml 2009-12-04 15:46:42.000000000 +0100
-+++ josm/build.xml 2009-12-05 00:12:43.000000000 +0100
+---
+ build.xml | 51 ++++++++++++++++++++-------------------------------
+ i18n/build.xml | 23 +++++++++++++++++++----
+ 2 files changed, 39 insertions(+), 35 deletions(-)
+
+--- josm.orig/build.xml
++++ josm/build.xml
@@ -21,9 +21,10 @@
- </condition>
-
- <!-- Java classpath addition (all jar files to compile tests with this)
-->
-- <path id="classpath">
-- <fileset dir="lib">
-- <include name="**/*.jar"/>
+ </condition>
+
+ <!-- Java classpath addition (all jar files to compile tests with this)
-->
+- <path id="classpath">
+- <fileset dir="lib">
+- <include name="**/*.jar"/>
+ <path id="classpath">
+ <fileset dir="/usr/share/java">
+ <include name="gettext-commons.jar"/>
-+ <include name="metadata-extractor.jar"/>
- </fileset>
- </path>
-
++ <include name="metadata-extractor.jar"/>
+ </fileset>
+ </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="."/>
-- </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>
+ -->
+ <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,51 +54,44 @@
- # automatically generated by JOSM build.xml - do not edit
- Revision: ${version.entry.commit.revision}
- Is-Local-Build: true
--Build-Date: ${build.tstamp}
-+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"/>
+ # automatically generated by JOSM build.xml - do not edit
+ Revision: ${version.entry.commit.revision}
+ Is-Local-Build: true
+-Build-Date: ${build.tstamp}
++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"/>
+ <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"/>
++ <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"/>
+ <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"
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}"/>
++ <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 -->
+ <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="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"/>
- </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" />
- </jar>
- </target>
-
-@@ -127,7 +114,8 @@
- target="1.5" source="1.5" debug="on"
encoding="UTF-8">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
-- </javac>
++ <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" />
+ </jar>
+ </target>
+
+@@ -127,7 +114,8 @@ Build-Date: ${build.tstamp}
+ target="1.5" source="1.5" debug="on"
encoding="UTF-8">
+ <compilerarg value="-Xlint:deprecation"/>
+ <compilerarg value="-Xlint:unchecked"/>
+- </javac>
+ </javac>
-+ <ant target="build" dir="i18n"/>
- </target>
-
- <target name="init">
-@@ -137,7 +125,8 @@
-
- <target name="clean">
- <delete dir="build" />
-- <delete dir="dist" />
++ <ant target="build" dir="i18n"/>
+ </target>
+
+ <target name="init">
+@@ -137,7 +125,8 @@ Build-Date: ${build.tstamp}
+
+ <target name="clean">
+ <delete dir="build" />
+- <delete dir="dist" />
+ <delete dir="dist" />
-+ <ant target="clean" dir="i18n"/>
- </target>
-
- <path id="test.classpath">
-diff -urNad josm~/i18n/build.xml josm/i18n/build.xml
---- josm~/i18n/build.xml 2009-12-04 15:43:44.000000000 +0100
-+++ josm/i18n/build.xml 2009-12-05 00:02:22.000000000 +0100
++ <ant target="clean" dir="i18n"/>
+ </target>
+
+ <path id="test.classpath">
+--- josm.orig/i18n/build.xml
++++ josm/i18n/build.xml
@@ -58,10 +58,14 @@
</gettext-extract>
</target>
diff --git a/debian/patches/20_bts.dpatch b/debian/patches/20-bts.patch
old mode 100755
new mode 100644
similarity index 80%
rename from debian/patches/20_bts.dpatch
rename to debian/patches/20-bts.patch
index bac2a8e..6aa84f6
--- a/debian/patches/20_bts.dpatch
+++ b/debian/patches/20-bts.patch
@@ -1,14 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts.dpatch by Andreas Putzo <[email protected]>
-##
-## DP: Point to the debian BTS for bug reports.
-## DP: Pattern match debian version in about dialog.
+From: Andreas Putzo <[email protected]>
+Subject: point to the debian BTS for bug reports.
+ Pattern match debian version in about dialog.
+Forwarded: no
-...@dpatch@
-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:46:43.000000000 +0100
-+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java 2009-12-05
00:16:39.000000000 +0100
-@@ -9,6 +9,9 @@
+---
+ 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(-)
+
+--- 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;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -18,7 +21,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/actions/AboutAction.java josm/src/o
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
-@@ -63,6 +66,8 @@
+@@ -63,6 +66,8 @@ public class AboutAction extends JosmAct
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());
@@ -27,7 +30,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/actions/AboutAction.java josm/src/o
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 @@
+@@ -70,7 +75,7 @@ public class AboutAction extends JosmAct
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));
@@ -36,10 +39,9 @@ diff -urNad
josm~/src/org/openstreetmap/josm/actions/AboutAction.java josm/src/o
JTextArea revision = new JTextArea();
revision.setEditable(false);
-diff -urNad josm~/src/org/openstreetmap/josm/data/Version.java
josm/src/org/openstreetmap/josm/data/Version.java
---- josm~/src/org/openstreetmap/josm/data/Version.java 2009-12-04
15:46:43.000000000 +0100
-+++ josm/src/org/openstreetmap/josm/data/Version.java 2009-12-05
00:15:44.000000000 +0100
-@@ -65,6 +65,7 @@
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java
++++ josm/src/org/openstreetmap/josm/data/Version.java
+@@ -65,6 +65,7 @@ public class Version {
private int version;
private String revision;
@@ -47,7 +49,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/data/Version.java josm/src/org/open
private String time;
private boolean isLocalBuild;
-@@ -110,6 +111,8 @@
+@@ -110,6 +111,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
@@ -56,7 +58,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/data/Version.java josm/src/org/open
// the last changed data
//
time = properties.get("Last Changed Date");
-@@ -156,6 +159,10 @@
+@@ -156,6 +159,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
@@ -67,10 +69,9 @@ diff -urNad
josm~/src/org/openstreetmap/josm/data/Version.java josm/src/org/open
/**
* Replies a text with the release attributes
*
-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:46:44.000000000 +0100
-+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-12-05 00:13:48.000000000 +0100
-@@ -57,8 +57,8 @@
+--- 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
Object[] options = new String[]{tr("Do nothing"), tr("Report
Bug")};
int answer = JOptionPane.showOptionDialog(Main.parent, tr("An
unexpected exception occurred.\n\n" +
@@ -81,7 +82,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.jav
tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE,null,
options, options[0]);
if (answer == 1) {
-@@ -89,21 +89,10 @@
+@@ -89,21 +89,10 @@ public final class BugReportExceptionHan
"UTF-8")));
JPanel p = new JPanel(new GridBagLayout());
diff --git a/debian/patches/40-elemstyles.patch
b/debian/patches/40-elemstyles.patch
new file mode 100644
index 0000000..375fbdf
--- /dev/null
+++ b/debian/patches/40-elemstyles.patch
@@ -0,0 +1,25 @@
+From: Andreas Putzo <[email protected]>
+Subject: the icons have been removed from the JAR file because they are
+ already provided by the openstreetmap-map-icons-* packages.
+ Point josm to the correct directory so that the icons are found.
+Forwarded: not-needed
+
+---
+ src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- 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 {
+ {
+ LinkedList<String> f = new LinkedList<String>(iconDirs);
+ /* don't prefix icon path, as it should be generic */
+- f.add("resource://images/styles/standard/");
+- f.add("resource://images/styles/");
++ f.add("/usr/share/icons/openstreetmap/classic.small");
++ f.add("/usr/share/icons/openstreetmap/square.small");
++ f.add("/usr/share/icons/openstreetmap/classic.big");
++ f.add("/usr/share/icons/openstreetmap/square.big");
+ iconDirs = f;
+ }
+
diff --git a/debian/patches/40_elemstyles.dpatch
b/debian/patches/40_elemstyles.dpatch
deleted file mode 100755
index 37137cc..0000000
--- a/debian/patches/40_elemstyles.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_elemstyles.dpatch by Andreas Putzo <[email protected]>
-##
-## DP: The icons have been removed from the JAR file because they are
-## DP: already provided by the openstreetmap-map-icons-* packages.
-## DP: Point josm to the correct directory so that the icons are found.
-
-...@dpatch@
-diff -urNad trunk~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
---- trunk~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
2009-07-07 19:54:54.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
2009-09-14 15:56:15.000000000 +0200
-@@ -55,8 +55,10 @@
- {
- LinkedList<String> f = new LinkedList<String>(iconDirs);
- /* don't prefix icon path, as it should be generic */
-- f.add("resource://images/styles/standard/");
-- f.add("resource://images/styles/");
-+ f.add("/usr/share/icons/openstreetmap/classic.small");
-+ f.add("/usr/share/icons/openstreetmap/square.small");
-+ f.add("/usr/share/icons/openstreetmap/classic.big");
-+ f.add("/usr/share/icons/openstreetmap/square.big");
- iconDirs = f;
- }
-
diff --git a/debian/patches/50_preferences_world_readable.dpatch
b/debian/patches/50-preferences_world_readable.patch
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/50_preferences_world_readable.dpatch
rename to debian/patches/50-preferences_world_readable.patch
index 775a6b8..fa3d243
--- a/debian/patches/50_preferences_world_readable.dpatch
+++ b/debian/patches/50-preferences_world_readable.patch
@@ -1,14 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_preferences_world_readable.dpatch by David Paleino <[email protected]>
-##
-## DP: Make the preferences file owner-only readable
-## Forwarded: https://josm.openstreetmap.de/ticket/4667
+From: David Paleino <[email protected]>
+Subject: make the preferences file owner-only readable
+Forwarded: https://josm.openstreetmap.de/ticket/4667
-...@dpatch@
-diff -urNad josm~/src/org/openstreetmap/josm/data/Preferences.java
josm/src/org/openstreetmap/josm/data/Preferences.java
---- josm~/src/org/openstreetmap/josm/data/Preferences.java
+---
+ 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
-@@ -346,6 +346,14 @@
+@@ -346,6 +346,14 @@ public class Preferences {
File tmpFile = new File(prefFile + "_tmp");
copyFile(tmpFile, prefFile);
tmpFile.delete();
@@ -23,7 +23,7 @@ diff -urNad
josm~/src/org/openstreetmap/josm/data/Preferences.java josm/src/org/
}
/**
-@@ -462,6 +470,13 @@
+@@ -462,6 +470,13 @@ public class Preferences {
System.err.println(tr("Warning: Failed to initialize
preferences.Failed to reset preference file to default: {0}",
getPreferenceFile()));
}
}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2e85da3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+10-build.patch
+20-bts.patch
+40-elemstyles.patch
+50-preferences_world_readable.patch
--
Java OpenStreetMap editor
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
