[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b
The following commit has been merged in the master branch: commit 87783ffa1207aaa7da634c67e319a45dd2bd942c Author: David Paleino da...@debian.org Date: Tue Nov 13 22:28:27 2012 +0100 Strip comments from po-files, to save some space in the tarball during repackaging. diff --git a/debian/changelog b/debian/changelog index 46fbfdc..5756177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ josm (0.0.svn5531+dfsg1-2) UNRELEASED; urgency=low * Added missing copyright information for src/org/jdesktop/* and src/gnu/*. + * Strip comments from po-files, to save some space in the tarball +during repackaging. - -- David Paleino da...@debian.org Tue, 30 Oct 2012 19:01:21 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:27:54 +0100 josm (0.0.svn5531+dfsg1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 2e15a61..8666768 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,12 @@ get-orig-source: svn export ${SVNI18NREPO} ${DESTDIR}/i18n @echo Downloading translations from Launchpad bzr export -v ${DESTDIR}/i18n/po/ lp:~openstreetmap/josm/josm_trans/ - mv ${DESTDIR}/i18n/po/josm/* ${DESTDIR}/i18n/po/ + @echo Stripping comments from translations to save some space in the tarball + for i in ${DESTDIR}/i18n/po/josm/*.po; do \ + grep -v ^# $$i ${DESTDIR}/i18n/po/`basename $$i`; \ + done + mv ${DESTDIR}/i18n/po/josm/*.pot ${DESTDIR}/i18n/po/ + rm -rf ${DESTDIR}/i18n/po/josm/ @echo Removing jar files find ${DESTDIR} -name *.jar -exec rm -v {} \; @echo Removing images_nodist -- 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
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b
The following commit has been merged in the master branch: commit c182da6b075116b5c2f67561f3cff10da0157a25 Merge: 87783ffa1207aaa7da634c67e319a45dd2bd942c 1821c93b66ff22c83e66a066cef02429c975ea0d Author: David Paleino da...@debian.org Date: Tue Nov 13 22:29:00 2012 +0100 Merge tag 'upstream/0.0.svn5576+dfsg1' Upstream version 0.0.svn5576+dfsg1 # gpg: Signature made mar 13 nov 2012 22:28:57 CET using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- 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
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b
The following commit has been merged in the master branch: commit 452029b970ac581564d69371c507194bcbe8465d Author: David Paleino da...@debian.org Date: Tue Nov 13 22:30:28 2012 +0100 Uploading to sid diff --git a/debian/changelog b/debian/changelog index 5696409..6be16c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn5576+dfsg1-1) UNRELEASED; urgency=low +josm (0.0.svn5576+dfsg1-1) unstable; urgency=low * New tested snapshot. * Added missing copyright information for src/org/jdesktop/* and @@ -6,7 +6,7 @@ josm (0.0.svn5576+dfsg1-1) UNRELEASED; urgency=low * Strip comments from po-files, to save some space in the tarball during repackaging. - -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:29:34 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:30:22 +0100 josm (0.0.svn5531+dfsg1-1) unstable; urgency=low -- 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
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b
The following commit has been merged in the master branch: commit 3410deb8e88e0df672e1efc733f263219bde127d Author: David Paleino da...@debian.org Date: Tue Nov 13 22:30:12 2012 +0100 Patches refreshed diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch index b826168..a94eb72 100644 --- a/debian/patches/02-elemstyles.patch +++ b/debian/patches/02-elemstyles.patch @@ -47,12 +47,12 @@ applications. This patch points josm to the shared directories. import org.openstreetmap.josm.gui.preferences.SourceEntry; import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; -@@ -1265,7 +1266,20 @@ public class TaggingPreset extends Abstr - - protected static ImageIcon loadImageIcon(String iconName, File zipIcons) { - final CollectionString s = Main.pref.getCollection(taggingpreset.icon.sources, null); --return new ImageProvider(iconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true).get(); -+ImageIcon icon = new ImageProvider(iconName).setDirs(s).setId(presets).setArchive(zipIcons).setOptional(true).get(); +@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr + if (maxSize != null) { + imgProv.setMaxSize(24); + } +-return imgProv.get(); ++ImageIcon icon = imgProv.get(); +if (icon == null) { +if (iconName.startsWith(styles/standard/)) { +String realIconName = iconName.replaceAll(styles/standard/, ); diff --git a/debian/patches/04-fix_images.patch b/debian/patches/04-fix_images.patch index ed5f2db..1bdb5bf 100644 --- a/debian/patches/04-fix_images.patch +++ b/debian/patches/04-fix_images.patch @@ -9,7 +9,7 @@ Forwarded: not-needed --- josm.orig/data/defaultpresets.xml +++ josm/data/defaultpresets.xml -@@ -3033,7 +3033,7 @@ Note that for a match, at least one posi +@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi key key=amenity value=theatre / text key=name text=Name / /item @@ -18,7 +18,7 @@ Forwarded: not-needed link href=http://wiki.openstreetmap.org/wiki/Tag:amenity=library; de.href=http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library; fi.href=http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library; -@@ -3337,7 +3337,7 @@ Note that for a match, at least one posi +@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi space / /item separator/ -- 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
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5531+dfsg1-1-7-g452029b
The following commit has been merged in the master branch: commit 753556cdc035fb3205e3107af297273a52bfba16 Author: David Paleino da...@debian.org Date: Tue Nov 13 22:29:45 2012 +0100 New tested snapshot. diff --git a/debian/changelog b/debian/changelog index 5756177..5696409 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -josm (0.0.svn5531+dfsg1-2) UNRELEASED; urgency=low +josm (0.0.svn5576+dfsg1-1) UNRELEASED; urgency=low + * New tested snapshot. * Added missing copyright information for src/org/jdesktop/* and src/gnu/*. * Strip comments from po-files, to save some space in the tarball during repackaging. - -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:27:54 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:29:34 +0100 josm (0.0.svn5531+dfsg1-1) unstable; urgency=low -- 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