The following commit has been merged in the master branch: commit ba90f82a06601a81e0981cad13a7c495de51bcbc Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Sat Dec 5 00:17:40 2009 +0100
Debian version detection code fixed diff --git a/debian/patches/10_build.dpatch b/debian/patches/10_build.dpatch index b9d4429..050e28e 100755 --- a/debian/patches/10_build.dpatch +++ b/debian/patches/10_build.dpatch @@ -6,8 +6,8 @@ @DPATCH@ 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 +--- josm~/build.xml 2009-12-04 15:46:42.000000000 +0100 ++++ josm/build.xml 2009-12-05 00:12:43.000000000 +0100 @@ -21,9 +21,10 @@ </condition> @@ -38,7 +38,15 @@ diff -urNad josm~/build.xml josm/build.xml <tstamp> <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/> </tstamp> -@@ -66,45 +60,37 @@ +@@ -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"> @@ -93,7 +101,7 @@ diff -urNad josm~/build.xml josm/build.xml </jar> </target> -@@ -127,7 +113,8 @@ +@@ -127,7 +114,8 @@ target="1.5" source="1.5" debug="on" encoding="UTF-8"> <compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:unchecked"/> @@ -103,7 +111,7 @@ diff -urNad josm~/build.xml josm/build.xml </target> <target name="init"> -@@ -137,7 +124,8 @@ +@@ -137,7 +125,8 @@ <target name="clean"> <delete dir="build" /> @@ -114,8 +122,8 @@ diff -urNad josm~/build.xml josm/build.xml <path id="test.classpath"> 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 +--- josm~/i18n/build.xml 2009-12-04 15:43:44.000000000 +0100 ++++ josm/i18n/build.xml 2009-12-05 00:02:22.000000000 +0100 @@ -58,10 +58,14 @@ </gettext-extract> </target> diff --git a/debian/patches/20_bts.dpatch b/debian/patches/20_bts.dpatch index 909582d..bac2a8e 100755 --- a/debian/patches/20_bts.dpatch +++ b/debian/patches/20_bts.dpatch @@ -6,8 +6,8 @@ @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:05:10.000000000 +0100 -+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java 2009-12-04 15:40:31.000000000 +0100 +--- 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 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -18,27 +18,16 @@ 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; -@@ -56,6 +59,10 @@ - - Version version = Version.getInstance(); - -+ Pattern debianReleasePattern = Pattern.compile(".*?(?:Debian-Release): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); -+ Matcher match = debianReleasePattern.matcher(revision.getText()); -+ String debianRelease = match.matches() ? match.group(1) : tr("UNKNOWN"); -+ - 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 @@ +@@ -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()); -+ info.add(new JLabel(tr("Debian release: {0}",debianRelease)), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0)); ++ info.add(new JLabel(tr("Debian release: {0}", version.getDebianVersionString())), 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}",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 +79,7 @@ +@@ -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)); @@ -47,9 +36,40 @@ 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 @@ + + private int version; + private String revision; ++ private String debianVersion; + private String time; + private boolean isLocalBuild; + +@@ -110,6 +111,8 @@ + version = JOSM_UNKNOWN_VERSION; + } + ++ debianVersion = properties.get("Debian-Release"); ++ + // the last changed data + // + time = properties.get("Last Changed Date"); +@@ -156,6 +159,10 @@ + return version == 0 ? tr("UNKNOWN") : Integer.toString(version); + } + ++ public String getDebianVersionString() { ++ return debianVersion; ++ } ++ + /** + * 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:05:12.000000000 +0100 -+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-12-04 15:38:23.000000000 +0100 +--- 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 @@ Object[] options = new String[]{tr("Do nothing"), tr("Report 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