diff -u josm-0.0.svn1788/debian/changelog josm-0.0.svn1788/debian/changelog --- josm-0.0.svn1788/debian/changelog +++ josm-0.0.svn1788/debian/changelog @@ -1,3 +1,10 @@ +josm (0.0.svn1788-0ubuntu2) karmic; urgency=low + + * Default to GTK look and feel. + - added patch 01-default-look-and-feel.dpatch + + -- Mathieu Trudel Sat, 03 Oct 2009 15:22:29 -0400 + josm (0.0.svn1788-0ubuntu1) karmic; urgency=low * New upstream release. diff -u josm-0.0.svn1788/debian/rules josm-0.0.svn1788/debian/rules --- josm-0.0.svn1788/debian/rules +++ josm-0.0.svn1788/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/dpatch.mk JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ ANT_HOME := /usr/share/ant only in patch2: unchanged: --- josm-0.0.svn1788.orig/debian/patches/01-default-look-and-feel.dpatch +++ josm-0.0.svn1788/debian/patches/01-default-look-and-feel.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-default-look-and-feel.dpatch by Mathieu Trudel +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad josm-0.0.svn1788~/src/org/openstreetmap/josm/data/Preferences.java josm-0.0.svn1788/src/org/openstreetmap/josm/data/Preferences.java +--- josm-0.0.svn1788~/src/org/openstreetmap/josm/data/Preferences.java 2009-10-03 15:49:11.000000000 -0400 ++++ josm-0.0.svn1788/src/org/openstreetmap/josm/data/Preferences.java 2009-10-03 15:57:11.325512575 -0400 +@@ -351,10 +351,12 @@ + put("propertiesdialog.visible", true); + put("selectionlist.visible", true); + put("commandstack.visible", true); +- if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) { +- put("laf", "javax.swing.plaf.metal.MetalLookAndFeel"); +- } else { ++ if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == 0) { + put("laf", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"); ++ } else if (System.getProperty("os.name").toUpperCase().indexOf("LINUX") == 0) { ++ put("laf", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"); ++ } else { ++ put("laf", "javax.swing.plaf.metal.MetalLookAndFeel"); + } + save(); + } only in patch2: unchanged: --- josm-0.0.svn1788.orig/debian/patches/00list +++ josm-0.0.svn1788/debian/patches/00list @@ -0,0 +1 @@ +01-default-look-and-feel.dpatch