from:"David Paleino"

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit b70b9a08b460daffe6ac7e7bd7fd55cd91c06079
Author: David Paleino 
Date:   Thu Mar 6 00:32:20 2014 +0100

Added overrides for lintian's experimental privacy-breach-generic tag

diff --git a/debian/changelog b/debian/changelog
index 223e7b1..0d769ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   * Bumped Standards-Version to 3.9.5, no changes needed
   * Dropped alternative dependency on obsolete JREs: openjdk-6-jre and
 sun-java6-jre
+  * Added overrides for lintian's experimental privacy-breach-generic
+tag
 
- -- David Paleino   Thu, 06 Mar 2014 00:26:05 +0100
+ -- David Paleino   Thu, 06 Mar 2014 00:31:50 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/josm.lintian-overrides b/debian/josm.lintian-overrides
new file mode 100644
index 000..62a5127
--- /dev/null
+++ b/debian/josm.lintian-overrides
@@ -0,0 +1,394 @@
+# these are meant to be like that
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=motorway
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=motorway_link
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=trunk
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/link_(highway)
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=primary
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=secondary
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=tertiary
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=unclassified
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=residential
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/key:bicycle_road
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=living_street
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=pedestrian
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=service
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:service=parking_aisle
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=road
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=construction
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/key:access
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:junction=roundabout
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/key:bridge
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/key:ford
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=track
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=path
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=bridleway
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/bicycle
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=cycleway
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=footway
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=steps
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=motorway_junction
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=services
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=rest_area
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=traffic_signals
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=mini_roundabout
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/key:crossing
+josm: privacy-breach-generic

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 48882a1fc7f69edc732fd2ed061737f580e43480
Merge: d91ae0011f571f2dc5a834d17d6a783d51ebf954 
c9cfaa4783aad19f8483a9f1ba24bf99061a9a1c
Author: David Paleino 
Date:   Wed Mar 5 23:29:46 2014 +0100

Merge tag 'upstream/0.0.svn6502+dfsg3'

Upstream version 0.0.svn6502+dfsg3

# gpg: Signature made mer 05 mar 2014 23:29:39 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 8934bd580343c4880f60cae5283b281c22b6bb83
Author: David Paleino 
Date:   Wed Mar 5 20:43:54 2014 +0100

Finalize embedded-code removal

