[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 3a4e655eeed36a58c98b89de913ba79a3502428c Merge: 452029b970ac581564d69371c507194bcbe8465d 6dbe40bcfe7d968cf1d2077701ffefeb28d233ea Author: David Paleino da...@debian.org Date: Wed Dec 19 22:24:10 2012 +0100 Merge tag 'upstream/0.0.svn5608+dfsg1' Upstream version 0.0.svn5608+dfsg1 # gpg: Signature made mer 19 dic 2012 22:24:01 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.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 863686e1a7cbcd2fb7091343ac417b92212f350b Author: David Paleino da...@debian.org Date: Wed Dec 19 22:28:39 2012 +0100 New tested snapshot. diff --git a/debian/changelog b/debian/changelog index 6be16c3..681b777 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low + + * New tested snapshot. + + -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:28:24 +0100 + josm (0.0.svn5576+dfsg1-1) unstable; urgency=low * New tested snapshot. -- 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, pristine-tar, updated. be57b91f731c3be69fc19bdf254c1023771d9023
The following commit has been merged in the pristine-tar branch: commit be57b91f731c3be69fc19bdf254c1023771d9023 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:24:00 2012 +0100 pristine-tar data for josm_0.0.svn5608+dfsg1.orig.tar.gz diff --git a/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta b/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..72e6a9b Binary files /dev/null and b/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta differ diff --git a/josm_0.0.svn5608+dfsg1.orig.tar.gz.id b/josm_0.0.svn5608+dfsg1.orig.tar.gz.id new file mode 100644 index 000..95a49a4 --- /dev/null +++ b/josm_0.0.svn5608+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +c46d76fda124e5473e0f026c790e621188ae2211 -- 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.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 608374a298c98ad3278c7da757e9b546b26b1d82 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:34:34 2012 +0100 Added bug number diff --git a/debian/changelog b/debian/changelog index 9802594..ff81b6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low - * New tested snapshot. + * New tested snapshot (Closes: #695197). * Update josm.desktop to make it work also in Unity (Closes: #690585) -- 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.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch:
commit 7e9f07cb3b6df884ab7ec55909265ed11bfe9dd4
Author: David Paleino da...@debian.org
Date: Wed Dec 19 22:30:02 2012 +0100
Patches refreshed
diff --git a/debian/patches/02-elemstyles.patch
b/debian/patches/02-elemstyles.patch
index a94eb72..8005110 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -47,9 +47,9 @@ 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;
-@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr
+@@ -1289,7 +1290,20 @@ public class TaggingPreset extends Abstr
if (maxSize != null) {
- imgProv.setMaxSize(24);
+ imgProv.setMaxSize(maxSize);
}
-return imgProv.get();
+ImageIcon icon = imgProv.get();
diff --git a/debian/patches/04-fix_images.patch
b/debian/patches/04-fix_images.patch
index 1bdb5bf..b111d83 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
-@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi
+@@ -3243,7 +3243,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;
-@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi
+@@ -3562,7 +3562,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] openstreetmap-map-icons branch, pristine-tar, updated. 4a096ccf7209b971673c0111a0af3d47de6bb60e
The following commit has been merged in the pristine-tar branch: commit 4a096ccf7209b971673c0111a0af3d47de6bb60e Author: David Paleino da...@debian.org Date: Wed Dec 19 22:57:49 2012 +0100 pristine-tar data for openstreetmap-map-icons_0.0.svn28731.orig.tar.gz diff --git a/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta new file mode 100644 index 000..cff2ae4 Binary files /dev/null and b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta differ diff --git a/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id new file mode 100644 index 000..4b69e58 --- /dev/null +++ b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id @@ -0,0 +1 @@ +1ef00be6d180c34983a150d8ce2d6627effecb37 -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-6-gb7e1e1c
The following commit has been merged in the master branch: commit a765fe561bc63049b4237526d2168f0809c9f273 Merge: f0120af2f35c241b93f5b40d99437f5874b328c9 5246193b719cd2302396cbb400af3e59d6c1c9f0 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:58:12 2012 +0100 Merge tag 'upstream/0.0.svn28731' Upstream version 0.0.svn28731 # gpg: Signature made mer 19 dic 2012 22:57:50 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 -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-6-gb7e1e1c
The following commit has been merged in the master branch: commit b7e1e1c30d54cad7d0ae7512cb6944035d28108a Merge: 0d70afb6a04f8ed2dbd08695d6e63d0c4e13d4a1 ead9b39d9d87b657976c5cf80f2903d3320b5a44 Author: David Paleino da...@debian.org Date: Wed Dec 19 23:28:50 2012 +0100 Merge remote-tracking branch 'origin/master' Conflicts: debian/changelog diff --combined debian/changelog index 4795209,4ced48a..3449c10 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,14 @@@ -openstreetmap-map-icons (1:0.0.svn27763-2) UNRELEASED; urgency=low +openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low ++ [ Giovanni Mascellani ] + * Remove myself from the uploaders list, since I have no time + anymore to look after this package. ++ ++ [ David Paleino ] + * New SVN snapshot + * Standards-Version bump to 3.9.4, no changes needed - -- Giovanni Mascellani g...@debian.org Tue, 28 Aug 2012 00:09:22 +0200 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:58:43 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low diff --combined debian/control index 3e4e80c,8bb19e4..9c0e189 --- a/debian/control +++ b/debian/control @@@ -2,10 -2,10 +2,10 @@@ Source: openstreetmap-map-icon Section: utils Priority: optional Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org - Uploaders: Giovanni Mascellani g...@debian.org - , David Paleino da...@debian.org + Uploaders: + David Paleino da...@debian.org Build-Depends: debhelper (= 8~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons Vcs-Git: git://git.debian.org/pkg-osm/openstreetmap-map-icons.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/openstreetmap-map-icons.git -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-8-g4b79f7c
The following commit has been merged in the master branch: commit 4b79f7c23956b11e89bcd337084720fc69bebe6d Author: David Paleino da...@debian.org Date: Wed Dec 19 23:33:21 2012 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 0847cca..2931199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low +openstreetmap-map-icons (1:0.0.svn28731-1) unstable; urgency=low [ Giovanni Mascellani ] * Remove myself from the uploaders list, since I have no time @@ -9,7 +9,7 @@ openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low * Standards-Version bump to 3.9.4, no changes needed * Updated Vcs-* fields - -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:32:56 +0100 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:33:12 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-8-g4b79f7c
The following commit has been merged in the master branch: commit 6c5c8b80546c235468a8bfd8f6fcf36cf4cbbded Author: David Paleino da...@debian.org Date: Wed Dec 19 23:33:04 2012 +0100 Updated Vcs-* fields diff --git a/debian/changelog b/debian/changelog index 3449c10..0847cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low [ David Paleino ] * New SVN snapshot * Standards-Version bump to 3.9.4, no changes needed + * Updated Vcs-* fields - -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:58:43 +0100 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:32:56 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9c0e189..0692c8a 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Build-Depends: debhelper (= 8~) Standards-Version: 3.9.4 Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons -Vcs-Git: git://git.debian.org/pkg-osm/openstreetmap-map-icons.git -Vcs-Browser: http://git.debian.org/?p=pkg-osm/openstreetmap-map-icons.git +Vcs-Git: git://anonscm.debian.org/pkg-osm/openstreetmap-map-icons.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/openstreetmap-map-icons.git Package: openstreetmap-map-icons-classic Architecture: all -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons annotated tag, debian/1_0.0.svn28731-1, created. debian/1_0.0.svn28731-1
The annotated tag, debian/1_0.0.svn28731-1 has been created at b9fe8a043b3eb360fd9e20e4d2fd3cc3259f542c (tag) tagging 4b79f7c23956b11e89bcd337084720fc69bebe6d (commit) replaces debian/1_0.0.svn27763-1 tagged by David Paleino on Wed Dec 19 23:38:09 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDSQdEACgkQ5qqQFxOSsXSx7QCgvhg3TqGy6kQRBBddeqJisbHR ATcAn3X36a74iBygtG+MWQeXnkUXRLIW =yxAo -END PGP SIGNATURE- David Paleino (7): Imported Upstream version 0.0.svn28731 Merge tag 'upstream/0.0.svn28731' New SVN snapshot Standards-Version bump to 3.9.4, no changes needed Merge remote-tracking branch 'origin/master' Updated Vcs-* fields Releasing to sid Giovanni Mascellani (1): Remove myself from the uploaders list. --- -- OpenStreetMap icon artworks ___ 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] openstreetmap-map-icons annotated tag, upstream/0.0.svn28731, created. upstream/0.0.svn28731
The annotated tag, upstream/0.0.svn28731 has been created at 87a2703cbc7d8fcee0897894c72d2c06d05260d3 (tag) tagging 5246193b719cd2302396cbb400af3e59d6c1c9f0 (commit) replaces upstream/0.0.svn27763 tagged by David Paleino on Wed Dec 19 22:57:50 2012 +0100 - Shortlog Upstream version 0.0.svn28731 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDSOF4ACgkQ5qqQFxOSsXRzQgCeOFm1EUmh0/ueOQUMtzHW3ZtU tZAAn2izpkyyV0KUeUI32W0GcvNvCIU1 =xSBT -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn28731 --- -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