diff --git a/debian/changelog b/debian/changelog
index 87ba4c9..a371e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
 
   * New DFSG tarball
 - removed embedded code copy of jmapviewer (Closes: #731029)
+  * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
+jmapviewer in the final JOSM JAR
+  * Removed references to embedded jmapviewer in debian/copyright
   * De-fuzzed 00-build.patch
 
- -- David Paleino   Wed, 05 Mar 2014 20:42:35 +0100
+ -- David Paleino   Wed, 05 Mar 2014 20:43:19 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d647a64..f447768 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  , liboauth-signpost-java (>= 1.2)
  , libsvgsalamander-java
  , libterm-readkey-perl
+ , jmapviewer
 Standards-Version: 3.9.4
 Homepage: http://josm.openstreetmap.de
 Vcs-Git: git://anonscm.debian.org/pkg-osm/josm.git
@@ -36,6 +37,7 @@ Depends:
  , libsvgsalamander-java
  , openstreetmap-map-icons-classic
  , ant
+ , jmapviewer
  , ${misc:Depends}
 Recommends: josm-plugins
  , josm-l10n
diff --git a/debian/copyright b/debian/copyright
index 3b38562..6c11879 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,11 +27,6 @@ Copyright: © 1987-1997, Free Software Foundation, Inc.
  © 1998, Aaron M. Renn 
 License: LGPL-2.1+
 
-Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java
- src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
-Copyright: © 2009, Stefan Zeller
-License: GPL-3+
-
 Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
 Copyright: © 1994-2007, Sun Microsystems, Inc.
 License: other
@@ -137,8 +132,7 @@ License: PD
  up with any other open source license - just use it. You can rename
  the files, move the Java packages, whatever you want.
 
-Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
- src/org/openstreetmap/josm/gui/download/OsmMapControl.java
+Files: src/org/openstreetmap/josm/gui/download/OsmMapControl.java
  src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
  src/org/openstreetmap/josm/gui/download/SizeButton.java
 Copyright: © 2007, Tim Haussmann
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 57d1bb4..b497089 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -7,9 +7,9 @@ Adjustements to the ant build.xml files, mainly to use 
system-provided
 JARs and not depend on Internet connection.
 
 ---
- build.xml  |   44 
+ build.xml  |   45 +
  i18n/build.xml |   33 -
- 2 files changed, 36 insertions(+), 41 deletions(-)
+ 2 files changed, 37 insertions(+), 41 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
  
-@@ -22,10 +23,16 @@
+@@ -22,10 +23,17 @@
  
  
  
@@ -34,13 +34,14 @@ JARs and not depend on Internet connection.
 +  
 +  
 +  
++  
  
  
 +
  
  
  
  
@@ -56,7 +57,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -59,6 +59,7 @@
+@@ -59,6 +60,7 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -64,7 +65,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -79,7 +80,7 @@ JARs and not depend on Internet connection.
  
  
  Revision ${version.entry.commit.revision}
-@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
+@@ -85,7 +80,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -89,7 +90,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+@@ -95,6 +91,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -98,7 +99,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +166,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -110,7 +111,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
+@@ -180,11 +175,11 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -124,7 +125,7 @@ JARs and not depend on Internet connect

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 4adbc01298bae49321bfb3f33cdf2df31ee63a3b
Author: David Paleino 
Date:   Wed Mar 5 21:04:28 2014 +0100

Bumped debhelper compatibility to 9

diff --git a/debian/changelog b/debian/changelog
index 54410ba..b592278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
   * Removed references to embedded jmapviewer in debian/copyright
   * De-fuzzed 00-build.patch, 05-fix_version.patch and
 06-move_data_out_of_jar.patch
+  * Bumped debhelper compatibility to 9
 
- -- David Paleino   Wed, 05 Mar 2014 21:03:52 +0100
+ -- David Paleino   Wed, 05 Mar 2014 21:04:16 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f447768..82e1fe2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  ant
  , ant-contrib
  , javacc
- , debhelper (>= 8~)
+ , debhelper (>= 9~)
  , gettext
  , default-jdk
  , libcommons-codec-java

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit b3994c0465aa8e63b5e9c55498177e538a1d5c32
Author: David Paleino 
Date:   Wed Mar 5 21:04:04 2014 +0100

De-fuzzed 00-build.patch, 05-fix_version.patch and 
06-move_data_out_of_jar.patch

diff --git a/debian/changelog b/debian/changelog
index a371e80..54410ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
 jmapviewer in the final JOSM JAR
   * Removed references to embedded jmapviewer in debian/copyright
-  * De-fuzzed 00-build.patch
+  * De-fuzzed 00-build.patch, 05-fix_version.patch and
+06-move_data_out_of_jar.patch
 
- -- David Paleino   Wed, 05 Mar 2014 20:43:19 +0100
+ -- David Paleino   Wed, 05 Mar 2014 21:03:52 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 048c5b4..cc07bd0 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -85,7 +85,7 @@ Debian-Release: ${debian.version}
+@@ -86,7 +86,7 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index dc6cc12..9c44f4e 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -13,7 +13,7 @@ Bug-Debian: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -93,9 +93,9 @@ Debian-Release: ${debian.version}
+@@ -94,9 +94,9 @@ Debian-Release: ${debian.version}
  
  
  

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 90f22fc02bb0135e7b91e1f9a9ab2939092228d8
Author: David Paleino 
Date:   Wed Mar 5 20:42:26 2014 +0100

New DFSG tarball - removed embedded code copy of jmapviewer (Closes: 
#731029)

diff --git a/debian/changelog b/debian/changelog
index 10f53f5..8d6a415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
+
+  * New DFSG tarball
+- removed embedded code copy of jmapviewer (Closes: #731029)
+
+ -- David Paleino   Wed, 05 Mar 2014 20:41:34 +0100
+
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
   [ David Paleino ]

-- 
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 annotated tag, debian/0.0.svn6502+dfsg3-1, created. debian/0.0.svn6502+dfsg3-1

2014-03-06 Thread David Paleino

The annotated tag, debian/0.0.svn6502+dfsg3-1 has been created
at  a3cd611d62f7ea1688e3be0a7efa71dbd0dc234c (tag)
   tagging  413ac40aa6bb09737dcf8ccdf89011ac78a73701 (commit)
  replaces  debian/0.0.svn6502+dfsg1-1
 tagged by  David Paleino
on  Thu Mar 6 19:03:43 2014 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iEYEABECAAYFAlMYuH8ACgkQ5qqQFxOSsXTG5ACgpuxboYsRiIe8DFwGnhCc/Smh
BLsAoJZLZFoI4RTn3qab64PwBeMhpVdz
=Dj4J
-END PGP SIGNATURE-

David Paleino (21):
  Imported Upstream version 0.0.svn6502+dfsg2
  Merge tag 'upstream/0.0.svn6502+dfsg2'
  New DFSG tarball - removed embedded code copy of jmapviewer (Closes: 
#731029)
  De-fuzzed 00-build.patch
  Finalize embedded-code removal
  De-fuzzed 00-build.patch, 05-fix_version.patch and 
06-move_data_out_of_jar.patch
  Bumped debhelper compatibility to 9
  Bumped Standards-Version to 3.9.5, no changes needed
  Uploading to sid
  Imported Upstream version 0.0.svn6502+dfsg3
  Merge tag 'upstream/0.0.svn6502+dfsg3'
  New DFSG tarball: removed embedded code copy of JSON-java under 
"good-not-evil" non-free license (Closes: #740890)
  Move bits of patches around to correct places
  Added 08-use_external_json_library.patch to build against the system-wide 
free version of the JSON library
  Added DEP-3 header to 07-downgrade-metadata-extractor.patch
  Dropped alternative dependency on obsolete JREs: openjdk-6-jre and 
sun-java6-jre
  Added overrides for lintian's experimental privacy-breach-generic tag
  Fix debian/rules
  Fix FTBFS
  More overrides
  Releasing to sid

---

-- 
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 annotated tag, upstream/0.0.svn6502+dfsg3, created. upstream/0.0.svn6502+dfsg3

2014-03-06 Thread David Paleino

The annotated tag, upstream/0.0.svn6502+dfsg3 has been created
at  349e7e4fe1935f67b959ed55343a27297a8096cf (tag)
   tagging  c9cfaa4783aad19f8483a9f1ba24bf99061a9a1c (commit)
  replaces  upstream/0.0.svn6502+dfsg2
 tagged by  David Paleino
on  Wed Mar 5 23:29:39 2014 +0100

- Shortlog 
Upstream version 0.0.svn6502+dfsg3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iEYEABECAAYFAlMXpVMACgkQ5qqQFxOSsXRpjQCfVh4cPjdpJy6eicJK0DqzHEcJ
EwMAnRr3M6hel5l5zAjff26MXadcnAe1
=BiEg
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 0.0.svn6502+dfsg3

---

-- 
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 annotated tag, upstream/0.0.svn6502+dfsg2, created. upstream/0.0.svn6502+dfsg2

2014-03-06 Thread David Paleino

The annotated tag, upstream/0.0.svn6502+dfsg2 has been created
at  f729a3be645f9bf83656b8270b05b457575a7ec7 (tag)
   tagging  e24e341078ecb04402cc4283307f7ccb64978570 (commit)
  replaces  upstream/0.0.svn6502+dfsg1
 tagged by  David Paleino
on  Wed Mar 5 18:37:34 2014 +0100

- Shortlog 
Upstream version 0.0.svn6502+dfsg2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iEUEABECAAYFAlMXYN8ACgkQ5qqQFxOSsXQYCwCWODNNrrwfHRnBUwqj1Y3vjy5j
GwCgtI9SCe4JC0m6CcX9Mwqp9cVuV88=
=OyAT
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 0.0.svn6502+dfsg2

---

-- 
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. 688979b684e131da2f69559b487b18bd966ed7f7

2014-03-06 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 916980ad8dcbe9cffbb4becc938b01b31b38ed87
Author: David Paleino 
Date:   Wed Mar 5 18:37:34 2014 +0100

pristine-tar data for josm_0.0.svn6502+dfsg2.orig.tar.gz

diff --git a/josm_0.0.svn6502+dfsg2.orig.tar.gz.delta 
b/josm_0.0.svn6502+dfsg2.orig.tar.gz.delta
new file mode 100644
index 000..7d929bc
Binary files /dev/null and b/josm_0.0.svn6502+dfsg2.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn6502+dfsg2.orig.tar.gz.id 
b/josm_0.0.svn6502+dfsg2.orig.tar.gz.id
new file mode 100644
index 000..d27c66b
--- /dev/null
+++ b/josm_0.0.svn6502+dfsg2.orig.tar.gz.id
@@ -0,0 +1 @@
+97711cd5fca8169223ffdfb9de93da4a003b5678

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 62d4877c0af0f273dc84bbad79cb5f3fb8a71da3
Author: David Paleino 
Date:   Thu Mar 6 00:40:38 2014 +0100

Fix debian/rules

diff --git a/debian/rules b/debian/rules
index 1b6e057..20dfdfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ else
 VERSION := 0.0.0.${DATE}
 endif
 DESTDIR := ../tarballs/josm-${VERSION}
-DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz
+DESTTGZ := ../tarballs/josm_${VERSION}+dfsg3.orig.tar.gz
 
 DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\  -f2)
 DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
@@ -81,6 +81,8 @@ get-orig-source:
rm -fr ${DESTDIR}/src/org/openstreetmap/josm/data/imagery/types/*
@echo Removing embedded code copy of jmapviewer
rm -fr ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/
+   @echo Removing non-free JSON code
+   rm -fr ${DESTDIR}/src/org/json/
@echo Building snapshot tarball
tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 17822c69850f0424702ad06284c57b9bb3befd57
Author: David Paleino 
Date:   Thu Mar 6 17:57:07 2014 +0100

More overrides

diff --git a/debian/josm.lintian-overrides b/debian/josm.lintian-overrides
index 62a5127..d78c409 100644
--- a/debian/josm.lintian-overrides
+++ b/debian/josm.lintian-overrides
@@ -1,4 +1,7 @@
 # these are meant to be like that
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:shop=kitchen
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:shop=curtain
+josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:shop=fram
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=motorway
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=motorway_link
 josm: privacy-breach-generic usr/share/josm/data/defaultpresets.xml 
wiki.openstreetmap.org/wiki/tag:highway=trunk
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 000..004ce10
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# OBVIOUSLY a false positive...
+josm source: license-problem-json-evil 
debian/patches/08-use_external_json_library.patch

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 382a15a8fe9c180eca47e7d80d769241fe5c2433
Author: David Paleino 
Date:   Wed Mar 5 23:56:43 2014 +0100

New DFSG tarball: removed embedded code copy of JSON-java under 
"good-not-evil" non-free license (Closes: #740890)

diff --git a/debian/changelog b/debian/changelog
index df63be7..c063240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-josm (0.0.svn6502+dfsg2-1) unstable; urgency=medium
+josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
 
   * New DFSG tarball
 - removed embedded code copy of jmapviewer (Closes: #731029)
+- removed embedded code copy of JSON-java under "good-not-evil"
+  non-free license (Closes: #740890)
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
 jmapviewer in the final JOSM JAR
   * Removed references to embedded jmapviewer in debian/copyright
@@ -10,7 +12,7 @@ josm (0.0.svn6502+dfsg2-1) unstable; urgency=medium
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino   Wed, 05 Mar 2014 21:05:06 +0100
+ -- David Paleino   Wed, 05 Mar 2014 23:55:21 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit d91ae0011f571f2dc5a834d17d6a783d51ebf954
Author: David Paleino 
Date:   Wed Mar 5 21:05:23 2014 +0100

Uploading to sid

diff --git a/debian/changelog b/debian/changelog
index 421da5e..df63be7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
+josm (0.0.svn6502+dfsg2-1) unstable; urgency=medium
 
   * New DFSG tarball
 - removed embedded code copy of jmapviewer (Closes: #731029)
@@ -10,7 +10,7 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino   Wed, 05 Mar 2014 21:04:50 +0100
+ -- David Paleino   Wed, 05 Mar 2014 21:05:06 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 4d1a131e04f61a028b2fda67969992c063c3e3a4
Author: David Paleino 
Date:   Wed Mar 5 21:05:03 2014 +0100

Bumped Standards-Version to 3.9.5, no changes needed

diff --git a/debian/changelog b/debian/changelog
index b592278..421da5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
   * De-fuzzed 00-build.patch, 05-fix_version.patch and
 06-move_data_out_of_jar.patch
   * Bumped debhelper compatibility to 9
+  * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino   Wed, 05 Mar 2014 21:04:16 +0100
+ -- David Paleino   Wed, 05 Mar 2014 21:04:50 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 82e1fe2..1944d75 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  , libsvgsalamander-java
  , libterm-readkey-perl
  , jmapviewer
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://josm.openstreetmap.de
 Vcs-Git: git://anonscm.debian.org/pkg-osm/josm.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/josm.git

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 34d4acd770e158f58dbff34d92f56ed58e0e1540
Author: David Paleino 
Date:   Thu Mar 6 00:20:15 2014 +0100

Added 08-use_external_json_library.patch to build against the system-wide 
free version of the JSON library

diff --git a/debian/changelog b/debian/changelog
index c063240..295e323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,13 +6,15 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   non-free license (Closes: #740890)
   * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
 jmapviewer in the final JOSM JAR
+  * Added 08-use_external_json_library.patch to build against the
+system-wide free version of the JSON library
   * Removed references to embedded jmapviewer in debian/copyright
   * De-fuzzed 00-build.patch, 05-fix_version.patch and
 06-move_data_out_of_jar.patch
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino   Wed, 05 Mar 2014 23:55:21 +0100
+ -- David Paleino   Thu, 06 Mar 2014 00:19:35 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1944d75..9473c74 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
  , liboauth-signpost-java (>= 1.2)
  , libsvgsalamander-java
  , libterm-readkey-perl
+ , libandroid-json-org-java
  , jmapviewer
 Standards-Version: 3.9.5
 Homepage: http://josm.openstreetmap.de
@@ -38,6 +39,7 @@ Depends:
  , openstreetmap-map-icons-classic
  , ant
  , jmapviewer
+ , libandroid-json-org-java
  , ${misc:Depends}
 Recommends: josm-plugins
  , josm-l10n
diff --git a/debian/patches/08-use_external_json_library.patch 
b/debian/patches/08-use_external_json_library.patch
new file mode 100644
index 000..863bb32
--- /dev/null
+++ b/debian/patches/08-use_external_json_library.patch
@@ -0,0 +1,36 @@
+From: David Paleino 
+Subject: depend on external free version of the JSON library
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740890
+Origin: vendor
+Forwarded: no
+
+---
+ CONTRIBUTION |6 +-
+ build.xml|1 +
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+--- josm.orig/build.xml
 josm/build.xml
+@@ -31,6 +31,7 @@
+   
+   
+   
++  
+ 
+ 
+ 
+--- josm.orig/CONTRIBUTION
 josm/CONTRIBUTION
+@@ -55,10 +55,6 @@ is from Stuart D. Gathman and licensed w
+ The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
+ is from Johan Montagnat and licensed with GPL.
+ 
+-The JSON code (https://github.com/douglascrockford/JSON-java)
+-is from Douglas Crockford and licensed as follows:
+-"The Software shall be used for Good, not Evil."
+-
+ The opening hour validation uses code from opening_hour.js
+ (https://github.com/ypid/opening_hours.js) which is licensed
+-with the New (2-clause) BSD license.
+\ No newline at end of file
++with the New (2-clause) BSD license.
diff --git a/debian/patches/series b/debian/patches/series
index 59364ac..bf431ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 #100-fix_SlippyMapBBoxChooser.patch
 06-move_data_out_of_jar.patch
 07-downgrade-metadata-extractor.patch
+08-use_external_json_library.patch
diff --git a/debian/rules b/debian/rules
index 01a7e04..1b6e057 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export 
CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar
+export 
CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar
 
 SVNREPO := http://josm.openstreetmap.de/svn/trunk
 SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 025ab3d2e87e37614f8b97859c9d057578b013b9
Author: David Paleino 
Date:   Thu Mar 6 00:55:14 2014 +0100

Fix FTBFS

diff --git a/debian/patches/08-use_external_json_library.patch 
b/debian/patches/08-use_external_json_library.patch
index 863bb32..88189ad 100644
--- a/debian/patches/08-use_external_json_library.patch
+++ b/debian/patches/08-use_external_json_library.patch
@@ -5,9 +5,11 @@ Origin: vendor
 Forwarded: no
 
 ---
- CONTRIBUTION |6 +-
- build.xml|1 +
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ CONTRIBUTION   |6 
+ build.xml  |1 
+ src/org/openstreetmap/josm/io/GeoJSONExporter.java |8 -
+ src/org/openstreetmap/josm/io/GeoJSONWriter.java   |   31 
+
+ 4 files changed, 29 insertions(+), 17 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -34,3 +36,112 @@ Forwarded: no
 -with the New (2-clause) BSD license.
 \ No newline at end of file
 +with the New (2-clause) BSD license.
+--- josm.orig/src/org/openstreetmap/josm/io/GeoJSONWriter.java
 josm/src/org/openstreetmap/josm/io/GeoJSONWriter.java
+@@ -5,6 +5,7 @@ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.Map.Entry;
+ 
++import org.json.JSONException;
+ import org.json.JSONStringer;
+ import org.openstreetmap.josm.data.Bounds;
+ import org.openstreetmap.josm.data.coor.LatLon;
+@@ -26,7 +27,7 @@ public class GeoJSONWriter implements Vi
+ this.layer = layer;
+ }
+ 
+-public String write() {
++public String write() throws JSONException {
+ out = new JSONStringer();
+ out.object().key("type").value("FeatureCollection");
+ out.key("generator").value("JOSM");
+@@ -44,17 +45,25 @@ public class GeoJSONWriter implements Vi
+ 
+ @Override
+ public void visit(Node n) {
+-out.key("type").value("Point").key("coordinates");
+-appendCoord(n.getCoor());
++try {
++out.key("type").value("Point").key("coordinates");
++appendCoord(n.getCoor());
++} catch (JSONException ex) {
++throw new RuntimeException(ex);
++}
+ }
+ 
+ @Override
+ public void visit(Way w) {
+-out.key("type").value("LineString").key("coordinates").array();
+-for (Node n : w.getNodes()) {
+-appendCoord(n.getCoor());
++try {
++out.key("type").value("LineString").key("coordinates").array();
++for (Node n : w.getNodes()) {
++appendCoord(n.getCoor());
++}
++out.endArray();
++} catch (JSONException ex) {
++throw new RuntimeException(ex);
+ }
+-out.endArray();
+ }
+ 
+ @Override
+@@ -65,7 +74,7 @@ public class GeoJSONWriter implements Vi
+ public void visit(Changeset cs) {
+ }
+ 
+-protected void appendPrimitive(OsmPrimitive p) {
++protected void appendPrimitive(OsmPrimitive p) throws JSONException {
+ if (p.isIncomplete()) {
+ return;
+ } else if (skipEmptyNodes && p instanceof Node && 
p.getKeys().isEmpty()) {
+@@ -85,13 +94,13 @@ public class GeoJSONWriter implements Vi
+ out.endObject();
+ }
+ 
+-protected void appendCoord(LatLon c) {
++protected void appendCoord(LatLon c) throws JSONException {
+ if (c != null) {
+ out.array().value(c.lon()).value(c.lat()).endArray();
+ }
+ }
+ 
+-protected void appendLayerBounds() {
++protected void appendLayerBounds() throws JSONException {
+ Iterator it = layer.data.getDataSourceBounds().iterator();
+ if (it.hasNext()) {
+ Bounds b = new Bounds(it.next());
+@@ -102,7 +111,7 @@ public class GeoJSONWriter implements Vi
+ }
+ }
+ 
+-protected void appendBounds(Bounds b) {
++protected void appendBounds(Bounds b) throws JSONException {
+ if (b != null) {
+ out.key("bbox").array()
+ .value(b.getMinLon()).value(b.getMinLat())
+--- josm.orig/src/org/openstreetmap/josm/io/GeoJSONExporter.java
 josm/src/org/openstreetmap/josm/io/GeoJSONExporter.java
+@@ -10,6 +10,7 @@ import java.io.IOException;
+ import java.io.OutputStreamWriter;
+ import java.io.Writer;
+ 
++import org.json.JSONException;
+ import org.openstreetmap.josm.actions.ExtensionFileFilter;
+ import org.openstreetmap.josm.gui.layer.Layer;
+ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+@@ -27,7 +28,12 @@ public class GeoJSONExporter extends Fil
+ @Override
+ public void exportData(File file, Layer layer) throws IOException {
+ if (layer instanceof OsmDataLayer) {
+-String json = new GeoJSO

[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 4611d3e4356e743ab72ba1c2747b8306b9e6a2ee
Author: David Paleino 
Date:   Thu Mar 6 00:26:56 2014 +0100

Dropped alternative dependency on obsolete JREs: openjdk-6-jre and 
sun-java6-jre

diff --git a/debian/changelog b/debian/changelog
index 0d16fd7..223e7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   * Added DEP-3 header to 07-downgrade-metadata-extractor.patch
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
+  * Dropped alternative dependency on obsolete JREs: openjdk-6-jre and
+sun-java6-jre
 
- -- David Paleino   Thu, 06 Mar 2014 00:23:37 +0100
+ -- David Paleino   Thu, 06 Mar 2014 00:26:05 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9473c74..6536f42 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-osm/josm.git
 Package: josm
 Architecture: all
 Depends:
- openjdk-6-jre | sun-java6-jre | openjdk-7-jre
+ openjdk-7-jre
  , libcommons-codec-java
  , libgettext-commons-java (>= 0.9.6)
  , libmetadata-extractor-java (<< 2.4.0)

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit e10a04ef831514516d66a91b713d1c8c250e87f0
Author: David Paleino 
Date:   Thu Mar 6 00:24:07 2014 +0100

Added DEP-3 header to 07-downgrade-metadata-extractor.patch

diff --git a/debian/changelog b/debian/changelog
index 295e323..0d16fd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,10 +11,11 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   * Removed references to embedded jmapviewer in debian/copyright
   * De-fuzzed 00-build.patch, 05-fix_version.patch and
 06-move_data_out_of_jar.patch
+  * Added DEP-3 header to 07-downgrade-metadata-extractor.patch
   * Bumped debhelper compatibility to 9
   * Bumped Standards-Version to 3.9.5, no changes needed
 
- -- David Paleino   Thu, 06 Mar 2014 00:19:35 +0100
+ -- David Paleino   Thu, 06 Mar 2014 00:23:37 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/patches/07-downgrade-metadata-extractor.patch 
b/debian/patches/07-downgrade-metadata-extractor.patch
index c37fa74..c29a47e 100644
--- a/debian/patches/07-downgrade-metadata-extractor.patch
+++ b/debian/patches/07-downgrade-metadata-extractor.patch
@@ -1,6 +1,16 @@
 a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
-@@ -68,7 +68,7 @@
+From: Andrew Shadura 
+Subject: require older version of metadata-extractor
+Origin: vendor
+Forwarded: no
+
+---
+ src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java |   21 ++---
+ src/org/openstreetmap/josm/tools/ExifReader.java |   38 
--
+ 2 files changed, 29 insertions(+), 30 deletions(-)
+
+--- josm.orig/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
 josm/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+@@ -68,7 +68,7 @@ import com.drew.lang.CompoundException;
  import com.drew.metadata.Directory;
  import com.drew.metadata.Metadata;
  import com.drew.metadata.MetadataException;
@@ -9,7 +19,7 @@
  import com.drew.metadata.exif.GpsDirectory;
  
  /**
-@@ -557,21 +557,17 @@
+@@ -557,21 +557,17 @@ public class GeoImageLayer extends Layer
  
  try {
  metadata = JpegMetadataReader.readMetadata(e.getFile());
@@ -34,7 +44,7 @@
  e.setExifOrientation(orientation);
  }
  } catch (MetadataException ex) {
-@@ -617,7 +613,12 @@
+@@ -617,7 +613,12 @@ public class GeoImageLayer extends Layer
  // 1) GPS_TIME_STAMP not set -> date/time will be null
  // 2) GPS_DATE_STAMP not set -> use EXIF date or set to default
  // 3) GPS_TIME_STAMP and GPS_DATE_STAMP are set
@@ -48,7 +58,7 @@
  if (timeStampComps != null) {
  int gpsHour = timeStampComps[0];
  int gpsMin = timeStampComps[1];
-@@ -626,7 +627,7 @@
+@@ -626,7 +627,7 @@ public class GeoImageLayer extends Layer
  
  // We have the time. Next step is to check if the GPS date stamp 
is set.
  // dirGps.getString() always succeeds, but the return value might 
be null.
@@ -57,9 +67,9 @@
  if (dateStampStr != null && 
dateStampStr.matches("^\\d+:\\d+:\\d+$")) {
  String[] dateStampComps = dateStampStr.split(":");
  cal.set(Calendar.YEAR, Integer.parseInt(dateStampComps[0]));
 a/src/org/openstreetmap/josm/tools/ExifReader.java
-+++ b/src/org/openstreetmap/josm/tools/ExifReader.java
-@@ -5,6 +5,7 @@
+--- josm.orig/src/org/openstreetmap/josm/tools/ExifReader.java
 josm/src/org/openstreetmap/josm/tools/ExifReader.java
+@@ -5,6 +5,7 @@ import java.io.File;
  import java.io.IOException;
  import java.text.ParseException;
  import java.util.Date;
@@ -67,7 +77,7 @@
  
  import org.openstreetmap.josm.data.coor.LatLon;
  
-@@ -15,8 +16,7 @@
+@@ -15,8 +16,7 @@ import com.drew.metadata.Directory;
  import com.drew.metadata.Metadata;
  import com.drew.metadata.MetadataException;
  import com.drew.metadata.Tag;
@@ -77,7 +87,7 @@
  import com.drew.metadata.exif.GpsDirectory;
  
  /**
-@@ -41,14 +41,15 @@
+@@ -41,14 +41,15 @@ public final class ExifReader {
  Metadata metadata = JpegMetadataReader.readMetadata(filename);
  String dateStr = null;
  OUTER:
@@ -98,7 +108,7 @@
  dateStr = tag.getDescription();
  }
  }
-@@ -83,14 +84,12 @@
+@@ -83,14 +84,12 @@ public final class ExifReader {
  public static Integer readOrientation(File filename) {
  try {
  final Metadata metadata = 
JpegMetadataReader.readMetadata(filename);
@@ -115,7 +125,7 @@
  }
  return null;
  }
-@@ -104,12 +103,10 @@
+@@ -104,12 +103,10 @@ public final class ExifReader {
  public static LatLon readLatLon(File filename) {
  try {
  final Metadata metadata = 
JpegMetadataReader.readMetadata(filename);
@@

[Pkg-osm-commits] [SCM] josm branch, pristine-tar, updated. 688979b684e131da2f69559b487b18bd966ed7f7

2014-03-06 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 688979b684e131da2f69559b487b18bd966ed7f7
Author: David Paleino 
Date:   Wed Mar 5 23:29:38 2014 +0100

pristine-tar data for josm_0.0.svn6502+dfsg3.orig.tar.gz

diff --git a/josm_0.0.svn6502+dfsg3.orig.tar.gz.delta 
b/josm_0.0.svn6502+dfsg3.orig.tar.gz.delta
new file mode 100644
index 000..4cbb4a7
Binary files /dev/null and b/josm_0.0.svn6502+dfsg3.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn6502+dfsg3.orig.tar.gz.id 
b/josm_0.0.svn6502+dfsg3.orig.tar.gz.id
new file mode 100644
index 000..f14d84f
--- /dev/null
+++ b/josm_0.0.svn6502+dfsg3.orig.tar.gz.id
@@ -0,0 +1 @@
+e5d44b170b141de1d047e6d1de228fc8c5d2c222

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 413ac40aa6bb09737dcf8ccdf89011ac78a73701
Author: David Paleino 
Date:   Thu Mar 6 17:57:14 2014 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 0d769ed..1bc8611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
+josm (0.0.svn6502+dfsg3-1) unstable; urgency=medium
 
   * New DFSG tarball
 - removed embedded code copy of jmapviewer (Closes: #731029)
@@ -19,7 +19,7 @@ josm (0.0.svn6502+dfsg3-1) UNRELEASED; urgency=medium
   * Added overrides for lintian's experimental privacy-breach-generic
 tag
 
- -- David Paleino   Thu, 06 Mar 2014 00:31:50 +0100
+ -- David Paleino   Thu, 06 Mar 2014 17:57:08 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit a98da01b0913e78f662a23e96bff6d67fbd1a551
Author: David Paleino 
Date:   Thu Mar 6 00:06:36 2014 +0100

Move bits of patches around to correct places

diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index b497089..57d1bb4 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -7,9 +7,9 @@ Adjustements to the ant build.xml files, mainly to use 
system-provided
 JARs and not depend on Internet connection.
 
 ---
- build.xml  |   45 +
+ build.xml  |   44 
  i18n/build.xml |   33 -
- 2 files changed, 37 insertions(+), 41 deletions(-)
+ 2 files changed, 36 insertions(+), 41 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
  
-@@ -22,10 +23,17 @@
+@@ -22,10 +23,16 @@
  
  
  
@@ -34,14 +34,13 @@ JARs and not depend on Internet connection.
 +  
 +  
 +  
-+  
  
  
 +
  
  
  
  
@@ -57,7 +56,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -59,6 +60,7 @@
+@@ -59,6 +59,7 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -65,7 +64,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp}
+@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -80,7 +79,7 @@ JARs and not depend on Internet connection.
  
  
  Revision ${version.entry.commit.revision}
-@@ -85,7 +80,8 @@ Build-Date: ${build.tstamp}
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -90,7 +89,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -95,6 +91,8 @@ Build-Date: ${build.tstamp}
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -99,7 +98,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -168,10 +166,7 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -111,7 +110,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -180,11 +175,11 @@ Build-Date: ${build.tstamp}
+@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -125,7 +124,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -192,6 +187,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -133,7 +132,7 @@ JARs and not depend on Internet connection.
  
  
  
  
  
diff --git a/debian/patches/04-use_system_jmapviewer.patch 
b/debian/patches/04-use_system_jmapviewer.patch
index bfa0935..c98f3b0 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,12 +5,20 @@ Bug-Debian: 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731029
 Forwarded: no
 
 ---
- build.xml |1 -
- 1 file changed, 1 deletion(-)
+ build.xml |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -97,7 +97,6 @@ Debian-Release: ${debian.version}
+@@ -30,6 +30,7 @@
+   
+   
+   
++  
+ 
+ 
+ 
+@@ -96,7 +97,6 @@ Debian-Release: ${debian.version}
  
  
  

-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit e09fbc119a1c0f6507ca679ec2e10d87a8992002
Merge: 001e1a47fe2df7550f96252553e9822645aab1ef 
e24e341078ecb04402cc4283307f7ccb64978570
Author: David Paleino 
Date:   Wed Mar 5 18:37:46 2014 +0100

Merge tag 'upstream/0.0.svn6502+dfsg2'

Upstream version 0.0.svn6502+dfsg2

# gpg: Signature made mer 05 mar 2014 18:37:35 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
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.svn6502+dfsg1-1-21-g413ac40

2014-03-06 Thread David Paleino

The following commit has been merged in the master branch:
commit 424e8982b27cdaeb641157138f4dc2457bc74d9b
Author: David Paleino 
Date:   Wed Mar 5 20:43:01 2014 +0100

De-fuzzed 00-build.patch

diff --git a/debian/changelog b/debian/changelog
index 8d6a415..87ba4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
 
   * New DFSG tarball
 - removed embedded code copy of jmapviewer (Closes: #731029)
+  * De-fuzzed 00-build.patch
 
- -- David Paleino   Wed, 05 Mar 2014 20:41:34 +0100
+ -- David Paleino   Wed, 05 Mar 2014 20:42:35 +0100
 
 josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 7011065..57d1bb4 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -162,9 +162,9 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -50,14 +50,14 @@
- 
- 
+@@ -79,14 +79,14 @@
+ 
+ 
  
 -
 -
@@ -184,7 +184,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -103,15 +103,14 @@
+@@ -137,15 +137,14 @@
  
  
  

-- 
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. 2a5880a710524e03ab08608861003b69aa0ca03c

2013-12-20 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit cb09ea08884e0470a05766d845ff1fdf2c491599
Author: David Paleino 
Date:   Fri Dec 20 22:17:26 2013 +0100

pristine-tar data for josm_0.0.svn6502+dfsg1.orig.tar.gz

diff --git a/josm_0.0.svn6502+dfsg1.orig.tar.gz.delta 
b/josm_0.0.svn6502+dfsg1.orig.tar.gz.delta
new file mode 100644
index 000..60a1a81
Binary files /dev/null and b/josm_0.0.svn6502+dfsg1.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn6502+dfsg1.orig.tar.gz.id 
b/josm_0.0.svn6502+dfsg1.orig.tar.gz.id
new file mode 100644
index 000..e2a3504
--- /dev/null
+++ b/josm_0.0.svn6502+dfsg1.orig.tar.gz.id
@@ -0,0 +1 @@
+fb936d3a4b6e047f364ca3c0e483e24beb26ff5d

-- 
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. 2a5880a710524e03ab08608861003b69aa0ca03c

2013-12-20 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 2a5880a710524e03ab08608861003b69aa0ca03c
Merge: cb09ea08884e0470a05766d845ff1fdf2c491599 
0d8e33be13d6000c92fe9af1ede255ec192af1b6
Author: David Paleino 
Date:   Fri Dec 20 23:14:27 2013 +0100

Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-osm/josm 
into pristine-tar


-- 
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.svn6115+dfsg1-1-4-g615b235

2013-12-20 Thread David Paleino

The following commit has been merged in the master branch:
commit 93f87fed5d4a4165c2703221cccdacb62ddee36f
Author: David Paleino 
Date:   Fri Dec 20 22:59:47 2013 +0100

New tested snapshot (Closes: #725011)

diff --git a/debian/changelog b/debian/changelog
index 3b4912d..759c86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn6520+dfsg1-1) UNRELEASED; urgency=medium
+
+  * New tested snapshot (Closes: #725011)
+
+ -- David Paleino   Fri, 20 Dec 2013 22:58:34 +0100
+
 josm (0.0.svn6115+dfsg1-1) unstable; urgency=low
 
   [ David Paleino ]

-- 
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.svn6115+dfsg1-1-4-g615b235

2013-12-20 Thread David Paleino

The following commit has been merged in the master branch:
commit 615b2351e3fdd52e13ca76fe4e412347c26a2505
Author: David Paleino 
Date:   Fri Dec 20 23:01:02 2013 +0100

Patches refreshed to apply to new upstream source

diff --git a/debian/changelog b/debian/changelog
index 759c86f..6733f73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm (0.0.svn6520+dfsg1-1) UNRELEASED; urgency=medium
 
   * New tested snapshot (Closes: #725011)
+  * Patches refreshed to apply to new upstream source
 
- -- David Paleino   Fri, 20 Dec 2013 22:58:34 +0100
+ -- David Paleino   Fri, 20 Dec 2013 23:00:53 +0100
 
 josm (0.0.svn6115+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 04fa38b..7011065 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -7,13 +7,13 @@ Adjustements to the ant build.xml files, mainly to use 
system-provided
 JARs and not depend on Internet connection.
 
 ---
- build.xml  |   45 +
+ build.xml  |   44 
  i18n/build.xml |   33 -
- 2 files changed, 37 insertions(+), 41 deletions(-)
+ 2 files changed, 36 insertions(+), 41 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -15,6 +15,7 @@
+@@ -14,6 +14,7 @@
  
  
  
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
  
-@@ -23,10 +24,16 @@
+@@ -22,10 +23,16 @@
  
  
  
@@ -39,9 +39,9 @@ JARs and not depend on Internet connection.
 +
  
  
+   ** Used by Eclipse ant builder for updating
+@@ -40,14 +47,7 @@
+ -->
  
  
 -
@@ -56,14 +56,18 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -60,31 +60,29 @@
+@@ -59,6 +59,7 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
 +Debian-Release: ${debian.version}
  
  
- 
+ 
+@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+ 
+ 
+ 
 -
 -
 -
@@ -75,10 +79,9 @@ JARs and not depend on Internet connection.
  
  
  Revision ${version.entry.commit.revision}
- 
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
  
  
-+
  
 -
 +
  
  
- 
- 
- 
-+  
-+  
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+ 
+ 
+ 
++
++
  
  
  
-@@ -110,21 +108,18 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -103,15 +107,16 @@ JARs and not depend on Internet connection.
 -
 -
 +
- 
- 
+ 
+ 
+ 
+@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
  
- 
  
  
 -
 -
-+
++
  
  
  
@@ -119,7 +124,7 @@ JARs and not depend on Internet connection.
  
  
  
-@@ -132,6 +127,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -127,7 +132,7 @@ JARs and not depend on Internet connection.
  
  
  
  
  
@@ -177,9 +182,9 @@ JARs and not depend on Internet connection.
 -
 + 
  
- 
- 
-@@ -98,15 +98,14 @@
+ 
+ 
+@@ -103,15 +103,14 @@
  
  
  
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index b0f06a4..dfa6a84 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -8,13 +8,14 @@ bug triaging.
 
 ---
  src/org/openstreetmap/josm/actions/AboutAction.java |7 +++
+ src/org/openstreetmap/josm/actions/ShowStatusReportAction.java  |3 -
  src/org/openstreetmap/josm/data/Version.java|7 +++
  src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   20 
+++---
- 3 files changed, 19 insertions(+), 15 deletions(-)
+ 4 files changed, 20 insertions(+), 17 deletions(-)
 
 a/src/org/openstreetmap/josm/actions/AboutAction.java
-+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
-@@ -8,6 +8,9 @@
+--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
 josm/src/org/openstreetmap/josm/actions/AboutAction.java
+@@ -8,6 +8,9 @@ import java.awt.GridBagLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
  
@@ -24,7 +25,7 @@ bug triaging.
  import javax.swing.BorderFactory;
  import javax.swing.JLabel;
  import javax.swing.JOptionPane;
-@@ -79,6 +82,8 @@
+@@ -79,6 +82,8 @@ public class AboutAction extends JosmAct
  info.add(GBC.g

[Pkg-osm-commits] [SCM] josm annotated tag, upstream/0.0.svn6502+dfsg1, created. upstream/0.0.svn6502+dfsg1

2013-12-20 Thread David Paleino

The annotated tag, upstream/0.0.svn6502+dfsg1 has been created
at  015570fdd57bce17a6c691834f2064e937a97fbd (tag)
   tagging  51a8af99e590d63756cee7b9c3a01568e2fea92d (commit)
  replaces  upstream/0.0.svn5759+dfsg1
 tagged by  David Paleino
on  Fri Dec 20 22:17:27 2013 +0100

- Shortlog 
Upstream version 0.0.svn6502+dfsg1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEABECAAYFAlK0s+gACgkQ5qqQFxOSsXTJNgCeI68VrakIfuQ5OKpFAJ/Rxr5V
haYAnReJpdt10lpYUMpBsJWjq+Y0Ws9x
=3tSH
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 0.0.svn6502+dfsg1

---

-- 
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit a8214aaebfcd7a9c660799419da50c7c41ed8eb8
Author: David Paleino 
Date:   Sun Dec 15 00:05:14 2013 +0100

Use canonical URLs for Vcs-* fields

diff --git a/debian/changelog b/debian/changelog
index 8679610..ea7fdcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
   * Patches dropped, no more needed
   * Simplified debian/rules :)
+  * Use canonical URLs for Vcs-* fields
 
- -- David Paleino   Sat, 14 Dec 2013 23:45:41 +0100
+ -- David Paleino   Sun, 15 Dec 2013 00:05:06 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 15dedee..c01dbe2 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,8 @@ Build-Depends:
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.3
 Homepage: http://nzjrs.github.com/osm-gps-map/
-Vcs-Git: git://git.debian.org/pkg-osm/osm-gps-map.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/osm-gps-map.git
+Vcs-Git: git://anonscm.debian.org/pkg-osm/osm-gps-map.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/osm-gps-map.git
 
 Package: libosmgpsmap-1.0-dev
 Section: libdevel

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 567ffaf12aba8ae411fbcd8c43b24b63b3720ad4
Author: David Paleino 
Date:   Sat Dec 14 23:43:37 2013 +0100

New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0

diff --git a/debian/changelog b/debian/changelog
index be86beb..8122131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
 
   * New upstream version (Closes: #730733)
+  * Bump GTK build-dep to >= 3.0
+  * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
 
- -- David Paleino   Sat, 14 Dec 2013 22:55:28 +0100
+ -- David Paleino   Sat, 14 Dec 2013 23:41:22 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5fd3767..cc23149 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  , libtool
  , automake
  , autoconf
- , libgtk2.0-dev
+ , libgtk-3-dev
  , libglib2.0-dev (>= 2.18)
  , libsoup2.4-dev
  , python-gobject-dev (>= 2.16.0)
@@ -18,18 +18,20 @@ Build-Depends:
  , python-all-dev (>= 2.6.6-3~)
  , gnome-common
  , gtk-doc-tools (>= 1.12)
+ , gobject-introspection
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.3
 Homepage: http://nzjrs.github.com/osm-gps-map/
 Vcs-Git: git://git.debian.org/pkg-osm/osm-gps-map.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/osm-gps-map.git
 
-Package: libosmgpsmap-dev
+Package: libosmgpsmap-1.0-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}
  , ${misc:Depends}
- , libosmgpsmap2 (= ${binary:Version})
+ , libosmgpsmap-1.0-0 (= ${binary:Version})
+ , gir1.2-osmgpsmap-1.0
 Description: GTK+ library to embed OpenStreetMap maps - development files
  libosmgpsmap is a library to embed maps in applications that when given GPS 
  co-ordinates, draws a GPS track, and points of interest on a moving map 
@@ -39,7 +41,7 @@ Description: GTK+ library to embed OpenStreetMap maps - 
development files
  These are the development files for libosmgpsmap0, needed only if you're 
  writing or compiling an application which will use it.
 
-Package: libosmgpsmap2
+Package: libosmgpsmap-1.0-0
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -51,11 +53,11 @@ Description: GTK+ library to embed OpenStreetMap maps
  display. Downloads map data from a number of websites, including 
  openstreetmap.org, openaerialmap.org and others.
 
-Package: libosmgpsmap2-dbg
+Package: libosmgpsmap-1.0-0-dbg
 Architecture: any
 Depends: ${shlibs:Depends}
  , ${misc:Depends}
- , libosmgpsmap2 (= ${binary:Version})
+ , libosmgpsmap-1.0-0 (= ${binary:Version})
 Priority: extra
 Section: debug
 Description: GTK+ library to embed OpenStreetMap maps - debugging symbols
@@ -67,15 +69,11 @@ Description: GTK+ library to embed OpenStreetMap maps - 
debugging symbols
  This package contains the debugging symbols for the shared library and its
  Python bindings.
 
-Package: python-osmgpsmap
-Section: python
+Package: gir1.2-osmgpsmap-1.0
 Architecture: any
 Depends: ${misc:Depends}
- , ${shlibs:Depends}
- , ${python:Depends}
- , python-gtk2
-Provides: ${python:Provides}
-Suggests: libosmgpsmap2-dbg
+ , ${gir:Depends}
+Suggests: libosmgpsmap-1.0-0-dbg
 Description: GTK+ library to embed OpenStreetMap maps - Python bindings
  libosmgpsmap is a library to embed maps in applications that when given GPS 
  co-ordinates, draws a GPS track, and points of interest on a moving map 
diff --git a/debian/gir1.2-osmgpsmap-1.0.install 
b/debian/gir1.2-osmgpsmap-1.0.install
new file mode 100644
index 000..9bc9732
--- /dev/null
+++ b/debian/gir1.2-osmgpsmap-1.0.install
@@ -0,0 +1,2 @@
+usr/lib/*/girepository-*/*
+usr/share/gir-*/*
diff --git a/debian/libosmgpsmap2.docs b/debian/libosmgpsmap-1.0-0.docs
similarity index 100%
rename from debian/libosmgpsmap2.docs
rename to debian/libosmgpsmap-1.0-0.docs
diff --git a/debian/libosmgpsmap2.install b/debian/libosmgpsmap-1.0-0.install
similarity index 100%
rename from debian/libosmgpsmap2.install
rename to debian/libosmgpsmap-1.0-0.install
diff --git a/debian/libosmgpsmap-dev.dirs b/debian/libosmgpsmap-1.0-dev.dirs
similarity index 100%
rename from debian/libosmgpsmap-dev.dirs
rename to debian/libosmgpsmap-1.0-dev.dirs
diff --git a/debian/libosmgpsmap-dev.doc-base 
b/debian/libosmgpsmap-1.0-dev.doc-base
similarity index 88%
rename from debian/libosmgpsmap-dev.doc-base
rename to debian/libosmgpsmap-1.0-dev.doc-base
index 8b43c5f..c5c1af1 100644
--- a/debian/libosmgpsmap-dev.doc-base
+++ b/debian/libosmgpsmap-1.0-dev.doc-base
@@ -1,4 +1,4 @@
-Document: libosmgpsmap-dev
+Document: libosmgpsmap-1.0-dev
 Title: OsmGpsMap Reference Manual
 Author: John Stowers
 Abstract: This manual describes the OsmGpsMap API.
diff --git a/debian/libosmgpsmap-dev.examples 
b/debian/libosmgpsmap-1.0-dev.examples
similarity index 78%
rename from debian/libosmgpsmap-dev.examples
rename to debian/libosmgpsmap-1.0-dev.examples
index 1a35f36..8201

[Pkg-osm-commits] [SCM] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 0c43a8c69940db37c017924ca293439e2a6ebf49
Merge: dc2b049ac449d6cf9bec433b276ee7d4ddd8b907 
a2a47b5039a95593713230e13d2a238ff4383847
Author: David Paleino 
Date:   Sat Dec 14 22:55:21 2013 +0100

Merge tag 'upstream/1.0.1'

Upstream version 1.0.1

# gpg: Signature made sab 14 dic 2013 22:55:16 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 1884e318e0b4c520e5c6ae94f9fe89c584322f0e
Author: David Paleino 
Date:   Sun Dec 15 00:06:54 2013 +0100

Drop X-Python-Version

diff --git a/debian/control b/debian/control
index 9ac8a17..9d0861a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
  , gnome-common
  , gtk-doc-tools (>= 1.12)
  , gobject-introspection
-X-Python-Version: >= 2.5
 Standards-Version: 3.9.5
 Homepage: http://nzjrs.github.com/osm-gps-map/
 Vcs-Git: git://anonscm.debian.org/pkg-osm/osm-gps-map.git

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 85aa2250e8b4c100fe168971b22fa07e45de67a4
Author: David Paleino 
Date:   Sun Dec 15 00:04:33 2013 +0100

Correct section

diff --git a/debian/control b/debian/control
index 1142524..15dedee 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,7 @@ Description: GTK+ library to embed OpenStreetMap maps - 
debugging symbols
  Python bindings.
 
 Package: gir1.2-osmgpsmap-1.0
+Section: introspection
 Architecture: any
 Depends: ${misc:Depends}
  , ${gir:Depends}

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, pristine-tar, updated. d2530b495db565792018c16d1f480c6e608cbff9

2013-12-14 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit d2530b495db565792018c16d1f480c6e608cbff9
Author: David Paleino 
Date:   Sat Dec 14 22:55:16 2013 +0100

pristine-tar data for osm-gps-map_1.0.1.orig.tar.gz

diff --git a/osm-gps-map_1.0.1.orig.tar.gz.delta 
b/osm-gps-map_1.0.1.orig.tar.gz.delta
new file mode 100644
index 000..7c1edc8
Binary files /dev/null and b/osm-gps-map_1.0.1.orig.tar.gz.delta differ
diff --git a/osm-gps-map_1.0.1.orig.tar.gz.id b/osm-gps-map_1.0.1.orig.tar.gz.id
new file mode 100644
index 000..f9ff7bb
--- /dev/null
+++ b/osm-gps-map_1.0.1.orig.tar.gz.id
@@ -0,0 +1 @@
+bc5249ddb9015159f86fce0e00debae43dd32c7e

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 711e17ded7696a8a77755e1535fcb822452356a9
Author: David Paleino 
Date:   Sat Dec 14 23:53:50 2013 +0100

B-D on libgirepository1.0-dev

diff --git a/debian/control b/debian/control
index cc23149..1142524 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  , automake
  , autoconf
  , libgtk-3-dev
+ , libgirepository1.0-dev
  , libglib2.0-dev (>= 2.18)
  , libsoup2.4-dev
  , python-gobject-dev (>= 2.16.0)

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit e34fb7c9198cfe3d29d59bd0518e4a1fd1e10507
Author: David Paleino 
Date:   Sun Dec 15 00:06:43 2013 +0100

Standards-Version bump to 3.9.5, no changes needed

diff --git a/debian/changelog b/debian/changelog
index 907b836..21f9198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * Simplified debian/rules :)
   * Use canonical URLs for Vcs-* fields
   * Mark the debug package Multi-Arch: same
+  * Standards-Version bump to 3.9.5, no changes needed
 
- -- David Paleino   Sun, 15 Dec 2013 00:05:36 +0100
+ -- David Paleino   Sun, 15 Dec 2013 00:06:33 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a5afcf0..9ac8a17 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  , gtk-doc-tools (>= 1.12)
  , gobject-introspection
 X-Python-Version: >= 2.5
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://nzjrs.github.com/osm-gps-map/
 Vcs-Git: git://anonscm.debian.org/pkg-osm/osm-gps-map.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/osm-gps-map.git

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 7e2991c36df020b5eef3988d67b6b209cae412b5
Author: David Paleino 
Date:   Sun Dec 15 00:51:11 2013 +0100

Update debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 4c0a33e..f98b47b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * Use canonical URLs for Vcs-* fields
   * Mark the debug package Multi-Arch: same
   * Standards-Version bump to 3.9.5, no changes needed
+  * Update debian/copyright
 
- -- David Paleino   Sun, 15 Dec 2013 00:13:03 +0100
+ -- David Paleino   Sun, 15 Dec 2013 00:42:36 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 87bbffc..f8beff9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,36 +8,44 @@ Copyright: © 2008, Marcus Bauer 
 License: GPL-2
 
 Files: debian/*
-Copyright: © 2009-2012, David Paleino 
+Copyright: © 2009-2013, David Paleino 
 License: GPL-2
 
-Files: python/mapviewer.py
+Files: examples/mapviewer.py
 Copyright: © 2008, Hadley Rich 
 License: GPL-2
 
-Files: python/osmgpsmapmodule.c
-Copyright: © 2008, John Stowers 
+Files: src/*
+Copyright: © 2008-2013, John Stowers 
 License: GPL-2
 
-Files: src/converter.c
+Files: src/converter.*
+ src/converter.h
+ src/osd-utils.h
+ src/osm-gps-map.*
+ src/osm-gps-map-types.h
 Copyright: © 2008, Marcus Bauer 
- © 2008, John Stowers 
+ © 2008-2013, John Stowers 
 License: GPL-2
 
-Files: src/converter.h
- src/osm-gps-map.*
- src/osm-gps-map-types.h
+Files: src/private.h
 Copyright: © 2008, Marcus Bauer 
- © 2009, John Stowers 
  © 2009, Everaldo Canuto 
+ © 2013, John Stowers 
 License: GPL-2
 
-Files: src/main.c
- src/osd-utils.*
- src/osm-gps-map-layer.c
- src/osm-gps-map-osd.*
- python/*
-Copyright: © 2008-2010, John Stowers 
+Files: src/osm-gps-map-layer.h
+ src/osm-gps-map-widget.c
+Copyright: © 2008, Marcus Bauer 
+ © 2009, Till Harbaum 
+ © 2009, Everaldo Canuto 
+ © 2008-2013, John Stowers 
+License: GPL-2
+
+Files: src/osm-gps-map-widget.h
+Copyright: © 2008, Marcus Bauer 
+ © 2009, Till Harbaum 
+ © 2008-2013, John Stowers 
 License: GPL-2
 
 License: GPL-2

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 20a4817de9125d87779c696561e9909d15f83fb0
Author: David Paleino 
Date:   Sat Dec 14 23:45:49 2013 +0100

Simplified debian/rules :)

diff --git a/debian/changelog b/debian/changelog
index 1b13e40..8679610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * Bump GTK build-dep to >= 3.0
   * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
   * Patches dropped, no more needed
+  * Simplified debian/rules :)
 
- -- David Paleino   Sat, 14 Dec 2013 23:43:51 +0100
+ -- David Paleino   Sat, 14 Dec 2013 23:45:41 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 2c1173f..186f115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,44 +7,24 @@
 export CFLAGS+=-UGDK_DISABLE_DEPRECATED
 export DEB_BUILD_HARDENING=1
 
-# This is a bit hacky.
 override_dh_auto_configure:
NOCONFIGURE=y ./autogen.sh
dh_auto_configure -- \
--enable-maintainer-mode \
-   --disable-introspection \
--enable-gtk-doc \
--enable-gtk-doc-html \
--enable-gtk-doc-pdf
 
 override_dh_auto_install:
-   for py in $(shell pyversions -r); do \
-   PYTHON=$$py dh_auto_configure -Dpython/; \
-   dh_auto_build -Dpython/; \
-   dh_auto_install -Dpython/; \
-   dh_auto_clean -Dpython/; \
-   find $(CURDIR)/debian/tmp/usr/lib/$$py \( -name "*.a" -o -name 
"*.la" \) -delete ; \
-   done
dh_auto_install
-   rm -rf $(CURDIR)/debian/python-osmgpsmap/usr/share/pyshared/gtk-2.0/
+   dh_girepository
 
 override_dh_auto_clean:
dh_auto_clean
-   find . \( -name "*.o" -o -name "*.lo" -o -name "*.la" \) -delete
-   find . \( -name "*.in" -a -not -name "osmgpsmap.pc.in" -a -not -name 
"version.xml.in" \) -delete
-   find . \( -name ".deps" -o -name ".libs" -o -name "autom4te.cache" \) 
-type d | xargs rm -rf
-
-   find . -name "Makefile" -delete
-   find . \( -name "config.guess" -o -name "config.h" -o -name 
"config.log" \
-   -o -name "config.sub" -o -name "config.status" -o -name 
"configure" \) -delete
-   find . \( -name "install-sh" -o -name "libtool" -o -name "ltmain.sh" \
-   -o -name "missing" -o -name "INSTALL" \
-   -o -name "aclocal.m4" -o -name "depcomp" \) -delete
rm -rf docs/reference/tmpl/
 
 override_dh_strip:
dh_strip --keep-debug --dbg-package=libosmgpsmap-1.0-dbg
 
 %:
-   dh $@ \
-   --with python2
+   dh $@

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map annotated tag, upstream/1.0.1, created. upstream/1.0.1

2013-12-14 Thread David Paleino

The annotated tag, upstream/1.0.1 has been created
at  6bcdb3b54a2b0cbecf700a708ea88dd67ab24863 (tag)
   tagging  a2a47b5039a95593713230e13d2a238ff4383847 (commit)
  replaces  upstream/0.7.3
 tagged by  David Paleino
on  Sat Dec 14 22:55:16 2013 +0100

- Shortlog 
Upstream version 1.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEUEABECAAYFAlKs08QACgkQ5qqQFxOSsXQDjgCUCV+IhY/nHH1wD3ZdcIrhEG3Z
1ACdEb2UTjNZOzZV/UvwYXPe90V/gdM=
=i20J
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 1.0.1

---

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit f2f0e0c7099a835909121e357bc81275876ec504
Author: David Paleino 
Date:   Sat Dec 14 23:58:27 2013 +0100

Fix dbg package name

diff --git a/debian/rules b/debian/rules
index 186f115..e6a3de9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_auto_clean:
rm -rf docs/reference/tmpl/
 
 override_dh_strip:
-   dh_strip --keep-debug --dbg-package=libosmgpsmap-1.0-dbg
+   dh_strip --keep-debug --dbg-package=libosmgpsmap-1.0-0-dbg
 
 %:
dh $@

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit f8f3423925d71a0ffe248064ec1905c92bd5423d
Author: David Paleino 
Date:   Sun Dec 15 00:11:00 2013 +0100

Symbols file

diff --git a/debian/libosmgpsmap-1.0-0.symbols 
b/debian/libosmgpsmap-1.0-0.symbols
new file mode 100644
index 000..fa42172
--- /dev/null
+++ b/debian/libosmgpsmap-1.0-0.symbols
@@ -0,0 +1,85 @@
+libosmgpsmap-1.0.so.0 libosmgpsmap-1.0-0 #MINVER#
+ deg2rad@Base 1.0.1
+ lat2pixel@Base 1.0.1
+ lon2pixel@Base 1.0.1
+ osd_check_dpad@Base 1.0.1
+ osd_check_zoom@Base 1.0.1
+ osd_draw_bbox@Base 1.0.1
+ osd_latitude_str@Base 1.0.1
+ osd_longitude_str@Base 1.0.1
+ osd_render_centered_text@Base 1.0.1
+ osd_render_crosshair_shape@Base 1.0.1
+ osd_render_dpad@Base 1.0.1
+ osd_render_gps@Base 1.0.1
+ osd_render_zoom@Base 1.0.1
+ osd_shape@Base 1.0.1
+ osd_shape_shadow@Base 1.0.1
+ osm_gps_map_convert_geographic_to_screen@Base 1.0.1
+ osm_gps_map_convert_screen_to_geographic@Base 1.0.1
+ osm_gps_map_download_cancel_all@Base 1.0.1
+ osm_gps_map_download_maps@Base 1.0.1
+ osm_gps_map_get_bbox@Base 1.0.1
+ osm_gps_map_get_default_cache_directory@Base 1.0.1
+ osm_gps_map_get_event_location@Base 1.0.1
+ osm_gps_map_get_scale@Base 1.0.1
+ osm_gps_map_get_type@Base 1.0.1
+ osm_gps_map_gps_add@Base 1.0.1
+ osm_gps_map_gps_clear@Base 1.0.1
+ osm_gps_map_gps_get_track@Base 1.0.1
+ osm_gps_map_image_add@Base 1.0.1
+ osm_gps_map_image_add_with_alignment@Base 1.0.1
+ osm_gps_map_image_add_with_alignment_z@Base 1.0.1
+ osm_gps_map_image_add_z@Base 1.0.1
+ osm_gps_map_image_draw@Base 1.0.1
+ osm_gps_map_image_get_point@Base 1.0.1
+ osm_gps_map_image_get_type@Base 1.0.1
+ osm_gps_map_image_get_zorder@Base 1.0.1
+ osm_gps_map_image_new@Base 1.0.1
+ osm_gps_map_image_remove@Base 1.0.1
+ osm_gps_map_image_remove_all@Base 1.0.1
+ osm_gps_map_in_circle@Base 1.0.1
+ osm_gps_map_layer_add@Base 1.0.1
+ osm_gps_map_layer_busy@Base 1.0.1
+ osm_gps_map_layer_button_press@Base 1.0.1
+ osm_gps_map_layer_draw@Base 1.0.1
+ osm_gps_map_layer_get_type@Base 1.0.1
+ osm_gps_map_layer_remove@Base 1.0.1
+ osm_gps_map_layer_remove_all@Base 1.0.1
+ osm_gps_map_layer_render@Base 1.0.1
+ osm_gps_map_new@Base 1.0.1
+ osm_gps_map_osd_get_type@Base 1.0.1
+ osm_gps_map_osd_new@Base 1.0.1
+ osm_gps_map_point_copy@Base 1.0.1
+ osm_gps_map_point_free@Base 1.0.1
+ osm_gps_map_point_get_degrees@Base 1.0.1
+ osm_gps_map_point_get_radians@Base 1.0.1
+ osm_gps_map_point_get_type@Base 1.0.1
+ osm_gps_map_point_new_degrees@Base 1.0.1
+ osm_gps_map_point_new_radians@Base 1.0.1
+ osm_gps_map_point_set_degrees@Base 1.0.1
+ osm_gps_map_point_set_radians@Base 1.0.1
+ osm_gps_map_scroll@Base 1.0.1
+ osm_gps_map_set_center@Base 1.0.1
+ osm_gps_map_set_center_and_zoom@Base 1.0.1
+ osm_gps_map_set_keyboard_shortcut@Base 1.0.1
+ osm_gps_map_set_zoom@Base 1.0.1
+ osm_gps_map_set_zoom_offset@Base 1.0.1
+ osm_gps_map_source_get_friendly_name@Base 1.0.1
+ osm_gps_map_source_get_image_format@Base 1.0.1
+ osm_gps_map_source_get_max_zoom@Base 1.0.1
+ osm_gps_map_source_get_min_zoom@Base 1.0.1
+ osm_gps_map_source_get_repo_uri@Base 1.0.1
+ osm_gps_map_source_is_valid@Base 1.0.1
+ osm_gps_map_track_add@Base 1.0.1
+ osm_gps_map_track_add_point@Base 1.0.1
+ osm_gps_map_track_get_color@Base 1.0.1
+ osm_gps_map_track_get_points@Base 1.0.1
+ osm_gps_map_track_get_type@Base 1.0.1
+ osm_gps_map_track_new@Base 1.0.1
+ osm_gps_map_track_remove@Base 1.0.1
+ osm_gps_map_track_remove_all@Base 1.0.1
+ osm_gps_map_zoom_in@Base 1.0.1
+ osm_gps_map_zoom_out@Base 1.0.1
+ pixel2lat@Base 1.0.1
+ pixel2lon@Base 1.0.1
+ rad2deg@Base 1.0.1

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit ea78f8b62e8cab68a2432495e79d5f11503f4f05
Author: David Paleino 
Date:   Sat Dec 14 23:44:00 2013 +0100

Patches dropped, no more needed

diff --git a/debian/changelog b/debian/changelog
index 8122131..1b13e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * New upstream version (Closes: #730733)
   * Bump GTK build-dep to >= 3.0
   * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
+  * Patches dropped, no more needed
 
- -- David Paleino   Sat, 14 Dec 2013 23:41:22 +0100
+ -- David Paleino   Sat, 14 Dec 2013 23:43:51 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_python_linking.patch 
b/debian/patches/01-fix_python_linking.patch
deleted file mode 100644
index 8b2d7f9..000
--- a/debian/patches/01-fix_python_linking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: David Paleino 
-Subject: fix linking to locally compiled library
-

- python/configure.ac |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 osm-gps-map.orig/python/configure.ac
-+++ osm-gps-map/python/configure.ac
-@@ -57,7 +57,7 @@ if test -f ../src/libosmgpsmap.la; then
- 
-   #and we must link to the local lib
-   OSMGPSMAP_CFLAGS="-I\$(top_srcdir)/../src/"
--  OSMGPSMAP_LIBS="\$(top_builddir)/../src/libosmgpsmap.la"
-+  OSMGPSMAP_LIBS="-L\$(top_builddir)/../src/.libs/ -losmgpsmap"
- else
-   PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.3)
- fi
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c416a67..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-fix_python_linking.patch

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 092a445eb3a1d2d1e2e16be584a02890c9f828e9
Author: David Paleino 
Date:   Sun Dec 15 00:34:31 2013 +0100

Manually pass -g to gcc

diff --git a/debian/rules b/debian/rules
index e6a3de9..1363b07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CFLAGS+=-UGDK_DISABLE_DEPRECATED
+export CFLAGS+=-UGDK_DISABLE_DEPRECATED -g
 export DEB_BUILD_HARDENING=1
 
 override_dh_auto_configure:

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 13029d943fd0d0eb2df351a5884645b040f2dd34
Author: David Paleino 
Date:   Sat Dec 14 22:56:39 2013 +0100

New upstream version (Closes: #730733)

diff --git a/debian/changelog b/debian/changelog
index 98b3cc7..be86beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
+
+  * New upstream version (Closes: #730733)
+
+ -- David Paleino   Sat, 14 Dec 2013 22:55:28 +0100
+
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
   * Add missing dependency on python-gtk2 (Closes: #680815)

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 5ec457369e9f7d46bab1be1289bc329be2b8272b
Author: David Paleino 
Date:   Sun Dec 15 00:05:52 2013 +0100

Mark the debug package Multi-Arch: same

diff --git a/debian/changelog b/debian/changelog
index ea7fdcc..907b836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * Patches dropped, no more needed
   * Simplified debian/rules :)
   * Use canonical URLs for Vcs-* fields
+  * Mark the debug package Multi-Arch: same
 
- -- David Paleino   Sun, 15 Dec 2013 00:05:06 +0100
+ -- David Paleino   Sun, 15 Dec 2013 00:05:36 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c01dbe2..a5afcf0 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
  , ${misc:Depends}
  , libosmgpsmap-1.0-0 (= ${binary:Version})
+Multi-Arch: same
 Priority: extra
 Section: debug
 Description: GTK+ library to embed OpenStreetMap maps - debugging symbols

-- 
GTK+ library to embed OpenStreetMap maps

___
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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

2013-12-14 Thread David Paleino

The following commit has been merged in the master branch:
commit 3536bba4b7b8edc7d3a73f738b890665f7bac867
Author: David Paleino 
Date:   Sun Dec 15 00:14:06 2013 +0100

01-fix_LFS_support.patch added

diff --git a/debian/changelog b/debian/changelog
index 21f9198..4c0a33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,15 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * New upstream version (Closes: #730733)
   * Bump GTK build-dep to >= 3.0
   * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
-  * Patches dropped, no more needed
+  * debian/patches:
+- 01-fix_python_linking.patch dropped, no more needed
+- 01-fix_LFS_support.patch added
   * Simplified debian/rules :)
   * Use canonical URLs for Vcs-* fields
   * Mark the debug package Multi-Arch: same
   * Standards-Version bump to 3.9.5, no changes needed
 
- -- David Paleino   Sun, 15 Dec 2013 00:06:33 +0100
+ -- David Paleino   Sun, 15 Dec 2013 00:13:03 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_LFS_support.patch 
b/debian/patches/01-fix_LFS_support.patch
new file mode 100644
index 000..2c27e6a
--- /dev/null
+++ b/debian/patches/01-fix_LFS_support.patch
@@ -0,0 +1,20 @@
+From: David Paleino 
+Subject: correctly support LFS
+Origin: vendor
+Forwarded: no
+
+---
+ configure.ac |2 ++
+ 1 file changed, 2 insertions(+)
+
+--- osm-gps-map.orig/configure.ac
 osm-gps-map/configure.ac
+@@ -17,6 +17,8 @@ AM_PROG_LIBTOOL
+ 
+ AM_SILENT_RULES([yes])
+ 
++AC_SYS_LARGEFILE
++
+ # Library dependencies
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16])
+ PKG_CHECK_MODULES(GTK,  [gtk+-3.0 >= 3.0])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..e22c1ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix_LFS_support.patch

-- 
GTK+ library to embed OpenStreetMap maps

___
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] imposm-parser branch, master, updated. debian/1.0.5-1-1-gfa3d6eb

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit fa3d6eb084153aa5c99fc6ebbe852fb915260491
Author: David Paleino 
Date:   Mon Nov 4 17:33:47 2013 +0100

Updated debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index d30729f..322e4e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+imposm-parser (1.0.5-2) UNRELEASED; urgency=low
+
+  * Updated debian/copyright.
+
+ -- David Paleino   Mon, 04 Nov 2013 17:33:40 +0100
+
 imposm-parser (1.0.5-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 43217f2..1168ba0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: imposm-parser
 Upstream-Author: Oliver Tonnhofer 
 Source: http://dev.omniscale.net/imposm.parser/
@@ -8,7 +8,7 @@ Copyright: © 2011, Omniscale GmbH & Co. KG
 License: Apache-2.0
 
 Files: debian/*
-Copyright: © 2011, David Paleino 
+Copyright: © 2011-2013, David Paleino 
 License: Apache-2.0
 
 License: Apache-2.0

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser annotated tag, debian/1.0.5-1, created. debian/1.0.5-1

2013-11-04 Thread David Paleino

The annotated tag, debian/1.0.5-1 has been created
at  76d3eb41b6b2e6fcd4184387548ba16b3c82c30b (tag)
   tagging  cae5ef89f59a8411d1e31b382d87c79d8019c80a (commit)
  replaces  debian/1.0.3-1
 tagged by  David Paleino
on  Mon Nov 4 17:32:56 2013 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEABECAAYFAlJ3zDgACgkQ5qqQFxOSsXT76ACeIBxj8NKh4pmgaIks5kvt0Hki
fEAAn0cK0xY8UE4TE6usTrUJG5bDW3H3
=07L2
-END PGP SIGNATURE-

David Paleino (8):
  Imported Upstream version 1.0.5
  Merge tag 'upstream/1.0.5'
  New upstream version.
  Use canonical Vcs-* urls.
  Standards-Version bump to 3.9.5, no changes needed.
  debhelper compatibility bumped to 9.
  debian/docs: README renamed to README.rst.
  Releasing to sid

---

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser annotated tag, upstream/1.0.5, created. upstream/1.0.5

2013-11-04 Thread David Paleino

The annotated tag, upstream/1.0.5 has been created
at  862d89402f6e26b51c7e460aea4ca751965ff1fb (tag)
   tagging  dc2c4a49646f923ef2b6b2d1180f6a96b8132cc0 (commit)
  replaces  upstream/1.0.3
 tagged by  David Paleino
on  Mon Nov 4 17:24:26 2013 +0100

- Shortlog 
Upstream version 1.0.5
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEABECAAYFAlJ3yjoACgkQ5qqQFxOSsXRHNwCfSBwn88IQled0FdRLJ2DXls6U
0VYAni1vAbZ1fhxTYRKjlJ8jdlizkpsG
=Baug
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 1.0.5

---

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 8e6f00923f1893e1a186d0cdbf7ee5d8d997c816
Author: David Paleino 
Date:   Mon Nov 4 17:29:56 2013 +0100

debian/docs: README renamed to README.rst.

diff --git a/debian/changelog b/debian/changelog
index abf14a6..3dc59f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ imposm-parser (1.0.5-1) UNRELEASED; urgency=low
   * Use canonical Vcs-* urls.
   * Standards-Version bump to 3.9.5, no changes needed.
   * debhelper compatibility bumped to 9.
+  * debian/docs: README renamed to README.rst.
 
- -- David Paleino   Mon, 04 Nov 2013 17:26:48 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:29:46 +0100
 
 imposm-parser (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/docs b/debian/docs
index e845566..a1320b1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.rst

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 98288e5cbb23cd8c1a89b346cb635097decf2e92
Author: David Paleino 
Date:   Mon Nov 4 17:26:33 2013 +0100

Standards-Version bump to 3.9.5, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index f38d7fb..27e9249 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ imposm-parser (1.0.5-1) UNRELEASED; urgency=low
 
   * New upstream version.
   * Use canonical Vcs-* urls.
+  * Standards-Version bump to 3.9.5, no changes needed.
 
- -- David Paleino   Mon, 04 Nov 2013 17:26:10 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:26:22 +0100
 
 imposm-parser (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bd19bfd..f55d795 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8~)
  , libprotobuf-dev (>= 2.4)
  , protobuf-compiler
 X-Python-Version: >= 2.5
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Homepage: http://dev.omniscale.net/imposm.parser/
 Vcs-Git: git://anonscm.debian.org/pkg-osm/imposm-parser.git
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-osm/imposm-parser.git;a=summary

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit cae5ef89f59a8411d1e31b382d87c79d8019c80a
Author: David Paleino 
Date:   Mon Nov 4 17:30:03 2013 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 3dc59f7..d30729f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-imposm-parser (1.0.5-1) UNRELEASED; urgency=low
+imposm-parser (1.0.5-1) unstable; urgency=low
 
   * New upstream version.
   * Use canonical Vcs-* urls.
@@ -6,7 +6,7 @@ imposm-parser (1.0.5-1) UNRELEASED; urgency=low
   * debhelper compatibility bumped to 9.
   * debian/docs: README renamed to README.rst.
 
- -- David Paleino   Mon, 04 Nov 2013 17:29:46 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:29:58 +0100
 
 imposm-parser (1.0.3-1) unstable; urgency=low
 

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, pristine-tar, updated. 3870e3b0c756e1fb10278f0439df63494f82b45a

2013-11-04 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 3870e3b0c756e1fb10278f0439df63494f82b45a
Author: David Paleino 
Date:   Mon Nov 4 17:24:26 2013 +0100

pristine-tar data for imposm-parser_1.0.5.orig.tar.gz

diff --git a/imposm-parser_1.0.5.orig.tar.gz.delta 
b/imposm-parser_1.0.5.orig.tar.gz.delta
new file mode 100644
index 000..0f5d3e6
Binary files /dev/null and b/imposm-parser_1.0.5.orig.tar.gz.delta differ
diff --git a/imposm-parser_1.0.5.orig.tar.gz.id 
b/imposm-parser_1.0.5.orig.tar.gz.id
new file mode 100644
index 000..b0644c1
--- /dev/null
+++ b/imposm-parser_1.0.5.orig.tar.gz.id
@@ -0,0 +1 @@
+f578b773eef9af91f646d96147aff5a24dcd42de

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit f20be07114497073bb049d988814815dd1eaff3e
Merge: 27f94e8e2591f4fda20783733c5db9a12c2d2b63 
dc2c4a49646f923ef2b6b2d1180f6a96b8132cc0
Author: David Paleino 
Date:   Mon Nov 4 17:24:26 2013 +0100

Merge tag 'upstream/1.0.5'

Upstream version 1.0.5

# gpg: Signature made lun 04 nov 2013 17:24:26 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 5a204bd093bc04488af6d18eaa7c6a4db7282e98
Author: David Paleino 
Date:   Mon Nov 4 17:24:52 2013 +0100

New upstream version.

diff --git a/debian/changelog b/debian/changelog
index 8adf016..8a8c718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+imposm-parser (1.0.5-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- David Paleino   Mon, 04 Nov 2013 17:24:39 +0100
+
 imposm-parser (1.0.3-1) unstable; urgency=low
 
   * New upstream version

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 6bdf182322bcf6d3961bfe7f2a95e860978f2207
Author: David Paleino 
Date:   Mon Nov 4 17:26:55 2013 +0100

debhelper compatibility bumped to 9.

diff --git a/debian/changelog b/debian/changelog
index 27e9249..abf14a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ imposm-parser (1.0.5-1) UNRELEASED; urgency=low
   * New upstream version.
   * Use canonical Vcs-* urls.
   * Standards-Version bump to 3.9.5, no changes needed.
+  * debhelper compatibility bumped to 9.
 
- -- David Paleino   Mon, 04 Nov 2013 17:26:22 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:26:48 +0100
 
 imposm-parser (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f55d795..870415b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
 Priority: extra
 Maintainer: Debian OpenStreetMap Team 
 Uploaders: David Paleino 
-Build-Depends: debhelper (>= 8~)
+Build-Depends:
+ debhelper (>= 9~)
  , python-setuptools
  , python-all-dev (>= 2.6.6-3~)
  , libprotobuf-dev (>= 2.4)

-- 
Python module to parse OpenStreetMap data

___
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] imposm-parser branch, master, updated. debian/1.0.3-1-9-gcae5ef8

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit abdcb5a1ccedbd69182253111941e523d71561ca
Author: David Paleino 
Date:   Mon Nov 4 17:26:16 2013 +0100

Use canonical Vcs-* urls.

diff --git a/debian/changelog b/debian/changelog
index 8a8c718..f38d7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 imposm-parser (1.0.5-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Use canonical Vcs-* urls.
 
- -- David Paleino   Mon, 04 Nov 2013 17:24:39 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:26:10 +0100
 
 imposm-parser (1.0.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5d41baf..bd19bfd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends: debhelper (>= 8~)
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Homepage: http://dev.omniscale.net/imposm.parser/
-Vcs-Git: git://git.debian.org/pkg-osm/imposm-parser.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm-parser.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-osm/imposm-parser.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-osm/imposm-parser.git;a=summary
 
 Package: python-imposm-parser
 Architecture: any

-- 
Python module to parse OpenStreetMap data

___
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] imposm annotated tag, debian/2.5.0-3, created. debian/2.5.0-3

2013-11-04 Thread David Paleino

The annotated tag, debian/2.5.0-3 has been created
at  7b04a58d43675dbf4406c845b50fff44f9117844 (tag)
   tagging  b0bfeec7f6994f276baeaa2fe3da77d8fa6f6ea5 (commit)
  replaces  debian/2.5.0-2
 tagged by  David Paleino
on  Mon Nov 4 17:31:00 2013 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEABECAAYFAlJ3y8QACgkQ5qqQFxOSsXR/rgCfVUDf5Nlaih6lQqsFDTzTut5d
nw4An0s06Pys/4tmrzxW61SYmazvo4Hi
=MOcV
-END PGP SIGNATURE-

David Paleino (2):
  Really fix Vcs-Browser url.
  Releasing to sid

---

-- 
Python importer for OpenStreetMap data

___
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] imposm branch, master, updated. debian/2.5.0-2-2-gb0bfeec

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 1f4d8d89e7bdf6f310b8f453d90ba5b43f6a8f6a
Author: David Paleino 
Date:   Mon Nov 4 17:28:06 2013 +0100

Really fix Vcs-Browser url.

diff --git a/debian/changelog b/debian/changelog
index c36bfe3..bec6b43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+imposm (2.5.0-3) UNRELEASED; urgency=low
+
+  * Really fix Vcs-Browser url.
+
+ -- David Paleino   Mon, 04 Nov 2013 17:27:59 +0100
+
 imposm (2.5.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index e966158..2fe59fb 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9~)
 Standards-Version: 3.9.5
 Homepage: http://imposm.org/
 Vcs-Git: git://anonscm.debian.org/pkg-osm/imposm.git
-Vcs-Browser: http://anonscm.debian.org/?p=pkg-osm/imposm.git;a=summary
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/imposm.git;a=summary
 
 Package: python-imposm
 Architecture: any

-- 
Python importer for OpenStreetMap data

___
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] imposm branch, master, updated. debian/2.5.0-2-2-gb0bfeec

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit b0bfeec7f6994f276baeaa2fe3da77d8fa6f6ea5
Author: David Paleino 
Date:   Mon Nov 4 17:28:13 2013 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index bec6b43..7d3a3fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-imposm (2.5.0-3) UNRELEASED; urgency=low
+imposm (2.5.0-3) unstable; urgency=low
 
   * Really fix Vcs-Browser url.
 
- -- David Paleino   Mon, 04 Nov 2013 17:27:59 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:28:08 +0100
 
 imposm (2.5.0-2) unstable; urgency=low
 

-- 
Python importer for OpenStreetMap data

___
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] imposm branch, master, updated. debian/2.5.0-1-3-g04d7cb6

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 04d7cb6222d085c9106a24989d9f2f1195e4b3a8
Author: David Paleino 
Date:   Mon Nov 4 17:22:56 2013 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 31e77ae..c36bfe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-imposm (2.5.0-2) UNRELEASED; urgency=low
+imposm (2.5.0-2) unstable; urgency=low
 
+  * Upload to unstable.
   * Standards-Version bump to 3.9.5, no changes needed.
   * Use canonical Vcs-* urls.
 
- -- David Paleino   Mon, 04 Nov 2013 17:22:22 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:22:43 +0100
 
 imposm (2.5.0-1) experimental; urgency=low
 

-- 
Python importer for OpenStreetMap data

___
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] imposm branch, master, updated. debian/2.5.0-1-3-g04d7cb6

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit af85a1d27202db87a0005a305e5cf257dee747a9
Author: David Paleino 
Date:   Mon Nov 4 17:22:28 2013 +0100

Use canonical Vcs-* urls.

diff --git a/debian/changelog b/debian/changelog
index 25b310c..31e77ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 imposm (2.5.0-2) UNRELEASED; urgency=low
 
   * Standards-Version bump to 3.9.5, no changes needed.
+  * Use canonical Vcs-* urls.
 
- -- David Paleino   Mon, 04 Nov 2013 17:21:44 +0100
+ -- David Paleino   Mon, 04 Nov 2013 17:22:22 +0100
 
 imposm (2.5.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 4dd2891..e966158 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 9~)
  , libprotobuf-dev
 Standards-Version: 3.9.5
 Homepage: http://imposm.org/
-Vcs-Git: git://git.debian.org/pkg-osm/imposm.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-osm/imposm.git
+Vcs-Browser: http://anonscm.debian.org/?p=pkg-osm/imposm.git;a=summary
 
 Package: python-imposm
 Architecture: any

-- 
Python importer for OpenStreetMap data

___
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] imposm branch, master, updated. debian/2.5.0-1-3-g04d7cb6

2013-11-04 Thread David Paleino

The following commit has been merged in the master branch:
commit 2033ed5153da5eca9b26d95b67f3ddb6070ebbed
Author: David Paleino 
Date:   Mon Nov 4 17:21:55 2013 +0100

Standards-Version bump to 3.9.5, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 7b25069..25b310c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+imposm (2.5.0-2) UNRELEASED; urgency=low
+
+  * Standards-Version bump to 3.9.5, no changes needed.
+
+ -- David Paleino   Mon, 04 Nov 2013 17:21:44 +0100
+
 imposm (2.5.0-1) experimental; urgency=low
 
   * Acknowledge NMU.
diff --git a/debian/control b/debian/control
index 7b2d3a7..4dd2891 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9~)
  , cython
  , protobuf-compiler
  , libprotobuf-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://imposm.org/
 Vcs-Git: git://git.debian.org/pkg-osm/imposm.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/imposm.git;a=summary
diff --git a/imposm/psqldb.py b/imposm/psqldb.py
index fdfff42..f6dbc21 100644
--- a/imposm/psqldb.py
+++ b/imposm/psqldb.py
@@ -116,7 +116,7 @@ def main():
 'password': options.password,
 }
 
-mapping['epsg900913_sql'] = join(dirname(__file__), '900913.sql')
+mapping['epsg900913_sql'] = '/usr/share/python-imposm/900913.sql'
 find_sql_files(options.pg_version, options.postgis_version, mapping)
 
 if options.postgis_version == '2.0':

-- 
Python importer for OpenStreetMap data

___
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] imposm annotated tag, debian/2.5.0-2, created. debian/2.5.0-2

2013-11-04 Thread David Paleino

The annotated tag, debian/2.5.0-2 has been created
at  6c6266ba9319d3d9615ea9064c255acc5a241f7c (tag)
   tagging  04d7cb6222d085c9106a24989d9f2f1195e4b3a8 (commit)
  replaces  debian/2.5.0-1
 tagged by  David Paleino
on  Mon Nov 4 17:25:36 2013 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)

iEYEABECAAYFAlJ3yoAACgkQ5qqQFxOSsXRrXQCglBdYH6MT6ptVNPnkg0bgH3E1
HHIAn31guKSOYkulrq3dXbWxj3y7kmzy
=45MI
-END PGP SIGNATURE-

David Paleino (3):
  Standards-Version bump to 3.9.5, no changes needed.
  Use canonical Vcs-* urls.
  Upload to unstable.

---

-- 
Python importer for OpenStreetMap data

___
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-plugins annotated tag, debian/0.0.svn29348+ds1-1, created. debian/0.0.svn29348+ds1-1

2013-04-07 Thread David Paleino

The annotated tag, debian/0.0.svn29348+ds1-1 has been created
at  fa4ca96e815727b9c587f6db6de77f9b9f75e137 (tag)
   tagging  506320931b00fbe17b3a9d2c4acb84661a9a5072 (commit)
  replaces  debian/0.0.svn29007+ds1-1
 tagged by  David Paleino
on  Sun Apr 7 10:05:34 2013 +0200

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlFhKM4ACgkQ5qqQFxOSsXTLwgCfaIituShCZX9Ua+4gBFEcxX7N
CQcAni7JmO6U94qPQvacCgCtfx46usho
=KOP9
-END PGP SIGNATURE-

David Paleino (5):
  Imported Upstream version 0.0.svn29348+ds1
  Merge tag 'upstream/0.0.svn29348+ds1'
  New upstream snapshot.
  Bump JOSM dependency to 5759.
  Uploading to experimental

---

-- 
Plugins for JOSM

___
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-plugins annotated tag, upstream/0.0.svn29348+ds1, created. upstream/0.0.svn29348+ds1

2013-04-07 Thread David Paleino

The annotated tag, upstream/0.0.svn29348+ds1 has been created
at  dc482e7e360a8c95db75c0021b57358d2ff609f7 (tag)
   tagging  4dbbdb0d17432d0045b17f73062dd13df0d36eab (commit)
  replaces  upstream/0.0.svn29007+ds1
 tagged by  David Paleino
on  Fri Apr 5 17:42:57 2013 +0200

- Shortlog 
Upstream version 0.0.svn29348+ds1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlFe8QEACgkQ5qqQFxOSsXQJKwCfdNz6ez5cDre3ZlMzevQj0/ie
ezwAnjdiKmBEtGDDvHsD2+KzQcp9bQ9o
=5pn1
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 0.0.svn29348+ds1

---

-- 
Plugins for JOSM

___
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-plugins branch, master, updated. debian/0.0.svn29007+ds1-1-5-g5063209

2013-04-07 Thread David Paleino

The following commit has been merged in the master branch:
commit 9fe40dac40b35c122a882bb03c0539e1b3265921
Merge: 78b536c6513575a410fb54aa2f0b0f0fce835525 
4dbbdb0d17432d0045b17f73062dd13df0d36eab
Author: David Paleino 
Date:   Fri Apr 5 17:43:00 2013 +0200

Merge tag 'upstream/0.0.svn29348+ds1'

Upstream version 0.0.svn29348+ds1

# gpg: Signature made ven 05 apr 2013 17:42:57 CEST using DSA key ID 
1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
Plugins for JOSM

___
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-plugins branch, pristine-tar, updated. 62b7d64bd624c330f426fbaea7dc3c0e3d68816d

2013-04-07 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 62b7d64bd624c330f426fbaea7dc3c0e3d68816d
Author: David Paleino 
Date:   Fri Apr 5 17:42:56 2013 +0200

pristine-tar data for josm-plugins_0.0.svn29348+ds1.orig.tar.gz

diff --git a/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.delta 
b/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.delta
new file mode 100644
index 000..58ff2ab
Binary files /dev/null and b/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.delta 
differ
diff --git a/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.id 
b/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.id
new file mode 100644
index 000..0b6dbe4
--- /dev/null
+++ b/josm-plugins_0.0.svn29348+ds1.orig.tar.gz.id
@@ -0,0 +1 @@
+163d59ed4aac17df54aead9c0efcf84570c5f47e

-- 
Plugins for JOSM

___
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-plugins branch, master, updated. debian/0.0.svn29007+ds1-1-5-g5063209

2013-04-07 Thread David Paleino

The following commit has been merged in the master branch:
commit fbba150836e1dac7b9a290eaac0ca3fbdac1d9a6
Author: David Paleino 
Date:   Fri Apr 5 17:44:13 2013 +0200

Bump JOSM dependency to 5759.

diff --git a/debian/changelog b/debian/changelog
index 2a26b35..020e2a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm-plugins (0.0.svn29348+ds1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+  * Bump JOSM dependency to 5759.
 
- -- David Paleino   Fri, 05 Apr 2013 17:43:20 +0200
+ -- David Paleino   Fri, 05 Apr 2013 17:44:04 +0200
 
 josm-plugins (0.0.svn29007+ds1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 11ec1a5..66ef4d7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,13 +10,13 @@ Build-Depends:
  , ant-contrib
  , debhelper (>= 8~)
  , default-jdk
- , josm (>= 0.0.svn5608)
+ , josm (>= 0.0.svn5759)
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
  , libgettext-ant-tasks-java
  , python
-Build-Conflicts: josm (>= 0.0.svn5609)
+Build-Conflicts: josm (>= 0.0.svn5760)
 Standards-Version: 3.9.4
 Homepage: http://josm.openstreetmap.de/wiki/Plugins
 Vcs-Git: git://anonscm.debian.org/pkg-osm/josm-plugins.git
@@ -26,11 +26,11 @@ Package: josm-plugins
 Architecture: all
 Depends:
  ${misc:Depends}
- , josm (>= 0.0.svn5608)
+ , josm (>= 0.0.svn5759)
  , libmetadata-extractor-java
  , liblog4j1.2-java
  , libjgrapht0.8-java
-Breaks: josm (>= 0.0.svn5609)
+Breaks: josm (>= 0.0.svn5760)
 Suggests: gpsd
 Description: Plugins for JOSM
  JOSM (Java OpenStreetMap) plugin collection.

-- 
Plugins for JOSM

___
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-plugins branch, master, updated. debian/0.0.svn29007+ds1-1-5-g5063209

2013-04-07 Thread David Paleino

The following commit has been merged in the master branch:
commit 506320931b00fbe17b3a9d2c4acb84661a9a5072
Author: David Paleino 
Date:   Sun Apr 7 10:05:27 2013 +0200

Uploading to experimental

diff --git a/debian/changelog b/debian/changelog
index 020e2a1..d168623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-josm-plugins (0.0.svn29348+ds1-1) UNRELEASED; urgency=low
+josm-plugins (0.0.svn29348+ds1-1) experimental; urgency=low
 
   * New upstream snapshot.
   * Bump JOSM dependency to 5759.
 
- -- David Paleino   Fri, 05 Apr 2013 17:44:04 +0200
+ -- David Paleino   Sat, 06 Apr 2013 23:44:11 +0200
 
 josm-plugins (0.0.svn29007+ds1-1) unstable; urgency=low
 

-- 
Plugins for JOSM

___
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-plugins branch, master, updated. debian/0.0.svn29007+ds1-1-5-g5063209

2013-04-07 Thread David Paleino

The following commit has been merged in the master branch:
commit e0644bb41b6445cdd293d73d7427953328f5f544
Author: David Paleino 
Date:   Fri Apr 5 17:43:38 2013 +0200

New upstream snapshot.

diff --git a/debian/changelog b/debian/changelog
index 68fbb6b..2a26b35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn29348+ds1-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- David Paleino   Fri, 05 Apr 2013 17:43:20 +0200
+
 josm-plugins (0.0.svn29007+ds1-1) unstable; urgency=low
 
   * New upstream snapshot.

-- 
Plugins for JOSM

___
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 annotated tag, debian/0.0.svn5759+dfsg1-1, created. debian/0.0.svn5759+dfsg1-1

2013-04-05 Thread David Paleino

The annotated tag, debian/0.0.svn5759+dfsg1-1 has been created
at  835f88b22cb170fc79887c089695817640c96171 (tag)
   tagging  8b4a2f3f3206c31dbfbdac0f7c44024075502bb2 (commit)
  replaces  debian/0.0.svn5608+dfsg1-2
 tagged by  David Paleino
on  Fri Apr 5 17:26:51 2013 +0200

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlFe7TsACgkQ5qqQFxOSsXSZNgCfbArQ0wDKiCBQlyXsyHt8Q6LM
xhEAnjpmx9smIw7KnmuHrVJ+bTlKrWu2
=Dstr
-END PGP SIGNATURE-

David Paleino (6):
  Imported Upstream version 0.0.svn5759+dfsg1
  Merge tag 'upstream/0.0.svn5759+dfsg1'
  New tested snapshot.
  Patches refreshed
  Make 06-move_data_out_of_jar.patch more generic, thanks to Paul Hartmann 
for the patch. (Closes: #698608)
  Releasing to experimental

---

-- 
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 annotated tag, upstream/0.0.svn5759+dfsg1, created. upstream/0.0.svn5759+dfsg1

2013-04-05 Thread David Paleino

The annotated tag, upstream/0.0.svn5759+dfsg1 has been created
at  c9a45c0aa154b5489f6731d433d9f77b4d56eb86 (tag)
   tagging  d934031ef1f16c85b77277ed4ac539601e388903 (commit)
  replaces  upstream/0.0.svn5608+dfsg1
 tagged by  David Paleino
on  Fri Apr 5 10:21:19 2013 +0200

- Shortlog 
Upstream version 0.0.svn5759+dfsg1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlFeiX8ACgkQ5qqQFxOSsXQ+eACgyfzzyuL2X+rAGNq8tzfxs4tH
3aoAoJeJTVNHEaN8sTbtvg321aU5m3ll
=+gNZ
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 0.0.svn5759+dfsg1

---

-- 
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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit 38ae847a7ca70bd7db2aecb8c2cac5bb00ddf84c
Author: David Paleino 
Date:   Fri Apr 5 17:28:47 2013 +0200

Fix hyphen-used-as-minus-sign in manpage.

diff --git a/debian/changelog b/debian/changelog
index 03411d5..f6a6275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn5759+dfsg1-2) UNRELEASED; urgency=low
+
+  * Fix hyphen-used-as-minus-sign in manpage.
+
+ -- David Paleino   Fri, 05 Apr 2013 17:28:31 +0200
+
 josm (0.0.svn5759+dfsg1-1) experimental; urgency=low
 
   * New tested snapshot.
diff --git a/debian/josm.1 b/debian/josm.1
index 4a1a0b9..ca89779 100644
--- a/debian/josm.1
+++ b/debian/josm.1
@@ -57,7 +57,7 @@ Set the preference \fIkey\fR to \fIvalue\fR.
 \fB\-\-language=\fIlanguage\fR
 Set the language.
 .SH JAVA PROPERTIES
-The following options can be set by using Java system properties (i.e. 
-Dkey=value
+The following options can be set by using Java system properties (i.e. 
\-Dkey=value
 passed to \fBjava\fR, or specified inside \fBJAVA_OPTS\fR).
 .TP
 \fBjosm.home=\fIpath\fR
@@ -69,7 +69,7 @@ Specify an alternate Java environment.
 .IP JAVA_OPTS
 Specify Java options.
 For example, to use a HTTP proxy server with this program, set this 
environment variable
-to something like \fIJAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"\fR before 
starting josm.
+to something like \fIJAVA_OPTS="\-Dhttp.proxyHost=yourProxyURL"\fR before 
starting josm.
 .SH AUTHOR
 josm was written by Immanuel Scholz.
 The current maintainer is Dirk Stöcker.

-- 
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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit a824e7547aa5c4a9438331fe2cfa3e3d58f678f4
Author: David Paleino 
Date:   Fri Apr 5 10:22:50 2013 +0200

Patches refreshed

diff --git a/debian/patches/02-elemstyles.patch 
b/debian/patches/02-elemstyles.patch
index d55d772..01f98a1 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -39,15 +39,15 @@ applications. This patch points josm to the shared 
directories.
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -65,6 +65,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -72,6 +72,7 @@ import org.openstreetmap.josm.gui.QuadSt
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
+ import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
  import 
org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1284,12 +1285,22 @@ public class TaggingPreset extends Abstr
+@@ -1378,12 +1379,22 @@ public class TaggingPreset extends Abstr
  }
  
  protected static ImageIcon loadImageIcon(String iconName, File zipIcons, 
Integer maxSize) {
@@ -73,7 +73,7 @@ applications. This patch points josm to the shared 
directories.
  }
  
  /*
-@@ -1300,8 +1311,15 @@ public class TaggingPreset extends Abstr
+@@ -1394,8 +1405,15 @@ public class TaggingPreset extends Abstr
   * and the 16x16 icons for SMALL_ICON.
   */
  public void setIcon(final String iconName) {
@@ -91,7 +91,7 @@ applications. This patch points josm to the shared 
directories.
  imgProv.setDirs(s);
  imgProv.setId("presets");
  imgProv.setArchive(TaggingPreset.zipIcons);
-@@ -1318,7 +1336,7 @@ public class TaggingPreset extends Abstr
+@@ -1412,7 +1430,7 @@ public class TaggingPreset extends Abstr
  }
  });
  } else {
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 7489cf7..5ef77c8 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -33,7 +33,7 @@ Forwarded: not-needed
  
 --- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
 +++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -1511,7 +1511,7 @@ public class Preferences {
+@@ -1519,7 +1519,7 @@ public class Preferences {
  
  public void validateXML(Reader in) throws Exception {
  SchemaFactory factory =  
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
@@ -44,7 +44,7 @@ Forwarded: not-needed
  }
 --- josm.orig/src/org/openstreetmap/josm/data/projection/Projections.java
 +++ josm/src/org/openstreetmap/josm/data/projection/Projections.java
-@@ -121,7 +121,7 @@ public class Projections {
+@@ -124,7 +124,7 @@ public class Projections {
  private static void loadInits() {
  Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
  try {
@@ -122,7 +122,7 @@ Forwarded: not-needed
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -1411,7 +1411,7 @@ public class TaggingPreset extends Abstr
+@@ -1505,7 +1505,7 @@ public class TaggingPreset extends Abstr
  List listEntries = new LinkedList();
  
  if (validate) {

-- 
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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit ca22ceef2d1aad36db3fc6af9748c2416648a9ee
Author: David Paleino 
Date:   Fri Apr 5 10:28:10 2013 +0200

Make 06-move_data_out_of_jar.patch more generic, thanks to Paul Hartmann 
for the patch. (Closes: #698608)

diff --git a/debian/changelog b/debian/changelog
index 707c515..52e3f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 josm (0.0.svn5759+dfsg1-1) UNRELEASED; urgency=low
 
   * New tested snapshot.
+  * Make 06-move_data_out_of_jar.patch more generic, thanks to
+Paul Hartmann for the patch. (Closes: #698608)
 
- -- David Paleino   Fri, 05 Apr 2013 10:21:52 +0200
+ -- David Paleino   Fri, 05 Apr 2013 10:27:11 +0200
 
 josm (0.0.svn5608+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 5ef77c8..899277e 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -1,20 +1,15 @@
 From: David Paleino 
+ Paul Hartmann 
 Subject: move sharable data out of josm.jar
 Origin: vendor
 Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
 
 ---
- build.xml 
 |6 +++---
- src/org/openstreetmap/josm/data/Preferences.java  
 |2 +-
- src/org/openstreetmap/josm/data/projection/Projections.java   
 |2 +-
- 
src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java 
|4 ++--
- src/org/openstreetmap/josm/data/validation/tests/TagChecker.java  
 |6 +++---
- src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java   
 |2 +-
- src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
 |4 ++--
- src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java   
 |2 +-
- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java 
 |2 +-
- src/org/openstreetmap/josm/tools/I18n.java
 |7 ++-
- 10 files changed, 21 insertions(+), 16 deletions(-)
+ build.xml  |6 ++---
+ src/org/openstreetmap/josm/io/MirroredInputStream.java |   19 
+++--
+ src/org/openstreetmap/josm/tools/I18n.java |7 +-
+ 3 files changed, 22 insertions(+), 10 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -31,106 +26,6 @@ Forwarded: not-needed
  
  
  
 josm.orig/src/org/openstreetmap/josm/data/Preferences.java
-+++ josm/src/org/openstreetmap/josm/data/Preferences.java
-@@ -1519,7 +1519,7 @@ public class Preferences {
- 
- public void validateXML(Reader in) throws Exception {
- SchemaFactory factory =  
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
--Schema schema = factory.newSchema(new StreamSource(new 
MirroredInputStream("resource://data/preferences.xsd")));
-+Schema schema = factory.newSchema(new StreamSource(new 
MirroredInputStream("/usr/share/josm/data/preferences.xsd")));
- Validator validator = schema.newValidator();
- validator.validate(new StreamSource(in));
- }
 josm.orig/src/org/openstreetmap/josm/data/projection/Projections.java
-+++ josm/src/org/openstreetmap/josm/data/projection/Projections.java
-@@ -124,7 +124,7 @@ public class Projections {
- private static void loadInits() {
- Pattern epsgPattern = Pattern.compile("<(\\d+)>(.*)<>");
- try {
--InputStream in = new MirroredInputStream("resource://data/epsg");
-+InputStream in = new 
MirroredInputStream("/usr/share/josm/data/epsg");
- BufferedReader r = new BufferedReader(new InputStreamReader(in));
- String line, lastline = "";
- while ((line = r.readLine()) != null) {
 
josm.orig/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
-+++ 
josm/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
-@@ -317,7 +317,7 @@ public class TaggingPresetPreference imp
- 
- @Override
- public Collection getDefault() {
--ExtendedSourceEntry i = new 
ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");
-+ExtendedSourceEntry i = new 
ExtendedSourceEntry("defaultpresets.xml", 
"/usr/share/josm/data/defaultpresets.xml");
- i.title = tr("Internal Preset");
- i.description = tr("The default preset for JOSM");
- return Collections.singletonList(i);
 josm.orig/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
-+++ josm/src/org/openstreetmap/josm/data/validation/tests/

[Pkg-osm-commits] [SCM] josm branch, pristine-tar, updated. 695656c33d9a634e8bcdddca4523f03700ce5d61

2013-04-05 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit 695656c33d9a634e8bcdddca4523f03700ce5d61
Author: David Paleino 
Date:   Fri Apr 5 10:21:19 2013 +0200

pristine-tar data for josm_0.0.svn5759+dfsg1.orig.tar.gz

diff --git a/josm_0.0.svn5759+dfsg1.orig.tar.gz.delta 
b/josm_0.0.svn5759+dfsg1.orig.tar.gz.delta
new file mode 100644
index 000..7834326
Binary files /dev/null and b/josm_0.0.svn5759+dfsg1.orig.tar.gz.delta differ
diff --git a/josm_0.0.svn5759+dfsg1.orig.tar.gz.id 
b/josm_0.0.svn5759+dfsg1.orig.tar.gz.id
new file mode 100644
index 000..4771f15
--- /dev/null
+++ b/josm_0.0.svn5759+dfsg1.orig.tar.gz.id
@@ -0,0 +1 @@
+c12092b962f60965c790bef0e5fdb72c62a5b683

-- 
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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit 8b4a2f3f3206c31dbfbdac0f7c44024075502bb2
Author: David Paleino 
Date:   Fri Apr 5 11:39:11 2013 +0200

Releasing to experimental

diff --git a/debian/changelog b/debian/changelog
index 52e3f9e..03411d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-josm (0.0.svn5759+dfsg1-1) UNRELEASED; urgency=low
+josm (0.0.svn5759+dfsg1-1) experimental; urgency=low
 
   * New tested snapshot.
   * Make 06-move_data_out_of_jar.patch more generic, thanks to
 Paul Hartmann for the patch. (Closes: #698608)
 
- -- David Paleino   Fri, 05 Apr 2013 10:27:11 +0200
+ -- David Paleino   Fri, 05 Apr 2013 10:29:44 +0200
 
 josm (0.0.svn5608+dfsg1-2) 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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit f67e9e5eadc07ac8991a86ab4a5a5e5e4d12c345
Author: David Paleino 
Date:   Fri Apr 5 10:22:03 2013 +0200

New tested snapshot.

diff --git a/debian/changelog b/debian/changelog
index 793d9cd..707c515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn5759+dfsg1-1) UNRELEASED; urgency=low
+
+  * New tested snapshot.
+
+ -- David Paleino   Fri, 05 Apr 2013 10:21:52 +0200
+
 josm (0.0.svn5608+dfsg1-2) unstable; urgency=low
 
   * Updated manpage (Closes: #696692).

-- 
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.svn5608+dfsg1-2-7-g38ae847

2013-04-05 Thread David Paleino

The following commit has been merged in the master branch:
commit 57ec0d937319fbebccbaea43727266092d5e9f3d
Merge: f38f6cd48927630b45cd17d30611c83a10228933 
d934031ef1f16c85b77277ed4ac539601e388903
Author: David Paleino 
Date:   Fri Apr 5 10:21:25 2013 +0200

Merge tag 'upstream/0.0.svn5759+dfsg1'

Upstream version 0.0.svn5759+dfsg1

# gpg: Signature made ven 05 apr 2013 10:21:19 CEST using DSA key ID 
1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
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] osmpbf annotated tag, upstream/1.3.0, created. upstream/1.3.0

2013-01-28 Thread David Paleino

The annotated tag, upstream/1.3.0 has been created
at  8d85585d41aa29b2be441cff6ded001fc2ebb63f (tag)
   tagging  2e955a6cb8a10f3e38cc8dd78a4a57dc030b33da (commit)
  replaces  upstream/1.2.1
 tagged by  David Paleino
on  Mon Jan 28 19:56:35 2013 +0100

- Shortlog 
Upstream version 1.3.0
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlEGyeMACgkQ5qqQFxOSsXSQhwCfXGH3AYoVdoY6PhyExqPedxo+
xuYAn2eQPrCCX1cnnzo9fRuwp7hsH98b
=I/A1
-END PGP SIGNATURE-

David Paleino (1):
  Imported Upstream version 1.3.0

---

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 3ec6edac32ad797563ae95a305f55e89af540be5
Author: David Paleino 
Date:   Mon Jan 28 20:03:32 2013 +0100

Updated debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 7d5ad89..9cf3746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility to 9.
   * Standards-Version bump to 3.9.4, no changes needed.
   * Use canonical Vcs-* urls in debian/control.
+  * Updated debian/copyright.
 
- -- David Paleino   Mon, 28 Jan 2013 19:59:42 +0100
+ -- David Paleino   Mon, 28 Jan 2013 20:03:25 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6420525..3ee781d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,42 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: http://github.com/scrosby/OSM-binary
 Upstream-Contact: Scott A. Crosby 
 
 Files: *
 Copyright: © 2010, Scott A. Crosby 
 License: LGPL-3+
- On Debian systems, the complete text of the GNU Lesser General Public License,
- version 3, can be found in `/usr/share/common-licenses/LGPL-3'.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
 Files: debian/*
 Copyright: © 2010-2012, Giovanni Mascellani 
+ © 2011-2013, David Paleino 
 License: GPL-3+
- On Debian systems, the complete text of the GNU General Public License,
- version 3, can be found in `/usr/share/common-licenses/GPL-3'.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in "/usr/share/common-licenses/GPL-3".

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf annotated tag, debian/1.3.0-1, created. debian/1.3.0-1

2013-01-28 Thread David Paleino

The annotated tag, debian/1.3.0-1 has been created
at  1cb69bc88561358daee7eabe626a799e88492bf6 (tag)
   tagging  c4c3fd000b44cd8a109fdf7dffd57925ec387d5a (commit)
  replaces  debian/1.2.1-3
 tagged by  David Paleino
on  Mon Jan 28 20:38:25 2013 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlEG07EACgkQ5qqQFxOSsXSBXwCeImLpGBAKnkfNrhnywD+70W9X
J10AoI7MilbhHnYdrEdUcTz5ZFvUwigN
=3F3Y
-END PGP SIGNATURE-

David Paleino (13):
  Imported Upstream version 1.3.0
  Merge tag 'upstream/1.3.0' into debian
  New upstream version.
  Bump debhelper compatibility to 9.
  Re-wrap field
  Standards-Version bump to 3.9.4, no changes needed.
  Use canonical Vcs-* urls in debian/control.
  Updated debian/copyright.
  Renamed patch, and added DEP-3 header
  Install ReleaseNotes.txt as upstream changelog.
  Use override_dh_install instead of binary target
  Correctly clean up after builds.
  Releasing to sid

Giovanni Mascellani (1):
  Remove myself from the uploaders list.

---

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, pristine-tar, updated. c5a9cfdcc3b8acf2e03b1849b6677d830667bdb0

2013-01-28 Thread David Paleino

The following commit has been merged in the pristine-tar branch:
commit c5a9cfdcc3b8acf2e03b1849b6677d830667bdb0
Author: David Paleino 
Date:   Mon Jan 28 19:56:35 2013 +0100

pristine-tar data for osmpbf_1.3.0.orig.tar.gz

diff --git a/osmpbf_1.3.0.orig.tar.gz.delta b/osmpbf_1.3.0.orig.tar.gz.delta
new file mode 100644
index 000..62c990c
Binary files /dev/null and b/osmpbf_1.3.0.orig.tar.gz.delta differ
diff --git a/osmpbf_1.3.0.orig.tar.gz.id b/osmpbf_1.3.0.orig.tar.gz.id
new file mode 100644
index 000..39627ef
--- /dev/null
+++ b/osmpbf_1.3.0.orig.tar.gz.id
@@ -0,0 +1 @@
+9f128268dd14cf800af47279971bfe07f74fe80a

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 12829ec2e0bfa8e02dde8188b3efc51f0ff0aff1
Author: David Paleino 
Date:   Mon Jan 28 20:23:54 2013 +0100

Use override_dh_install instead of binary target

diff --git a/debian/rules b/debian/rules
index e5e2925..4e68f1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,7 @@ override_dh_auto_install:
 override_dh_installchangelogs:
dh_installchangelogs -- ReleaseNotes.txt
 
-binary:
-   dh binary --until dh_install
+override_dh_install:
+   dh_install
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar
mh_installpom -plibosmpbf-java pom.xml
-   dh binary --remaining

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 02b6120bccfb85930c9b101bc5cedbf0ad65a186
Author: David Paleino 
Date:   Mon Jan 28 20:32:38 2013 +0100

Correctly clean up after builds.

diff --git a/debian/changelog b/debian/changelog
index a4e2aef..421d63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Use canonical Vcs-* urls in debian/control.
   * Updated debian/copyright.
   * Install ReleaseNotes.txt as upstream changelog.
+  * Correctly clean up after builds.
 
- -- David Paleino   Mon, 28 Jan 2013 20:23:10 +0100
+ -- David Paleino   Mon, 28 Jan 2013 20:32:24 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..13d6ffc
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+include/osmpbf/fileformat.pb.h
+include/osmpbf/osmformat.pb.h
diff --git a/debian/rules b/debian/rules
index 4e68f1f..fbedc6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,12 @@
 %:
dh $@ 
 
+override_dh_auto_clean:
+   dh_auto_clean
+   dh_auto_clean -Dsrc
+   dh_auto_clean -Dtools
+   mh_clean
+
 override_dh_auto_build:
dh_auto_build
dh_auto_build -Dsrc

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit c4c3fd000b44cd8a109fdf7dffd57925ec387d5a
Author: David Paleino 
Date:   Mon Jan 28 20:32:56 2013 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 421d63a..43f61b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-osmpbf (1.3.0-1) UNRELEASED; urgency=low
+osmpbf (1.3.0-1) unstable; urgency=low
 
   [ Giovanni Mascellani ]
   * Remove myself from the uploaders list, since I have no time
@@ -13,7 +13,7 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Install ReleaseNotes.txt as upstream changelog.
   * Correctly clean up after builds.
 
- -- David Paleino   Mon, 28 Jan 2013 20:32:24 +0100
+ -- David Paleino   Mon, 28 Jan 2013 20:32:44 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 16981811547d4fbb77a78faee6f55de9d2644d15
Author: David Paleino 
Date:   Mon Jan 28 20:05:55 2013 +0100

Renamed patch, and added DEP-3 header

diff --git a/debian/patches/build_flags 
b/debian/patches/00-fix_build_flags.patch
similarity index 53%
rename from debian/patches/build_flags
rename to debian/patches/00-fix_build_flags.patch
index 41809c2..f1dcaca 100644
--- a/debian/patches/build_flags
+++ b/debian/patches/00-fix_build_flags.patch
@@ -1,7 +1,15 @@
-Index: osmpbf/tools/Makefile
-===
 osmpbf.orig/tools/Makefile 2012-06-15 10:35:26.0 +0200
-+++ osmpbf/tools/Makefile  2012-06-15 10:35:43.0 +0200
+From: Giovanni Mascellani 
+Subject: fix Makefile so Debian build flags are honoured.
+Origin: vendor
+Forwarded: not-needed
+
+---
+ src/Makefile   |2 +-
+ tools/Makefile |4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- osmpbf.orig/tools/Makefile
 osmpbf/tools/Makefile
 @@ -1,7 +1,7 @@
  
  CXX = g++
@@ -12,10 +20,8 @@ Index: osmpbf/tools/Makefile
  
  all: osmpbf-outline
  
-Index: osmpbf/src/Makefile
-===
 osmpbf.orig/src/Makefile   2012-06-15 10:36:30.0 +0200
-+++ osmpbf/src/Makefile2012-06-15 10:36:43.0 +0200
+--- osmpbf.orig/src/Makefile
 osmpbf/src/Makefile
 @@ -1,6 +1,6 @@
  
  CXX = g++
diff --git a/debian/patches/series b/debian/patches/series
index 64c4d9f..ef3eaa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-build_flags
+00-fix_build_flags.patch

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 69f82316146a1128974e8ee3da404d2db44af23f
Author: David Paleino 
Date:   Mon Jan 28 20:23:20 2013 +0100

Install ReleaseNotes.txt as upstream changelog.

diff --git a/debian/changelog b/debian/changelog
index 9cf3746..a4e2aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * Standards-Version bump to 3.9.4, no changes needed.
   * Use canonical Vcs-* urls in debian/control.
   * Updated debian/copyright.
+  * Install ReleaseNotes.txt as upstream changelog.
 
- -- David Paleino   Mon, 28 Jan 2013 20:03:25 +0100
+ -- David Paleino   Mon, 28 Jan 2013 20:23:10 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index cfda8bb..e5e2925 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_install:
dh_auto_install -Dsrc
dh_auto_install -Dtools
 
+override_dh_installchangelogs:
+   dh_installchangelogs -- ReleaseNotes.txt
+
 binary:
dh binary --until dh_install
mh_installjar -plibosmpbf-java -l pom.xml osmpbf.jar

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 315ff8abc6c391da0b75a8f7bb55c836d1cf8108
Author: David Paleino 
Date:   Mon Jan 28 19:59:52 2013 +0100

Use canonical Vcs-* urls in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 1a67883..7d5ad89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   * New upstream version.
   * Bump debhelper compatibility to 9.
   * Standards-Version bump to 3.9.4, no changes needed.
+  * Use canonical Vcs-* urls in debian/control.
 
- -- David Paleino   Mon, 28 Jan 2013 19:58:34 +0100
+ -- David Paleino   Mon, 28 Jan 2013 19:59:42 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aa1de13..bfabbff 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  , maven-repo-helper
 Standards-Version: 3.9.4
 Homepage: http://github.com/scrosby/OSM-binary
-Vcs-Git: git://git.debian.org/pkg-osm/osmpbf.git
-Vcs-Browser: http://git.debian.org/?p=pkg-osm/osmpbf.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-osm/osmpbf.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/osmpbf.git;a=summary
 
 Package: libosmpbf-java
 Architecture: all

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit a8265ff19a69c86712bb0e5e0ed59dbf2e2d558b
Author: David Paleino 
Date:   Mon Jan 28 19:58:47 2013 +0100

Standards-Version bump to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 9445989..1a67883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
   [ David Paleino ]
   * New upstream version.
   * Bump debhelper compatibility to 9.
+  * Standards-Version bump to 3.9.4, no changes needed.
 
- -- David Paleino   Mon, 28 Jan 2013 19:57:37 +0100
+ -- David Paleino   Mon, 28 Jan 2013 19:58:34 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ebc83d7..aa1de13 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  , default-jdk
  , libprotobuf-dev
  , maven-repo-helper
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://github.com/scrosby/OSM-binary
 Vcs-Git: git://git.debian.org/pkg-osm/osmpbf.git
 Vcs-Browser: http://git.debian.org/?p=pkg-osm/osmpbf.git;a=summary

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 752da20f98a6e7d6abc7c2de85c08b7cfe274822
Author: David Paleino 
Date:   Mon Jan 28 19:57:19 2013 +0100

New upstream version.

diff --git a/debian/changelog b/debian/changelog
index a444f4b..a736395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-osmpbf (1.2.1-4) UNRELEASED; urgency=low
+osmpbf (1.3.0-1) UNRELEASED; urgency=low
 
+  [ Giovanni Mascellani ]
   * Remove myself from the uploaders list, since I have no time
 anymore to look after this package.
 
- -- Giovanni Mascellani   Tue, 28 Aug 2012 00:04:28 +0200
+  [ David Paleino ]
+  * New upstream version.
+
+ -- David Paleino   Mon, 28 Jan 2013 19:57:06 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit e5310f0bb1f031b4f66fd234d181b5a647afbef3
Merge: 8ff7da3c3566297c5da542881cbc907312fdc708 
2e955a6cb8a10f3e38cc8dd78a4a57dc030b33da
Author: David Paleino 
Date:   Mon Jan 28 19:56:36 2013 +0100

Merge tag 'upstream/1.3.0' into debian

Upstream version 1.3.0

# gpg: Signature made lun 28 gen 2013 19:56:35 CET using DSA key ID 1392B174
# gpg: Good signature from "David Paleino "
# gpg: aka "[jpeg image of size 6708]"
# gpg: aka "Hanska "
# gpg: aka "David Paleino "
# gpg: aka "David Paleino "


-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 35a98fcfd66f356d47444d27856521558a18bfd1
Author: David Paleino 
Date:   Mon Jan 28 19:58:21 2013 +0100

Re-wrap field

diff --git a/debian/control b/debian/control
index aa3a30c..ebc83d7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,12 @@ Priority: extra
 Maintainer: Debian OpenStreetMap Team 
 Uploaders:
  David Paleino 
-Build-Depends: debhelper (>= 9~), protobuf-compiler, libprotobuf-java, ant,
- default-jdk
+Build-Depends:
+ debhelper (>= 9~)
+ , protobuf-compiler
+ , libprotobuf-java
+ , ant
+ , default-jdk
  , libprotobuf-dev
  , maven-repo-helper
 Standards-Version: 3.9.3

-- 
Java library to access OpenStreetMap PDF file format

___
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

2013-01-28 Thread David Paleino

The following commit has been merged in the debian branch:
commit 021b621d7a60475290fa2755e8b06d03d10ee445
Author: David Paleino 
Date:   Mon Jan 28 19:57:47 2013 +0100

Bump debhelper compatibility to 9.

diff --git a/debian/changelog b/debian/changelog
index a736395..9445989 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ osmpbf (1.3.0-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New upstream version.
+  * Bump debhelper compatibility to 9.
 
- -- David Paleino   Mon, 28 Jan 2013 19:57:06 +0100
+ -- David Paleino   Mon, 28 Jan 2013 19:57:37 +0100
 
 osmpbf (1.2.1-3) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6c4a9dc..aa3a30c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian OpenStreetMap Team 
 Uploaders:
  David Paleino 
-Build-Depends: debhelper (>= 7.0.50~), protobuf-compiler, libprotobuf-java, 
ant,
+Build-Depends: debhelper (>= 9~), protobuf-compiler, libprotobuf-java, ant,
  default-jdk
  , libprotobuf-dev
  , maven-repo-helper

-- 
Java library to access OpenStreetMap PDF file format

___
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 annotated tag, debian/0.0.svn5608+dfsg1-2, created. debian/0.0.svn5608+dfsg1-2

2013-01-19 Thread David Paleino

The annotated tag, debian/0.0.svn5608+dfsg1-2 has been created
at  a940dbf49988607c11c76175771e9dde51ba7058 (tag)
   tagging  f38f6cd48927630b45cd17d30611c83a10228933 (commit)
  replaces  debian/0.0.svn5608+dfsg1-1
 tagged by  David Paleino
on  Sat Jan 19 15:27:55 2013 +0100

- Shortlog 
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEABECAAYFAlD6rWsACgkQ5qqQFxOSsXS58QCgytQspL3SK0kcMWC/tohy62OF
YccAmgJMQchyDQjQDnnFx6UnriK1H6fb
=Cvwc
-END PGP SIGNATURE-

David Paleino (3):
  Updated manpage (Closes: #696692).
  Updated debian/copyright.
  Releasing to sid

---

-- 
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.svn5608+dfsg1-1-3-gf38f6cd

2013-01-19 Thread David Paleino

The following commit has been merged in the master branch:
commit 5fd774732060b0f7ee8ada958ec8bfcf84242656
Author: David Paleino 
Date:   Sat Jan 19 14:52:21 2013 +0100

Updated debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 6bdd6f2..1314b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm (0.0.svn5608+dfsg1-2) UNRELEASED; urgency=low
 
   * Updated manpage (Closes: #696692).
+  * Updated debian/copyright.
 
- -- David Paleino   Thu, 27 Dec 2012 11:06:15 +0100
+ -- David Paleino   Sat, 19 Jan 2013 14:52:12 +0100
 
 josm (0.0.svn5608+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index e05ec5b..a50a10b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -98,6 +98,13 @@ Files: 
src/org/openstreetmap/josm/data/projection/Ellipsoid.java
 Copyright: © 2002, Johan Montagnat 
 License: GPL-3+
 
+Files: src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java
+ src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
+ src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
+ src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
+Copyright: © 2003, Objectix Pty Ltd.
+License: LGPL-2.1+
+
 Files: src/org/openstreetmap/josm/io/NmeaReader.java
 Copyright: © 2008, Christoph Brill
 License: GPL-3+
@@ -110,6 +117,10 @@ Files: src/org/openstreetmap/josm/data/osm/TigerUtils.java
 Copyright: © 2007, David Hansen
 License: GPL-3+
 
+Files: src/org/openstreetmap/josm/data/validation/util/Entities.java
+Copyright: ©, Apache Software Foundation
+License: Apache-2.0
+
 Files: src/org/openstreetmap/josm/gui/ScrollViewport.java
 Copyright: © 2007, Christian Gallioz
 License: GPL-3+
@@ -217,6 +228,15 @@ Copyright: © 2009, Rosetta Contributors and Canonical Ltd 
2009
  © 2009, Chao-Hsiung Liao 
 License: GPL-3+
 
+Files: i18n/convplugin.pl
+ i18n/convpreset.pl
+ i18n/convstyle.pl
+ i18n/convsurveyor.pl
+ i18n/convvalidator.pl
+ i18n/convwms.pl
+Copyright: Dirk Stöcker 
+License: PD
+
 License: BSD-3
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -276,3 +296,21 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General Public License
  can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.

-- 
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.svn5608+dfsg1-1-3-gf38f6cd

2013-01-19 Thread David Paleino

The following commit has been merged in the master branch:
commit f38f6cd48927630b45cd17d30611c83a10228933
Author: David Paleino 
Date:   Sat Jan 19 14:52:31 2013 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 1314b3f..793d9cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-josm (0.0.svn5608+dfsg1-2) UNRELEASED; urgency=low
+josm (0.0.svn5608+dfsg1-2) unstable; urgency=low
 
   * Updated manpage (Closes: #696692).
   * Updated debian/copyright.
 
- -- David Paleino   Sat, 19 Jan 2013 14:52:12 +0100
+ -- David Paleino   Sat, 19 Jan 2013 14:52:22 +0100
 
 josm (0.0.svn5608+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.svn5608+dfsg1-1-1-ge6dad03

2012-12-27 Thread David Paleino

The following commit has been merged in the master branch:
commit e6dad03b626f7c28d40d1a07ded31516fcfd9e24
Author: David Paleino 
Date:   Thu Dec 27 11:06:27 2012 +0100

Updated manpage (Closes: #696692).

diff --git a/debian/changelog b/debian/changelog
index 974ed7f..6bdd6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn5608+dfsg1-2) UNRELEASED; urgency=low
+
+  * Updated manpage (Closes: #696692).
+
+ -- David Paleino   Thu, 27 Dec 2012 11:06:15 +0100
+
 josm (0.0.svn5608+dfsg1-1) unstable; urgency=low
 
   * New tested snapshot (Closes: #695197).
diff --git a/debian/josm.1 b/debian/josm.1
index 580bcab..4a1a0b9 100644
--- a/debian/josm.1
+++ b/debian/josm.1
@@ -1,4 +1,4 @@
-.TH JOSM 1 "September  8, 2007"
+.TH JOSM 1 "December 26, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 josm \- Java OpenStreetMap Editor
@@ -6,60 +6,74 @@ josm \- Java OpenStreetMap Editor
 .B josm
 .SH DESCRIPTION
 .B josm 
-is an editor for OpenStreetMap written in Java 1.5. 
+is an extensible editor for OpenStreetMap written in Java 6.
 .PP
-.B OpenStreetMap 
-is a project aimed squarely at creating and providing free geographic data 
such as street maps to anyone
-who wants them. It allows you to view, edit and use geographical data in a 
collaborative way from 
-anywhere on earth.
-The project was started because most maps you think of as free actually have 
legal or technical 
-restrictions on their use, holding back people from using them in creative, 
productive or unexpected
-ways.
+\fBOpenStreetMap\fR is a project aimed squarely at creating and providing
+free geographic data such as street maps to anyone who wants them. It
+allows you to view, edit and use geographical data in a collaborative way
+from anywhere on Earth.
+.PP
+The project was started because most maps you think of as free actually
+have legal or technical restrictions on their use, holding back people
+from using them in creative, productive or unexpected ways.
 .SH OPTIONS
 .TP
 .B \-h, \-?, \-\-help
-Show help
+Show help.
+.TP
+.B \-\-version
+Display the JOSM version and exit.
+.TP
+\fB\-\-geometry=\fIwidth\fBx\fIheight\fB(+|-)x(+|-)y\fR
+Standard X geometry argument.
+.TP
+\fB[\-\-download=]\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,maxlon\fR
+Download the bounding box.
+.TP
+\fB[\-\-download=]\fIurl\fR
+Download the location at the url (with lat=x&lon=y&zoom=z).
 .TP
-.B \-\-geometry=x(+|-)x(+|-)y
-Standard X geometry argument
+\fB[\-\-download=]\fIfilename\fR
+Open a file (any filetype that can be opened with File/Open from the GUI).
 .TP
-.B [\-\-download=]minlat,minlon,maxlat,maxlon
-Download the bounding box
+\fB\-\-downloadgps=\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,\fImaxlon\fR
+Download the bounding box as raw GPS.
 .TP
-.B [\-\-download=]
-Download the location at the url (with lat=x&lon=y&zoom=z)
+\fB\-\-selection=\fIsearchstring\fR
+Select with the given search.
 .TP
-.B [\-\-download=]
-Open file (as raw gps, if .gpx)
+.B \-\-[no\-]maximize
+Launch in maximized (or minimized) mode.
 .TP
-.B \-\-downloadgps=minlat,minlon,maxlat,maxlon
-Download the bounding box as raw gps
+.B \-\-reset\-preferences
+Reset the preferences to the default.
 .TP
-.B \-\-selection=
-Select with the given search
+\fB\-\-load\-preferences=\fIurl\fR
+Load preferences from the given \fIurl\fR (in XML format).
 .TP
-.B \-\-no\-fullscreen
-Don't launch in fullscreen mode
+\fB\-\-set=\fIkey\fB=\fIvalue\fR
+Set the preference \fIkey\fR to \fIvalue\fR.
 .TP
-.B \-\-reset-preferences
-Reset the preferences to the default
+\fB\-\-language=\fIlanguage\fR
+Set the language.
+.SH JAVA PROPERTIES
+The following options can be set by using Java system properties (i.e. 
-Dkey=value
+passed to \fBjava\fR, or specified inside \fBJAVA_OPTS\fR).
 .TP
-.B \-\-language=
-Set the language
+\fBjosm.home=\fIpath\fR
+Set the JOSM home directory to \fIpath\fR. This will contain all user settings.
+Default is \fI~/.josm/\fR.
 .SH ENVIRONMENT
 .IP JAVA_HOME
 Specify an alternate Java environment.
 .IP JAVA_OPTS
 Specify Java options.
 For example, to use a HTTP proxy server with this program, set this 
environment variable
-to something like
-.I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"
-before starting josm.
-.SH SEE ALSO
-.BR josm-plugins (1).
+to something like \fIJAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"\fR before 
starting josm.
 .SH AUTHOR
 josm was written by Immanuel Scholz.
-The current maintainer is Frederik Ramm.
+The current maintainer is Dirk Stöcker.
 .PP
-This manual page was written by Andreas Putzo ,
-for the Debian project (but may be used by others).
+This manual page was written by Andreas Putzo  and David 
Paleino
+, and is licensed under the same terms of JOSM itself 
(currently,
+the GNU General Public License, version 3 or later).

-- 
Editor for OpenStreetMap

___
Pkg-osm

1 2 3 4 5 6 7 8 9 >

1 - 100 of 865 matches

Mail list logo