[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40
The following commit has been merged in the master branch:
commit a98da01b0913e78f662a23e96bff6d67fbd1a551
Author: David Paleino da...@debian.org
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.
!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 --
-@@ -22,10 +23,17 @@
+@@ -22,10 +23,16 @@
/condition
!-- Java classpath addition (all jar files to compile tests with this)
--
path id=classpath
@@ -34,14 +34,13 @@ JARs and not depend on Internet connection.
+ include name=signpost-core.jar/
+ include name=ant.jar/
+ include name=commons-codec.jar/
-+ include name=jmapviewer.jar/
/fileset
/path
+property name=classpathprop-colon refid=classpath/
!--
** Used by Eclipse ant builder for updating
-@@ -40,14 +48,7 @@
+@@ -40,14 +47,7 @@
--
target name=create-revision
property name=revision.dir value=${build.dir}/
@@ -57,7 +56,7 @@ JARs and not depend on Internet connection.
tstamp
format property=build.tstamp pattern=-MM-dd HH:mm:ss/
/tstamp
-@@ -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.
/echo
/target
target name=check-schemas
-@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp}
+@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
/schemavalidate
/target
target name=dist depends=compile,create-revision,check-schemas
@@ -80,7 +79,7 @@ JARs and not depend on Internet connection.
property name=version.entry.commit.revision value=UNKNOWN/
property name=version.entry.commit.date value=UNKNOWN/
echoRevision ${version.entry.commit.revision}/echo
-@@ -85,7 +80,8 @@ Build-Date: ${build.tstamp}
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
copy file=README todir=build/
copy file=LICENSE todir=build/
!-- create josm-custom.jar --
@@ -90,7 +89,7 @@ JARs and not depend on Internet connection.
jar destfile=dist/josm-custom.jar basedir=build
level=${clevel}
!-- add attribute excludes=**/*BZip2*,**/*Bzip2* to create a
non-bzip2 supporting jar --
manifest
-@@ -95,6 +91,8 @@ Build-Date: ${build.tstamp}
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
attribute name=Permissions value=all-permissions/
attribute name=Codebase value=josm.openstreetmap.de/
attribute name=Application-Name value=JOSM - Java
OpenStreetMap Editor/
@@ -99,7 +98,7 @@ JARs and not depend on Internet connection.
/manifest
zipfileset dir=images prefix=images/
zipfileset dir=data prefix=data/
-@@ -168,10 +166,7 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
/target
target name=javacc depends=init unless=javacc.notRequired
mkdir dir=${mapcss.dir}/parsergen/
@@ -111,7 +110,7 @@ JARs and not depend on Internet connection.
arg value=-JDK_VERSION=1.6/
arg value=-GRAMMAR_ENCODING=UTF-8/
arg value=-UNICODE_INPUT/
-@@ -180,11 +175,11 @@ Build-Date: ${build.tstamp}
+@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
/exec
/target
target name=compile depends=init,javacc
@@ -125,7 +124,7 @@ JARs and not depend on Internet connection.
/target
target name=init
uptodate property=javacc.notRequired
targetfile=${mapcss.dir}/parsergen/MapCSSParser.java
-@@ -192,6 +187,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
/uptodate
mkdir dir=build/
mkdir dir=dist/
@@ -133,7 +132,7 @@ JARs and not depend on Internet connection.
/target
target name=javadoc
javadoc destdir=javadoc
-@@ -211,6 +207,7 @@ Build-Date: ${build.tstamp}
+@@ -211,6 +206,7 @@ Build-Date: ${build.tstamp}
delete dir=build/
delete dir=dist
[Pkg-osm-commits] [SCM] josm branch, pristine-tar, updated. 688979b684e131da2f69559b487b18bd966ed7f7
The following commit has been merged in the pristine-tar branch: commit 688979b684e131da2f69559b487b18bd966ed7f7 Author: David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit 4d1a131e04f61a028b2fda67969992c063c3e3a4 Author: David Paleino da...@debian.org 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 da...@debian.org Wed, 05 Mar 2014 21:04:16 +0100 + -- David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit 4611d3e4356e743ab72ba1c2747b8306b9e6a2ee Author: David Paleino da...@debian.org 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 da...@debian.org Thu, 06 Mar 2014 00:23:37 +0100 + -- David Paleino da...@debian.org 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, pristine-tar, updated. 688979b684e131da2f69559b487b18bd966ed7f7
The following commit has been merged in the pristine-tar branch: commit 916980ad8dcbe9cffbb4becc938b01b31b38ed87 Author: David Paleino da...@debian.org 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 annotated tag, debian/0.0.svn6502+dfsg3-1, created. debian/0.0.svn6502+dfsg3-1
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 branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40
The following commit has been merged in the master branch: commit 90f22fc02bb0135e7b91e1f9a9ab2939092228d8 Author: David Paleino da...@debian.org 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 da...@debian.org 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 branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40
The following commit has been merged in the master branch:
commit b3994c0465aa8e63b5e9c55498177e538a1d5c32
Author: David Paleino da...@debian.org
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 da...@debian.org Wed, 05 Mar 2014 20:43:19 +0100
+ -- David Paleino da...@debian.org 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}
!-- add attribute excludes=**/*BZip2*,**/*Bzip2* to create a
non-bzip2 supporting jar --
manifest
attribute name=Main-class value=JOSM/
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}
attribute name=Debian-Release value=${debian.version}/
attribute name=Class-Path value=${classpathprop}/
/manifest
--
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
The following commit has been merged in the master branch:
commit 8934bd580343c4880f60cae5283b281c22b6bb83
Author: David Paleino da...@debian.org
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 da...@debian.org Wed, 05 Mar 2014 20:42:35 +0100
+ -- David Paleino da...@debian.org 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 ar...@urbanophile.com
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.
!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 --
-@@ -22,10 +23,16 @@
+@@ -22,10 +23,17 @@
/condition
!-- Java classpath addition (all jar files to compile tests with this)
--
path id=classpath
@@ -34,13 +34,14 @@ JARs and not depend on Internet connection.
+ include name=signpost-core.jar/
+ include name=ant.jar/
+ include name=commons-codec.jar/
++ include name=jmapviewer.jar/
/fileset
/path
+property name=classpathprop-colon refid=classpath/
!--
** Used by Eclipse ant builder for updating
-@@ -40,14 +47,7 @@
+@@ -40,14 +48,7 @@
--
target name=create-revision
property name=revision.dir value=${build.dir}/
@@ -56,7 +57,7 @@ JARs and not depend on Internet connection.
tstamp
format property=build.tstamp pattern=-MM-dd HH:mm:ss/
/tstamp
-@@ -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.
/echo
/target
target name=check-schemas
-@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp}
/schemavalidate
/target
target name=dist depends=compile,create-revision,check-schemas
@@ -79,7 +80,7 @@ JARs and not depend on Internet connection.
property name=version.entry.commit.revision value=UNKNOWN/
property name=version.entry.commit.date value=UNKNOWN
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn6502+dfsg1-1-21-g413ac40
The following commit has been merged in the master branch: commit 4adbc01298bae49321bfb3f33cdf2df31ee63a3b Author: David Paleino da...@debian.org 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 da...@debian.org Wed, 05 Mar 2014 21:03:52 +0100 + -- David Paleino da...@debian.org 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.svn6115+dfsg1-1-4-g615b235
The following commit has been merged in the master branch:
commit 615b2351e3fdd52e13ca76fe4e412347c26a2505
Author: David Paleino da...@debian.org
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 da...@debian.org Fri, 20 Dec 2013 22:58:34 +0100
+ -- David Paleino da...@debian.org 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 @@
property name=build.dir location=build/
property name=javacc.home location=tools/
property name=mapcss.dir
location=${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss/
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 --
-@@ -23,10 +24,16 @@
+@@ -22,10 +23,16 @@
/condition
!-- Java classpath addition (all jar files to compile tests with this)
--
path id=classpath
@@ -39,9 +39,9 @@ JARs and not depend on Internet connection.
+property name=classpathprop-colon refid=classpath/
!--
- ** Used by Eclipse ant builder for updating
-@@ -41,14 +48,7 @@
- --
+ ** Used by Eclipse ant builder for updating
+@@ -40,14 +47,7 @@
+ --
target name=create-revision
property name=revision.dir value=${build.dir}/
-exec append=false output=REVISION.XML executable=svn
failifexecutionfails=false
@@ -56,14 +56,18 @@ JARs and not depend on Internet connection.
tstamp
format property=build.tstamp pattern=-MM-dd HH:mm:ss/
/tstamp
-@@ -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}
/echo
/target
- target name=dist depends=compile,create-revision
+ target name=check-schemas
+@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+ /schemavalidate
+ /target
+ target name=dist depends=compile,create-revision,check-schemas
-exec append=false output=REVISION executable=svn
failifexecutionfails=false
-env key=LANG value=C/
-arg value=info/
@@ -75,10 +79,9 @@ JARs and not depend on Internet connection.
property name=version.entry.commit.revision value=UNKNOWN/
property name=version.entry.commit.date value=UNKNOWN/
echoRevision ${version.entry.commit.revision}/echo
- copy file=CONTRIBUTION todir=build/
+@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
copy file=README todir=build/
copy file=LICENSE todir=build/
-+
!-- create josm-custom.jar --
-delete file=dist/josm-custom.jar/
+propertyregex property=classpathprop
input=${classpathprop-colon} global=true
@@ -86,15 +89,16 @@ JARs and not depend on Internet connection.
jar destfile=dist/josm-custom.jar basedir=build
level=${clevel}
!-- add attribute excludes=**/*BZip2*,**/*Bzip2* to create a
non-bzip2 supporting jar --
manifest
- attribute name=Main-class value=JOSM/
- attribute name=Main-Version
value=${version.entry.commit.revision} SVN/
- attribute name=Main-Date
value=${version.entry.commit.date}/
-+ attribute name=Debian-Release
value=${debian.version}/
-+ attribute name=Class-Path
value=${classpathprop}/
+@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+ attribute name=Permissions value=all-permissions/
+ attribute name=Codebase value=josm.openstreetmap.de/
+ attribute name=Application-Name value=JOSM - Java
OpenStreetMap Editor/
++attribute name=Debian-Release value=${debian.version}/
++attribute name=Class-Path value=${classpathprop}/
/manifest
[Pkg-osm-commits] [SCM] josm annotated tag, upstream/0.0.svn6502+dfsg1, created. upstream/0.0.svn6502+dfsg1
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] josm branch, pristine-tar, updated. 2a5880a710524e03ab08608861003b69aa0ca03c
The following commit has been merged in the pristine-tar branch: commit 2a5880a710524e03ab08608861003b69aa0ca03c Merge: cb09ea08884e0470a05766d845ff1fdf2c491599 0d8e33be13d6000c92fe9af1ede255ec192af1b6 Author: David Paleino da...@debian.org 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, pristine-tar, updated. 2a5880a710524e03ab08608861003b69aa0ca03c
The following commit has been merged in the pristine-tar branch: commit cb09ea08884e0470a05766d845ff1fdf2c491599 Author: David Paleino da...@debian.org 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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c
The following commit has been merged in the master branch: commit 13029d943fd0d0eb2df351a5884645b040f2dd34 Author: David Paleino da...@debian.org 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 da...@debian.org 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
The following commit has been merged in the master branch:
commit 5ec457369e9f7d46bab1be1289bc329be2b8272b
Author: David Paleino da...@debian.org
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 da...@debian.org Sun, 15 Dec 2013 00:05:06 +0100
+ -- David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit 3536bba4b7b8edc7d3a73f738b890665f7bac867 Author: David Paleino da...@debian.org 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 da...@debian.org Sun, 15 Dec 2013 00:06:33 +0100 + -- David Paleino da...@debian.org 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 da...@debian.org +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] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c
The following commit has been merged in the master branch: commit 711e17ded7696a8a77755e1535fcb822452356a9 Author: David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit 7e2991c36df020b5eef3988d67b6b209cae412b5 Author: David Paleino da...@debian.org 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 da...@debian.org Sun, 15 Dec 2013 00:13:03 +0100 + -- David Paleino da...@debian.org 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 marcus.ba...@gmail.com License: GPL-2 Files: debian/* -Copyright: © 2009-2012, David Paleino da...@debian.org +Copyright: © 2009-2013, David Paleino da...@debian.org License: GPL-2 -Files: python/mapviewer.py +Files: examples/mapviewer.py Copyright: © 2008, Hadley Rich h...@nice.net.nz License: GPL-2 -Files: python/osmgpsmapmodule.c -Copyright: © 2008, John Stowers john.stow...@gmail.com +Files: src/* +Copyright: © 2008-2013, John Stowers john.stow...@gmail.com 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 marcus.ba...@gmail.com - © 2008, John Stowers john.stow...@gmail.com + © 2008-2013, John Stowers john.stow...@gmail.com 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 marcus.ba...@gmail.com - © 2009, John Stowers john.stow...@gmail.com © 2009, Everaldo Canuto everaldo.can...@gmail.com + © 2013, John Stowers john.stow...@gmail.com 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 john.stow...@gmail.com +Files: src/osm-gps-map-layer.h + src/osm-gps-map-widget.c +Copyright: © 2008, Marcus Bauer marcus.ba...@gmail.com + © 2009, Till Harbaum t...@harbaum.org + © 2009, Everaldo Canuto everaldo.can...@gmail.com + © 2008-2013, John Stowers john.stow...@gmail.com +License: GPL-2 + +Files: src/osm-gps-map-widget.h +Copyright: © 2008, Marcus Bauer marcus.ba...@gmail.com + © 2009, Till Harbaum t...@harbaum.org + © 2008-2013, John Stowers john.stow...@gmail.com 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
The following commit has been merged in the master branch: commit 20a4817de9125d87779c696561e9909d15f83fb0 Author: David Paleino da...@debian.org 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 da...@debian.org Sat, 14 Dec 2013 23:43:51 +0100 + -- David Paleino da...@debian.org 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
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
The following commit has been merged in the master branch: commit f2f0e0c7099a835909121e357bc81275876ec504 Author: David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit f8f3423925d71a0ffe248064ec1905c92bd5423d Author: David Paleino da...@debian.org 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, pristine-tar, updated. d2530b495db565792018c16d1f480c6e608cbff9
The following commit has been merged in the pristine-tar branch: commit d2530b495db565792018c16d1f480c6e608cbff9 Author: David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit 1884e318e0b4c520e5c6ae94f9fe89c584322f0e Author: David Paleino da...@debian.org 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
The following commit has been merged in the master branch:
commit 85aa2250e8b4c100fe168971b22fa07e45de67a4
Author: David Paleino da...@debian.org
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] imposm annotated tag, debian/2.5.0-2, created. debian/2.5.0-2
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] imposm branch, master, updated. debian/2.5.0-1-3-g04d7cb6
The following commit has been merged in the master branch: commit 2033ed5153da5eca9b26d95b67f3ddb6070ebbed Author: David Paleino da...@debian.org 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 da...@debian.org 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 branch, master, updated. debian/2.5.0-1-3-g04d7cb6
The following commit has been merged in the master branch: commit 04d7cb6222d085c9106a24989d9f2f1195e4b3a8 Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 04 Nov 2013 17:22:22 +0100 + -- David Paleino da...@debian.org 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
The following commit has been merged in the master branch: commit af85a1d27202db87a0005a305e5cf257dee747a9 Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 04 Nov 2013 17:21:44 +0100 + -- David Paleino da...@debian.org 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-2-2-gb0bfeec
The following commit has been merged in the master branch: commit 1f4d8d89e7bdf6f310b8f453d90ba5b43f6a8f6a Author: David Paleino da...@debian.org 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 da...@debian.org 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-parser annotated tag, debian/1.0.5-1, created. debian/1.0.5-1
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 branch, master, updated. debian/1.0.5-1-1-gfa3d6eb
The following commit has been merged in the master branch: commit fa3d6eb084153aa5c99fc6ebbe852fb915260491 Author: David Paleino da...@debian.org 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 da...@debian.org 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 o...@omniscale.de 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 da...@debian.org +Copyright: © 2011-2013, David Paleino da...@debian.org 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] josm-plugins branch, master, updated. debian/0.0.svn29007+ds1-1-5-g5063209
The following commit has been merged in the master branch: commit 9fe40dac40b35c122a882bb03c0539e1b3265921 Merge: 78b536c6513575a410fb54aa2f0b0f0fce835525 4dbbdb0d17432d0045b17f73062dd13df0d36eab Author: David Paleino da...@debian.org 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 d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- 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
The following commit has been merged in the pristine-tar branch: commit 62b7d64bd624c330f426fbaea7dc3c0e3d68816d Author: David Paleino da...@debian.org 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 annotated tag, upstream/0.0.svn29348+ds1, created. upstream/0.0.svn29348+ds1
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 branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch: commit 57ec0d937319fbebccbaea43727266092d5e9f3d Merge: f38f6cd48927630b45cd17d30611c83a10228933 d934031ef1f16c85b77277ed4ac539601e388903 Author: David Paleino da...@debian.org 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 d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-2-7-g38ae847
The following commit has been merged in the master branch: commit f67e9e5eadc07ac8991a86ab4a5a5e5e4d12c345 Author: David Paleino da...@debian.org 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 da...@debian.org 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
The following commit has been merged in the master branch:
commit a824e7547aa5c4a9438331fe2cfa3e3d58f678f4
Author: David Paleino da...@debian.org
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
!-- zipfileset src=lib/metadata-extractor-2.3.1-nosun.jar/
--
--- 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
ListPresetListEntry listEntries = new LinkedListPresetListEntry();
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
The following commit has been merged in the master branch: commit 38ae847a7ca70bd7db2aecb8c2cac5bb00ddf84c Author: David Paleino da...@debian.org 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 da...@debian.org 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 annotated tag, upstream/0.0.svn5759+dfsg1, created. upstream/0.0.svn5759+dfsg1
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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0
The following commit has been merged in the debian branch: commit 021b621d7a60475290fa2755e8b06d03d10ee445 Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 28 Jan 2013 19:57:06 +0100 + -- David Paleino da...@debian.org 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 pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org -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] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0
The following commit has been merged in the debian branch: commit 35a98fcfd66f356d47444d27856521558a18bfd1 Author: David Paleino da...@debian.org 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 pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org -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
The following commit has been merged in the debian branch: commit 752da20f98a6e7d6abc7c2de85c08b7cfe274822 Author: David Paleino da...@debian.org 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 g...@debian.org Tue, 28 Aug 2012 00:04:28 +0200 + [ David Paleino ] + * New upstream version. + + -- David Paleino da...@debian.org 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
The following commit has been merged in the debian branch: commit 315ff8abc6c391da0b75a8f7bb55c836d1cf8108 Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 28 Jan 2013 19:58:34 +0100 + -- David Paleino da...@debian.org 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
The following commit has been merged in the debian branch: commit 16981811547d4fbb77a78faee6f55de9d2644d15 Author: David Paleino da...@debian.org 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 g...@debian.org +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
The following commit has been merged in the debian branch: commit c4c3fd000b44cd8a109fdf7dffd57925ec387d5a Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 28 Jan 2013 20:32:24 +0100 + -- David Paleino da...@debian.org 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
The following commit has been merged in the debian branch: commit 12829ec2e0bfa8e02dde8188b3efc51f0ff0aff1 Author: David Paleino da...@debian.org 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
The following commit has been merged in the debian branch: commit 3ec6edac32ad797563ae95a305f55e89af540be5 Author: David Paleino da...@debian.org 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 da...@debian.org Mon, 28 Jan 2013 19:59:42 +0100 + -- David Paleino da...@debian.org 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 sc...@sacrosby.com Files: * Copyright: © 2010, Scott A. Crosby sc...@sacrosby.com 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 g...@debian.org + © 2011-2013, David Paleino da...@debian.org 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] josm branch, master, updated. debian/0.0.svn5608+dfsg1-1-3-gf38f6cd
The following commit has been merged in the master branch: commit f38f6cd48927630b45cd17d30611c83a10228933 Author: David Paleino da...@debian.org 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 da...@debian.org Sat, 19 Jan 2013 14:52:12 +0100 + -- David Paleino da...@debian.org 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-3-gf38f6cd
The following commit has been merged in the master branch: commit 5fd774732060b0f7ee8ada958ec8bfcf84242656 Author: David Paleino da...@debian.org 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 da...@debian.org Thu, 27 Dec 2012 11:06:15 +0100 + -- David Paleino da...@debian.org 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 jo...@creatis.insa-lyon.fr 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 j_h_l...@yahoo.com.tw 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 openstreet...@dstoecker.de +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 annotated tag, debian/0.0.svn5608+dfsg1-2, created. debian/0.0.svn5608+dfsg1-2
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.svn5576+dfsg1-1-14-g6ff6036
The following commit has been merged in the master branch:
commit 2a1def7a69795a9d8670dfb387da49acf33fbe5c
Author: David Paleino da...@debian.org
Date: Thu Dec 20 22:45:21 2012 +0100
Move useful shareable data out of the jar.
diff --git a/debian/changelog b/debian/changelog
index 6112851..f11b5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
(Closes: #690585)
* Fixed patch to load images from the openstreetmap-map-icons
package (Closes: #693486).
+ * Move useful shareable data out of the jar.
- -- David Paleino da...@debian.org Thu, 20 Dec 2012 19:39:56 +0100
+ -- David Paleino da...@debian.org Thu, 20 Dec 2012 22:44:42 +0100
josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
diff --git a/debian/install b/debian/install
new file mode 100644
index 000..a0eeae2
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+images//usr/share/josm/
+styles//usr/share/josm/
+data/ /usr/share/josm/
diff --git a/debian/patches/06-move_data_out_of_jar.patch
b/debian/patches/06-move_data_out_of_jar.patch
new file mode 100644
index 000..fb4a758
--- /dev/null
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -0,0 +1,132 @@
+From: David Paleino da...@debian.org
+Subject: move sharable data out of josm.jar
+Origin: vendor
+Forwarded: not-needed
+
+---
+ 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 +-
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+--- josm.orig/build.xml
josm/build.xml
+@@ -84,9 +84,9 @@ Debian-Release: ${debian.version}
+ attribute name=Debian-Release
value=${debian.version}/
+ attribute name=Class-Path
value=${classpathprop}/
+ /manifest
+-zipfileset dir=images prefix=images/
+-zipfileset dir=data prefix=data/
+-zipfileset dir=styles prefix=styles/
++!-- zipfileset dir=images prefix=images/ --
++!-- zipfileset dir=data prefix=data/ --
++!-- zipfileset dir=styles prefix=styles/ --
+ zipfileset dir=src/org/openstreetmap/gui/jmapviewer/images
prefix=org/openstreetmap/gui/jmapviewer/images/
+ !-- All jar files necessary to run only JOSM (no tests) --
+ !-- zipfileset src=lib/metadata-extractor-2.3.1-nosun.jar/
--
+--- josm.orig/src/org/openstreetmap/josm/data/Preferences.java
josm/src/org/openstreetmap/josm/data/Preferences.java
+@@ -1511,7 +1511,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
+@@ -121,7 +121,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 CollectionExtendedSourceEntry getDefault() {
+-ExtendedSourceEntry i = new
ExtendedSourceEntry(defaultpresets.xml, resource://data/defaultpresets.xml);
++ExtendedSourceEntry i = new
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-14-g6ff6036
The following commit has been merged in the master branch: commit d5c1c58a809badf732ba00f9010eb5715e6325e2 Author: David Paleino da...@debian.org Date: Fri Dec 21 00:00:24 2012 +0100 Remove x bit diff --git a/debian/rules b/debian/rules index beee4cc..a0ffb48 100755 --- a/debian/rules +++ b/debian/rules @@ -42,6 +42,8 @@ override_dh_install: dh_install # remove *.lang files, since we ship them in josm-l10n rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang + # remove executable bit + chmod a-x $(CURDIR)/debian/josm/usr/share/josm/data/defaultpresets.xml get-orig-source: dh_testdir -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-14-g6ff6036
The following commit has been merged in the master branch: commit 37365ccefb6452c8e168276061ee430cf60ffb08 Author: David Paleino da...@debian.org Date: Thu Dec 20 23:57:51 2012 +0100 Fix Vcs-* fields. diff --git a/debian/changelog b/debian/changelog index c2ca224..8c944b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low package (Closes: #693486). * Move useful shareable data out of the jar. * Split translations to josm-l10n package (Closes: #647744). + * Fix Vcs-* fields. - -- David Paleino da...@debian.org Thu, 20 Dec 2012 22:54:05 +0100 + -- David Paleino da...@debian.org Thu, 20 Dec 2012 23:57:45 +0100 josm (0.0.svn5576+dfsg1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index f92cba6..434c2a5 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ Build-Depends: , libterm-readkey-perl Standards-Version: 3.9.4 Homepage: http://josm.openstreetmap.de -Vcs-Git: git://git.debian.org/pkg-osm/josm.git -Vcs-Browser: http://git.debian.org/?p=pkg-osm/josm.git +Vcs-Git: git://anonscm.debian.org/pkg-osm/josm.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/josm.git Package: josm Architecture: all -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-14-g6ff6036
The following commit has been merged in the master branch:
commit 2995c3a3676b189873cf114ee90602c7fd98a7f3
Author: David Paleino da...@debian.org
Date: Thu Dec 20 22:54:35 2012 +0100
Split translations to josm-l10n package (Closes: #647744).
diff --git a/debian/changelog b/debian/changelog
index f11b5dd..c2ca224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low
* Fixed patch to load images from the openstreetmap-map-icons
package (Closes: #693486).
* Move useful shareable data out of the jar.
+ * Split translations to josm-l10n package (Closes: #647744).
- -- David Paleino da...@debian.org Thu, 20 Dec 2012 22:44:42 +0100
+ -- David Paleino da...@debian.org Thu, 20 Dec 2012 22:54:05 +0100
josm (0.0.svn5576+dfsg1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1bf389b..f92cba6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends:
, ant
, ${misc:Depends}
Recommends: josm-plugins
+ , josm-l10n
, webkit-image-gtk | webkit-image-qt
Description: Editor for OpenStreetMap
JOSM is an editor for OpenStreetMap (OSM) written in Java.
@@ -49,3 +50,21 @@ Description: Editor for OpenStreetMap
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.
+
+Package: josm-l10n
+Architecture: all
+Depends:
+ ${misc:Depends}
+Description: Editor for OpenStreetMap - translation files
+ JOSM is an editor for OpenStreetMap (OSM) written in Java.
+ The current version supports stand alone GPX tracks, GPX track data
+ from OSM database and existing nodes, line segments and metadata tags
+ from the OSM database.
+ .
+ OpenStreetMap is a project aimed squarely at creating and providing
+ free geographic data such as street maps to anyone who wants them.
+ 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.
+ .
+ This package contains the translation files for JOSM.
diff --git a/debian/josm-l10n.install b/debian/josm-l10n.install
new file mode 100644
index 000..7661663
--- /dev/null
+++ b/debian/josm-l10n.install
@@ -0,0 +1 @@
+data/*.lang/usr/share/josm/data/
diff --git a/debian/install b/debian/josm.install
similarity index 100%
rename from debian/install
rename to debian/josm.install
diff --git a/debian/manpages b/debian/josm.manpages
similarity index 100%
rename from debian/manpages
rename to debian/josm.manpages
diff --git a/debian/patches/06-move_data_out_of_jar.patch
b/debian/patches/06-move_data_out_of_jar.patch
index fb4a758..7489cf7 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -13,7 +13,8 @@ Forwarded: not-needed
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 +-
- 9 files changed, 15 insertions(+), 15 deletions(-)
+ src/org/openstreetmap/josm/tools/I18n.java
|7 ++-
+ 10 files changed, 21 insertions(+), 16 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -130,3 +131,26 @@ Forwarded: not-needed
} else {
parser.start(in);
}
+--- josm.orig/src/org/openstreetmap/josm/tools/I18n.java
josm/src/org/openstreetmap/josm/tools/I18n.java
+@@ -7,6 +7,7 @@ import java.io.FileInputStream;
+ import java.io.InputStream;
+ import java.io.IOException;
+ import java.net.URL;
++import java.net.MalformedURLException;
+ import java.text.MessageFormat;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+@@ -308,7 +309,11 @@ public class I18n {
+ }
+
+ private static URL getTranslationFile(String lang) {
+-return Main.class.getResource(/data/+lang+.lang);
++try {
++return new URL(file:///usr/share/josm/data/+lang+.lang);
++} catch (MalformedURLException ex) {
++return null;
++}
+ }
+
+ /**
diff --git a/debian/rules b/debian/rules
index 8666768..beee4cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,10 @@ override_dh_auto_install:
install -m 644 $(CURDIR)/images/logo.png
$(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
install -m 644 $(CURDIR)/debian/josm.desktop
$(CURDIR)/debian/josm/usr/share/applications/josm.desktop
+override_dh_install:
+ dh_install
+ # remove *.lang files, since we ship them in josm-l10n
+ rm -rf $(CURDIR)/debian/josm/usr/share/josm/data/*.lang
get-orig-source:
dh_testdir
--
Editor for OpenStreetMap
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-14-g6ff6036
The following commit has been merged in the master branch: commit 6ff60364cdb78c93e4aabbe0497dd5cc23e91141 Author: David Paleino da...@debian.org Date: Fri Dec 21 00:00:36 2012 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 8c944b6..974ed7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low +josm (0.0.svn5608+dfsg1-1) unstable; urgency=low * New tested snapshot (Closes: #695197). * Update josm.desktop to make it work also in Unity @@ -9,7 +9,7 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low * Split translations to josm-l10n package (Closes: #647744). * Fix Vcs-* fields. - -- David Paleino da...@debian.org Thu, 20 Dec 2012 23:57:45 +0100 + -- David Paleino da...@debian.org Fri, 21 Dec 2012 00:00:28 +0100 josm (0.0.svn5576+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 annotated tag, debian/0.0.svn5608+dfsg1-1, created. debian/0.0.svn5608+dfsg1-1
The annotated tag, debian/0.0.svn5608+dfsg1-1 has been created at 6cd6ec5af2ec57ef642a110dfeae215342a739a6 (tag) tagging 6ff60364cdb78c93e4aabbe0497dd5cc23e91141 (commit) replaces debian/0.0.svn5576+dfsg1-1 tagged by David Paleino on Fri Dec 21 00:17:55 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDTnKMACgkQ5qqQFxOSsXRDNgCgqNhlAsJPUHgEdubywcPNrP7s Qq0An2ueTud+/bXSpeb6fQcMxHlwTc5e =d/0Z -END PGP SIGNATURE- David Paleino (14): Imported Upstream version 0.0.svn5608+dfsg1 Merge tag 'upstream/0.0.svn5608+dfsg1' New tested snapshot. Patches refreshed Update josm.desktop to make it work also in Unity (Closes: #690585) Added bug number Refreshed patch Cleanup files Fixed patch to load images from the openstreetmap-map-icons package (Closes: #693486). Move useful shareable data out of the jar. Split translations to josm-l10n package (Closes: #647744). Fix Vcs-* fields. Remove x bit 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.svn5608+dfsg1, created. upstream/0.0.svn5608+dfsg1
The annotated tag, upstream/0.0.svn5608+dfsg1 has been created at a4ed37d12126dac6a93aea875538b6d948fbf383 (tag) tagging 6dbe40bcfe7d968cf1d2077701ffefeb28d233ea (commit) replaces upstream/0.0.svn5576+dfsg1 tagged by David Paleino on Wed Dec 19 22:24:01 2012 +0100 - Shortlog Upstream version 0.0.svn5608+dfsg1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDSMHEACgkQ5qqQFxOSsXQHEgCbBfcFNlZiCGzoKqTywSTTdvQ+ b3sAoMKn8YMy7wDOC4SBEz00+cU0bbbW =/tJt -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn5608+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-plugins branch, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 96a42f6d96427b3ab03323699e6beed667655250 Merge: b0692afa6df81fddb95e728657ef2e68df0cb668 c622d1af71089618675f03745c5f924679298aa0 Author: David Paleino da...@debian.org Date: Tue Nov 13 20:07:17 2012 +0100 Merge tag 'upstream/0.0.svn28937+ds1' Upstream version 0.0.svn28937+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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit cc01e0a143c486d7223df8aa90d32f37b968b66d Author: David Paleino da...@debian.org Date: Tue Nov 13 20:11:42 2012 +0100 New upstream snapshot. * New upstream snapshot. * New repacked tarball: removed livegps plugin, which had files under the problematic JSON license. Also removed surveyor plugin, which depends on it. (Closes: #692620) diff --git a/debian/changelog b/debian/changelog index 7dfe99c..b5991a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -josm-plugins (0.0.svn28784+ds1-2) UNRELEASED; urgency=low +josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low - * Disabled livegps and surveyour plugin. + * New upstream snapshot. + * New repacked tarball: removed livegps plugin, which had files +under the problematic JSON license. Also removed surveyor plugin, +which depends on it. (Closes: #692620) - -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:05:30 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:08:56 +0100 josm-plugins (0.0.svn28784+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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch:
commit b0692afa6df81fddb95e728657ef2e68df0cb668
Author: David Paleino da...@debian.org
Date: Tue Nov 13 20:05:50 2012 +0100
Disabled livegps and surveyour plugin.
diff --git a/debian/changelog b/debian/changelog
index 60f714d..7dfe99c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm-plugins (0.0.svn28784+ds1-2) UNRELEASED; urgency=low
+
+ * Disabled livegps and surveyour plugin.
+
+ -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:05:30 +0100
+
josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low
[ Giovanni Mascellani ]
diff --git a/debian/master.xml b/debian/master.xml
index 2ada87c..f99d2a5 100644
--- a/debian/master.xml
+++ b/debian/master.xml
@@ -47,10 +47,6 @@
/antcall
antcall target=do_plugin
- param name=plugin.name value=livegps/
- /antcall
-
- antcall target=do_plugin
param name=plugin.name value=measurement/
/antcall
@@ -62,11 +58,6 @@
param name=plugin.name value=routing/
/antcall
-!-- surveyor must be compiled _after_ livegps --
- antcall target=do_plugin
- param name=plugin.name value=surveyor/
- /antcall
-
/target
target name=clean
@@ -75,11 +66,9 @@
ant dir=../DirectUpload antfile=build.xml target=clean/
ant dir=../editgpxantfile=build.xml target=clean/
ant dir=../lakewalker antfile=build.xml target=clean/
-ant dir=../livegpsantfile=build.xml target=clean/
ant dir=../measurementantfile=build.xml target=clean/
ant dir=../openvisibleantfile=build.xml target=clean/
ant dir=../routingantfile=build.xml target=clean/
-ant dir=../surveyor antfile=build.xml target=clean/
delete dir=../tmp/
delete dir=${plugin.dist.dir}/
/target
diff --git a/debian/rules b/debian/rules
index 18a7b44..4939dae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
export
CLASSPATH=/usr/share/josm/josm.jar:/usr/share/java/metadata-extractor.jar
SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
-PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker livegps
measurement openvisible routing surveyor
+PLUGINS := cadastre-fr colorscheme DirectUpload editgpx lakewalker measurement
openvisible routing
DATE := $(shell date +%Y%m%d)
ifdef SVNREV
--
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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 9d76832bf4ae5e6f1961d4ae59bc401a1471b6f9 Author: David Paleino da...@debian.org Date: Tue Nov 13 22:52:20 2012 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 2ce1a8d..17734eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn28937+ds1-1) unstable; urgency=low * New upstream snapshot. * New repacked tarball: removed livegps plugin, which had files @@ -10,7 +10,7 @@ josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low - bump JOSM dependency to = 5576 * Removed Andreas Putzo from Uploaders. - -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:51:39 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 22:52:14 +0100 josm-plugins (0.0.svn28784+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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 236014ec74f996d30006e08cc3b270b70b082d0a Author: David Paleino da...@debian.org Date: Tue Nov 13 20:12:02 2012 +0100 Updated debian/copyright. diff --git a/debian/changelog b/debian/changelog index b5991a6..f40c42a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low * New repacked tarball: removed livegps plugin, which had files under the problematic JSON license. Also removed surveyor plugin, which depends on it. (Closes: #692620) + * Updated debian/copyright. - -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:08:56 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:11:54 +0100 josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 5dff699..574b277 100644 --- a/debian/copyright +++ b/debian/copyright @@ -28,12 +28,6 @@ Copyright: © 2000-2007, Rodney Kinney © 2000-2007, Brent Easton License: LGPL-2.1+ -Files: livegps/* -Copyright: © 2007-2008, Frederik Ramm frede...@remote.org - © 2007-2008, Christof Dallermassl cdaller...@gmx.at -License: PD - The livegps plugin was put in the public domain by its authors. - Files: measurement/* Copyright: © 2007-2008, Raphael Mack o...@raphael-mack.de License: GPL-3+ @@ -46,14 +40,6 @@ Files: routing/* Copyright: © 2008, Innovant License: GPL-2+ -Files: surveyor/* -Copyright: © 2008-2009, Christof Dallermassl cdaller...@gmx.at -License: GPL-3+ - -Files: surveyor/src/org/dinopolis/util/io/Tokenizer.java -Copyright: © 2008-2009, Christof Dallermassl cdaller...@gmx.at -License: LGPL-2.1+ - License: GPL-1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 81e2d688312c1d15652671f3bcd4b15327e1cd7a Author: David Paleino da...@debian.org Date: Tue Nov 13 20:15:10 2012 +0100 Updated debian/control: included plugins in long description; version of JOSM in Breaks (= 5577) diff --git a/debian/changelog b/debian/changelog index f40c42a..4e20ae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,11 @@ josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low under the problematic JSON license. Also removed surveyor plugin, which depends on it. (Closes: #692620) * Updated debian/copyright. + * Updated debian/control: +- included plugins in long description +- version of JOSM in Breaks (= 5577) - -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:11:54 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:14:15 +0100 josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 90907c9..a528bbc 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: , libjgrapht0.8-java , libgettext-ant-tasks-java , python -Build-Conflicts: josm (= 0.0.svn5532) +Build-Conflicts: josm (= 0.0.svn5577) Standards-Version: 3.9.4 Homepage: http://josm.openstreetmap.de/wiki/Plugins Vcs-Git: git://git.debian.org/pkg-osm/josm-plugins.git @@ -31,19 +31,17 @@ Depends: , libmetadata-extractor-java , liblog4j1.2-java , libjgrapht0.8-java -Breaks: josm (= 0.0.svn5532) +Breaks: josm (= 0.0.svn5577) Suggests: gpsd Description: Plugins for JOSM JOSM (Java OpenStreetMap) plugin collection. . This package contains the following plugins: * colorscheme- Allows creating different color schemes. - * livegps- Supports live GPS input together with gpsd. * measurement- Adds a dialog and a layer to measure length and angle of segments and create measurement paths. * openvisible- Allows opening gpx and osm files that intersect the currently visible screen area. - * surveyor - Allows adding markers/nodes on current gps positions. * cadastre-fr- A special handler for the French land registry WMS server. * DirectUpload - Directly uploads GPS Traces from current active -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 72f8b20b5c40fd24b9128acab399d95453ad36eb Merge: 9d76832bf4ae5e6f1961d4ae59bc401a1471b6f9 7c2ab8fb714c1a598c4ff7d7b61d95da49841b57 Author: David Paleino da...@debian.org Date: Thu Dec 20 23:23:14 2012 +0100 Merge tag 'upstream/0.0.svn29007+ds1' Upstream version 0.0.svn29007+ds1 # gpg: Signature made gio 20 dic 2012 23:23:11 CET using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 78b536c6513575a410fb54aa2f0b0f0fce835525 Author: David Paleino da...@debian.org Date: Fri Dec 21 00:18:53 2012 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 8014eba..68fbb6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -josm-plugins (0.0.svn29007+ds1-1) UNRELEASED; urgency=low +josm-plugins (0.0.svn29007+ds1-1) unstable; urgency=low * New upstream snapshot. * Bump JOSM dependency to 5608. * Fixed Vcs-* fields. - -- David Paleino da...@debian.org Fri, 21 Dec 2012 00:18:38 +0100 + -- David Paleino da...@debian.org Fri, 21 Dec 2012 00:18:47 +0100 josm-plugins (0.0.svn28937+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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch:
commit 55f85e7ffdd8161e8275e0d61bfae2302d5790a7
Author: David Paleino da...@debian.org
Date: Thu Dec 20 23:24:20 2012 +0100
Bump JOSM dependency to 5608.
diff --git a/debian/changelog b/debian/changelog
index 6978477..d6c2d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
josm-plugins (0.0.svn29007+ds1-1) UNRELEASED; urgency=low
* New upstream snapshot.
+ * Bump JOSM dependency to 5608.
- -- David Paleino da...@debian.org Thu, 20 Dec 2012 23:23:16 +0100
+ -- David Paleino da...@debian.org Thu, 20 Dec 2012 23:24:09 +0100
josm-plugins (0.0.svn28937+ds1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a06936a..f8f60c0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
, libjgrapht0.8-java
, libgettext-ant-tasks-java
, python
-Build-Conflicts: josm (= 0.0.svn5577)
+Build-Conflicts: josm (= 0.0.svn5609)
Standards-Version: 3.9.4
Homepage: http://josm.openstreetmap.de/wiki/Plugins
Vcs-Git: git://git.debian.org/pkg-osm/josm-plugins.git
@@ -26,11 +26,11 @@ Package: josm-plugins
Architecture: all
Depends:
${misc:Depends}
- , josm (= 0.0.svn5576)
+ , josm (= 0.0.svn5608)
, libmetadata-extractor-java
, liblog4j1.2-java
, libjgrapht0.8-java
-Breaks: josm (= 0.0.svn5577)
+Breaks: josm (= 0.0.svn5609)
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, pristine-tar, updated. 0be38cfd1329786fa45caaf779406bacc277eebc
The following commit has been merged in the pristine-tar branch: commit 0be38cfd1329786fa45caaf779406bacc277eebc Author: David Paleino da...@debian.org Date: Thu Dec 20 23:23:11 2012 +0100 pristine-tar data for josm-plugins_0.0.svn29007+ds1.orig.tar.gz diff --git a/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.delta b/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.delta new file mode 100644 index 000..8f3d5fe Binary files /dev/null and b/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.delta differ diff --git a/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.id b/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.id new file mode 100644 index 000..58a90ec --- /dev/null +++ b/josm-plugins_0.0.svn29007+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +421bc2814897962c87f971cba25ac5e478ef439d -- 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. 0be38cfd1329786fa45caaf779406bacc277eebc
The following commit has been merged in the pristine-tar branch: commit 5cd3579cf338ea125eaaa1b198d7cba4a19f7b68 Author: David Paleino da...@debian.org Date: Fri Nov 9 21:30:48 2012 +0100 pristine-tar data for josm-plugins_0.0.svn28420+ds2.orig.tar.gz diff --git a/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.delta b/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.delta new file mode 100644 index 000..50490bf Binary files /dev/null and b/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.delta differ diff --git a/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.id b/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.id new file mode 100644 index 000..d748540 --- /dev/null +++ b/josm-plugins_0.0.svn28420+ds2.orig.tar.gz.id @@ -0,0 +1 @@ +6432b37e42423f93f2dba20bb688b875cb02132e -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit 2daba8d4cddecdfe38269c274ea2955f9bcbcd6b Author: David Paleino da...@debian.org Date: Tue Nov 13 20:15:29 2012 +0100 Removed Andreas Putzo from Uploaders. diff --git a/debian/changelog b/debian/changelog index 4e20ae0..105e4f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ josm-plugins (0.0.svn28937+ds1-1) UNRELEASED; urgency=low * Updated debian/control: - included plugins in long description - version of JOSM in Breaks (= 5577) + * Removed Andreas Putzo from Uploaders. - -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:14:15 +0100 + -- David Paleino da...@debian.org Tue, 13 Nov 2012 20:15:21 +0100 josm-plugins (0.0.svn28784+ds1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a528bbc..3c4b9e3 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: utils Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: - Andreas Putzo andr...@putzo.net - , David Paleino da...@debian.org + David Paleino da...@debian.org , Debian GIS Project pkg-grass-de...@lists.alioth.debian.org Build-Depends: ant -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch: commit fa8accfa933d8f3fb69e757fbbdc1cc406fb603f Author: David Paleino da...@debian.org Date: Thu Dec 20 23:23:35 2012 +0100 New upstream snapshot. diff --git a/debian/changelog b/debian/changelog index 17734eb..6978477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm-plugins (0.0.svn29007+ds1-1) UNRELEASED; urgency=low + + * New upstream snapshot. + + -- David Paleino da...@debian.org Thu, 20 Dec 2012 23:23:16 +0100 + josm-plugins (0.0.svn28937+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-plugins branch, pristine-tar, updated. 0be38cfd1329786fa45caaf779406bacc277eebc
The following commit has been merged in the pristine-tar branch: commit f64858e4ccc8bf8aa71ee731e2fcfac4c67d169f Author: David Paleino da...@debian.org Date: Tue Nov 13 20:07:15 2012 +0100 pristine-tar data for josm-plugins_0.0.svn28937+ds1.orig.tar.gz diff --git a/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.delta b/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.delta new file mode 100644 index 000..08f458a Binary files /dev/null and b/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.delta differ diff --git a/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.id b/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.id new file mode 100644 index 000..809a19d --- /dev/null +++ b/josm-plugins_0.0.svn28937+ds1.orig.tar.gz.id @@ -0,0 +1 @@ +7c57a7a49f17f377ee8877deea2e63c016be3dbc -- 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.svn28784+ds1-1-18-g78b536c
The following commit has been merged in the master branch:
commit 588daeab1ac08471cdb6ac62af428256aae286b6
Author: David Paleino da...@debian.org
Date: Fri Dec 21 00:12:44 2012 +0100
Patches refreshed
diff --git a/debian/patches/00-fix_build-common.patch
b/debian/patches/00-fix_build-common.patch
index 3d540da..33228a1 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -24,7 +24,7 @@ Forwarded: no
property name=ant.build.javac.target value=1.6/
property name=ant.build.javac.source value=1.6/
property name=plugin.jar
value=${plugin.dist.dir}/${ant.project.name}.jar/
-@@ -50,15 +50,6 @@
+@@ -151,15 +151,6 @@
**
--
target name=revision
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 8c49a8c..3916d9f 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -4,8 +4,8 @@ Origin: vendor
Forwarded: no
---
- routing/build.xml | 14 +-
- 1 file changed, 9 insertions(+), 5 deletions(-)
+ routing/build.xml | 16 +---
+ 1 file changed, 9 insertions(+), 7 deletions(-)
--- josm-plugins.orig/routing/build.xml
+++ josm-plugins/routing/build.xml
@@ -20,18 +20,21 @@ Forwarded: no
!--
**
** include targets that all plugins have in common
-@@ -40,8 +44,9 @@
+@@ -40,11 +44,9 @@
!-- classpath --
path id=classpath
-fileset dir=${plugin.lib.dir} includes=**/*.jar/
pathelement path=${josm}/
+-fileset dir=../log4j/lib
+-include name=**/*.jar/
+-/fileset
+pathelement path=${jgrapht}/
+pathelement path=${log4j}/
/path
!--
**
-@@ -58,7 +63,7 @@
+@@ -61,7 +63,7 @@
/target
!-- Generate distribution --
@@ -40,15 +43,14 @@ Forwarded: no
copy todir=${plugin.build.dir}/images
fileset dir=images/
/copy
-@@ -88,10 +93,9 @@
- attribute name=Plugin-Link
value=http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing/
+@@ -92,9 +94,9 @@
attribute name=Plugin-Mainversion
value=${plugin.main.version}/
attribute name=Plugin-Stage value=50/
+ attribute name=Plugin-Requires value=log4j/
-attribute name=Plugin-Version
value=${version.entry.commit.revision}/
+attribute name=Class-Path value=${jgrapht} ${log4j}/
/manifest
-zipfileset src=${plugin.lib.dir}/jgrapht-jdk1.5.jar/
--zipfileset src=${plugin.lib.dir}/log4j-1.2.15.jar/
/jar
/target
+target name='revision' /
--
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, debian/0.0.svn28937+ds1-1, created. debian/0.0.svn28937+ds1-1
The annotated tag, debian/0.0.svn28937+ds1-1 has been created at eba72a3ceae49b0acd4c44a1bf93f93de6202ec4 (tag) tagging 9d76832bf4ae5e6f1961d4ae59bc401a1471b6f9 (commit) replaces debian/0.0.svn28784+ds1-1 tagged by David Paleino on Tue Nov 13 23:02:07 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCiw18ACgkQ5qqQFxOSsXShQwCfTgnqwzMBymsp9BeOv7Gu4UEr V4gAnibvQIg3pNr0AvHqbm6vHa++95rG =cQSN -END PGP SIGNATURE- David Paleino (10): Disabled livegps and surveyour plugin. Imported Upstream version 0.0.svn28937+ds1 Merge tag 'upstream/0.0.svn28937+ds1' New upstream snapshot. Updated debian/copyright. Updated debian/control: included plugins in long description; version of JOSM in Breaks (= 5577) Removed Andreas Putzo from Uploaders. Patches refreshed bump JOSM dependency to = 5576 Releasing to sid --- -- 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, debian/0.0.svn29007+ds1-1, created. debian/0.0.svn29007+ds1-1
The annotated tag, debian/0.0.svn29007+ds1-1 has been created at bb7062ffb8bb30bd052b5e4189eecacb997b1994 (tag) tagging 78b536c6513575a410fb54aa2f0b0f0fce835525 (commit) replaces debian/0.0.svn28937+ds1-1 tagged by David Paleino on Fri Dec 21 00:21:21 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDTnXEACgkQ5qqQFxOSsXSS3QCgk9113toNl5txcBvtcKAjxzFx zrcAnRMQ8VQI1CfFyfxsQQvEQfphhf7s =bzDd -END PGP SIGNATURE- David Paleino (8): Imported Upstream version 0.0.svn29007+ds1 Merge tag 'upstream/0.0.svn29007+ds1' New upstream snapshot. Bump JOSM dependency to 5608. Patches refreshed Fix B-D Fixed Vcs-* fields. Releasing to sid --- -- 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.svn28420+ds2, created. upstream/0.0.svn28420+ds2
The annotated tag, upstream/0.0.svn28420+ds2 has been created at 30fbbb77fcb07430f55a66976577b28e3132b187 (tag) tagging 246bce6195c2a4dd8a4f16bd64687b4088ba231b (commit) replaces upstream/0.0.svn28420+ds1 tagged by David Paleino on Fri Nov 9 21:30:48 2012 +0100 - Shortlog Upstream version 0.0.svn28420+ds2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCdZ/gACgkQ5qqQFxOSsXQ/cgCfTs2MpSuw4w6eUdxd80aRnpwF o90An06NcAkpic59Wt9lWbFO99XLJwrc =4sp+ -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn28420+ds2 --- -- 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.svn28937+ds1, created. upstream/0.0.svn28937+ds1
The annotated tag, upstream/0.0.svn28937+ds1 has been created at ee5d1c38a140767c05809e52f0bf9c3d0723103e (tag) tagging c622d1af71089618675f03745c5f924679298aa0 (commit) replaces upstream/0.0.svn28784+ds1 tagged by David Paleino on Tue Nov 13 20:07:15 2012 +0100 - Shortlog Upstream version 0.0.svn28937+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCimmMACgkQ5qqQFxOSsXSQEACfRamUmqWEte7mqK85rfQaEyR/ d+oAoLl+V0tRRbPkDdiUJdyNich+7MS5 =w5pA -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn28937+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 annotated tag, upstream/0.0.svn29007+ds1, created. upstream/0.0.svn29007+ds1
The annotated tag, upstream/0.0.svn29007+ds1 has been created at 589b2dc37cd76776aa02df6e803c947e26fcd184 (tag) tagging 7c2ab8fb714c1a598c4ff7d7b61d95da49841b57 (commit) replaces upstream/0.0.svn28937+ds1 tagged by David Paleino on Thu Dec 20 23:23:11 2012 +0100 - Shortlog Upstream version 0.0.svn29007+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDTj88ACgkQ5qqQFxOSsXQX2QCfczJNOZs4IdhM81Xm7qSPVkjg uH4AnA15XnP4Fr10mMWQ0XSsaVMul5t3 =2E3f -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn29007+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 branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 3a4e655eeed36a58c98b89de913ba79a3502428c Merge: 452029b970ac581564d69371c507194bcbe8465d 6dbe40bcfe7d968cf1d2077701ffefeb28d233ea Author: David Paleino da...@debian.org Date: Wed Dec 19 22:24:10 2012 +0100 Merge tag 'upstream/0.0.svn5608+dfsg1' Upstream version 0.0.svn5608+dfsg1 # gpg: Signature made mer 19 dic 2012 22:24:01 CET using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 863686e1a7cbcd2fb7091343ac417b92212f350b Author: David Paleino da...@debian.org Date: Wed Dec 19 22:28:39 2012 +0100 New tested snapshot. diff --git a/debian/changelog b/debian/changelog index 6be16c3..681b777 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low + + * New tested snapshot. + + -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:28:24 +0100 + josm (0.0.svn5576+dfsg1-1) unstable; urgency=low * New tested snapshot. -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, pristine-tar, updated. be57b91f731c3be69fc19bdf254c1023771d9023
The following commit has been merged in the pristine-tar branch: commit be57b91f731c3be69fc19bdf254c1023771d9023 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:24:00 2012 +0100 pristine-tar data for josm_0.0.svn5608+dfsg1.orig.tar.gz diff --git a/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta b/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta new file mode 100644 index 000..72e6a9b Binary files /dev/null and b/josm_0.0.svn5608+dfsg1.orig.tar.gz.delta differ diff --git a/josm_0.0.svn5608+dfsg1.orig.tar.gz.id b/josm_0.0.svn5608+dfsg1.orig.tar.gz.id new file mode 100644 index 000..95a49a4 --- /dev/null +++ b/josm_0.0.svn5608+dfsg1.orig.tar.gz.id @@ -0,0 +1 @@ +c46d76fda124e5473e0f026c790e621188ae2211 -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch: commit 608374a298c98ad3278c7da757e9b546b26b1d82 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:34:34 2012 +0100 Added bug number diff --git a/debian/changelog b/debian/changelog index 9802594..ff81b6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ josm (0.0.svn5608+dfsg1-1) UNRELEASED; urgency=low - * New tested snapshot. + * New tested snapshot (Closes: #695197). * Update josm.desktop to make it work also in Unity (Closes: #690585) -- Editor for OpenStreetMap ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171
The following commit has been merged in the master branch:
commit 7e9f07cb3b6df884ab7ec55909265ed11bfe9dd4
Author: David Paleino da...@debian.org
Date: Wed Dec 19 22:30:02 2012 +0100
Patches refreshed
diff --git a/debian/patches/02-elemstyles.patch
b/debian/patches/02-elemstyles.patch
index a94eb72..8005110 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -47,9 +47,9 @@ applications. This patch points josm to the shared
directories.
import org.openstreetmap.josm.gui.preferences.SourceEntry;
import
org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr
+@@ -1289,7 +1290,20 @@ public class TaggingPreset extends Abstr
if (maxSize != null) {
- imgProv.setMaxSize(24);
+ imgProv.setMaxSize(maxSize);
}
-return imgProv.get();
+ImageIcon icon = imgProv.get();
diff --git a/debian/patches/04-fix_images.patch
b/debian/patches/04-fix_images.patch
index 1bdb5bf..b111d83 100644
--- a/debian/patches/04-fix_images.patch
+++ b/debian/patches/04-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi
+@@ -3243,7 +3243,7 @@ Note that for a match, at least one posi
key key=amenity value=theatre /
text key=name text=Name /
/item
@@ -18,7 +18,7 @@ Forwarded: not-needed
link
href=http://wiki.openstreetmap.org/wiki/Tag:amenity=library;
de.href=http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library;
fi.href=http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library;
-@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi
+@@ -3562,7 +3562,7 @@ Note that for a match, at least one posi
space /
/item
separator/
--
Editor for OpenStreetMap
___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons branch, pristine-tar, updated. 4a096ccf7209b971673c0111a0af3d47de6bb60e
The following commit has been merged in the pristine-tar branch: commit 4a096ccf7209b971673c0111a0af3d47de6bb60e Author: David Paleino da...@debian.org Date: Wed Dec 19 22:57:49 2012 +0100 pristine-tar data for openstreetmap-map-icons_0.0.svn28731.orig.tar.gz diff --git a/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta new file mode 100644 index 000..cff2ae4 Binary files /dev/null and b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.delta differ diff --git a/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id new file mode 100644 index 000..4b69e58 --- /dev/null +++ b/openstreetmap-map-icons_0.0.svn28731.orig.tar.gz.id @@ -0,0 +1 @@ +1ef00be6d180c34983a150d8ce2d6627effecb37 -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-6-gb7e1e1c
The following commit has been merged in the master branch: commit a765fe561bc63049b4237526d2168f0809c9f273 Merge: f0120af2f35c241b93f5b40d99437f5874b328c9 5246193b719cd2302396cbb400af3e59d6c1c9f0 Author: David Paleino da...@debian.org Date: Wed Dec 19 22:58:12 2012 +0100 Merge tag 'upstream/0.0.svn28731' Upstream version 0.0.svn28731 # gpg: Signature made mer 19 dic 2012 22:57:50 CET using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-6-gb7e1e1c
The following commit has been merged in the master branch: commit b7e1e1c30d54cad7d0ae7512cb6944035d28108a Merge: 0d70afb6a04f8ed2dbd08695d6e63d0c4e13d4a1 ead9b39d9d87b657976c5cf80f2903d3320b5a44 Author: David Paleino da...@debian.org Date: Wed Dec 19 23:28:50 2012 +0100 Merge remote-tracking branch 'origin/master' Conflicts: debian/changelog diff --combined debian/changelog index 4795209,4ced48a..3449c10 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,14 @@@ -openstreetmap-map-icons (1:0.0.svn27763-2) UNRELEASED; urgency=low +openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low ++ [ Giovanni Mascellani ] + * Remove myself from the uploaders list, since I have no time + anymore to look after this package. ++ ++ [ David Paleino ] + * New SVN snapshot + * Standards-Version bump to 3.9.4, no changes needed - -- Giovanni Mascellani g...@debian.org Tue, 28 Aug 2012 00:09:22 +0200 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:58:43 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low diff --combined debian/control index 3e4e80c,8bb19e4..9c0e189 --- a/debian/control +++ b/debian/control @@@ -2,10 -2,10 +2,10 @@@ Source: openstreetmap-map-icon Section: utils Priority: optional Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org - Uploaders: Giovanni Mascellani g...@debian.org - , David Paleino da...@debian.org + Uploaders: + David Paleino da...@debian.org Build-Depends: debhelper (= 8~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons Vcs-Git: git://git.debian.org/pkg-osm/openstreetmap-map-icons.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/openstreetmap-map-icons.git -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-8-g4b79f7c
The following commit has been merged in the master branch: commit 4b79f7c23956b11e89bcd337084720fc69bebe6d Author: David Paleino da...@debian.org Date: Wed Dec 19 23:33:21 2012 +0100 Releasing to sid diff --git a/debian/changelog b/debian/changelog index 0847cca..2931199 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low +openstreetmap-map-icons (1:0.0.svn28731-1) unstable; urgency=low [ Giovanni Mascellani ] * Remove myself from the uploaders list, since I have no time @@ -9,7 +9,7 @@ openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low * Standards-Version bump to 3.9.4, no changes needed * Updated Vcs-* fields - -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:32:56 +0100 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:33:12 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn27763-1-8-g4b79f7c
The following commit has been merged in the master branch: commit 6c5c8b80546c235468a8bfd8f6fcf36cf4cbbded Author: David Paleino da...@debian.org Date: Wed Dec 19 23:33:04 2012 +0100 Updated Vcs-* fields diff --git a/debian/changelog b/debian/changelog index 3449c10..0847cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low [ David Paleino ] * New SVN snapshot * Standards-Version bump to 3.9.4, no changes needed + * Updated Vcs-* fields - -- David Paleino da...@debian.org Wed, 19 Dec 2012 22:58:43 +0100 + -- David Paleino da...@debian.org Wed, 19 Dec 2012 23:32:56 +0100 openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9c0e189..0692c8a 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Build-Depends: debhelper (= 8~) Standards-Version: 3.9.4 Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons -Vcs-Git: git://git.debian.org/pkg-osm/openstreetmap-map-icons.git -Vcs-Browser: http://git.debian.org/?p=pkg-osm/openstreetmap-map-icons.git +Vcs-Git: git://anonscm.debian.org/pkg-osm/openstreetmap-map-icons.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/openstreetmap-map-icons.git Package: openstreetmap-map-icons-classic Architecture: all -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons annotated tag, debian/1_0.0.svn28731-1, created. debian/1_0.0.svn28731-1
The annotated tag, debian/1_0.0.svn28731-1 has been created at b9fe8a043b3eb360fd9e20e4d2fd3cc3259f542c (tag) tagging 4b79f7c23956b11e89bcd337084720fc69bebe6d (commit) replaces debian/1_0.0.svn27763-1 tagged by David Paleino on Wed Dec 19 23:38:09 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDSQdEACgkQ5qqQFxOSsXSx7QCgvhg3TqGy6kQRBBddeqJisbHR ATcAn3X36a74iBygtG+MWQeXnkUXRLIW =yxAo -END PGP SIGNATURE- David Paleino (7): Imported Upstream version 0.0.svn28731 Merge tag 'upstream/0.0.svn28731' New SVN snapshot Standards-Version bump to 3.9.4, no changes needed Merge remote-tracking branch 'origin/master' Updated Vcs-* fields Releasing to sid Giovanni Mascellani (1): Remove myself from the uploaders list. --- -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] openstreetmap-map-icons annotated tag, upstream/0.0.svn28731, created. upstream/0.0.svn28731
The annotated tag, upstream/0.0.svn28731 has been created at 87a2703cbc7d8fcee0897894c72d2c06d05260d3 (tag) tagging 5246193b719cd2302396cbb400af3e59d6c1c9f0 (commit) replaces upstream/0.0.svn27763 tagged by David Paleino on Wed Dec 19 22:57:50 2012 +0100 - Shortlog Upstream version 0.0.svn28731 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDSOF4ACgkQ5qqQFxOSsXRzQgCeOFm1EUmh0/ueOQUMtzHW3ZtU tZAAn2izpkyyV0KUeUI32W0GcvNvCIU1 =xSBT -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.0.svn28731 --- -- OpenStreetMap icon artworks ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] imposm branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a
The following commit has been merged in the master branch: commit bbe6af7a868174441c9351456bd03a1f33b200df Merge: aea5604be791c3b7c4878462b333e8f1ae05a452 03271ca7a8799c0c9e21408cd32d97ba926496ba Author: David Paleino da...@debian.org Date: Mon Dec 10 19:23:49 2012 +0100 Merge tag 'upstream/2.5.0' Upstream version 2.5.0 # gpg: Signature made lun 10 dic 2012 19:23:46 CET using DSA key ID 1392B174 # gpg: Good signature from David Paleino d.pale...@gmail.com # gpg: aka [jpeg image of size 6708] # gpg: aka Hanska aks...@gmail.com # gpg: aka David Paleino david.pale...@poste.it # gpg: aka David Paleino da...@debian.org -- 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.4.0+dfsg-0.1-8-ge03391a
The following commit has been merged in the master branch: commit 28b26714733e8b31a2a0983bfa802ce85276c42e Author: David Paleino da...@debian.org Date: Mon Dec 10 19:24:49 2012 +0100 New upstream version. diff --git a/debian/changelog b/debian/changelog index 9ccabb2..d0d3f77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -imposm (2.4.0+dfsg-1) UNRELEASED; urgency=low +imposm (2.5.0-1) UNRELEASED; urgency=low * Acknowledge NMU. + * New upstream version. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:21:34 +0100 + -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:24:37 +0100 imposm (2.4.0+dfsg-0.1) 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.4.0+dfsg-0.1-8-ge03391a
The following commit has been merged in the master branch: commit e03391a7b4564695c9331cae520abc2e99b21afa Author: David Paleino da...@debian.org Date: Wed Dec 12 22:04:29 2012 +0100 Uploading to experimental diff --git a/debian/changelog b/debian/changelog index 26043e4..7b25069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -imposm (2.5.0-1) UNRELEASED; urgency=low +imposm (2.5.0-1) experimental; urgency=low * Acknowledge NMU. * New upstream version. * Standards-Version bump to 3.9.4, no changes needed. * debhelper compat bumped to 9. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:25:36 +0100 + -- David Paleino da...@debian.org Wed, 12 Dec 2012 22:04:12 +0100 imposm (2.4.0+dfsg-0.1) 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.4.0+dfsg-0.1-8-ge03391a
The following commit has been merged in the master branch: commit e5dea87b79a5e803d69887c1849a259f53acefa4 Author: David Paleino da...@debian.org Date: Wed Dec 12 22:04:07 2012 +0100 Patch refreshed diff --git a/debian/patches/00-fix_sql_path.patch b/debian/patches/00-fix_sql_path.patch index d0dc370..952752f 100644 --- a/debian/patches/00-fix_sql_path.patch +++ b/debian/patches/00-fix_sql_path.patch @@ -9,12 +9,12 @@ Forwarded: no --- imposm.orig/imposm/psqldb.py +++ imposm/imposm/psqldb.py -@@ -88,7 +88,7 @@ def main(): +@@ -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, mapping) - - template = string.Template(db_create_template) + 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 branch, master, updated. debian/2.4.0+dfsg-0.1-8-ge03391a
The following commit has been merged in the master branch: commit 9543d7f80ff3603bd012b98b88e24768e91c485a Author: David Paleino da...@debian.org Date: Mon Dec 10 19:25:45 2012 +0100 debhelper compat bumped to 9. diff --git a/debian/changelog b/debian/changelog index ffd5e85..26043e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ imposm (2.5.0-1) UNRELEASED; urgency=low * Acknowledge NMU. * New upstream version. * Standards-Version bump to 3.9.4, no changes needed. + * debhelper compat bumped to 9. - -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:24:59 +0100 + -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:25:36 +0100 imposm (2.4.0+dfsg-0.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 8d66a6d..7b2d3a7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: David Paleino da...@debian.org -Build-Depends: debhelper (= 8~) +Build-Depends: debhelper (= 9~) , python-all-dev (= 2.6.6-3~) , python-setuptools , libtokyocabinet-dev -- 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, pristine-tar, updated. c4cf8ff221be3f179a9493efca80d8ee10fd60c4
The following commit has been merged in the pristine-tar branch: commit c4cf8ff221be3f179a9493efca80d8ee10fd60c4 Author: David Paleino da...@debian.org Date: Mon Dec 10 19:23:46 2012 +0100 pristine-tar data for imposm_2.5.0.orig.tar.gz diff --git a/imposm_2.5.0.orig.tar.gz.delta b/imposm_2.5.0.orig.tar.gz.delta new file mode 100644 index 000..5ab498c Binary files /dev/null and b/imposm_2.5.0.orig.tar.gz.delta differ diff --git a/imposm_2.5.0.orig.tar.gz.id b/imposm_2.5.0.orig.tar.gz.id new file mode 100644 index 000..be820d8 --- /dev/null +++ b/imposm_2.5.0.orig.tar.gz.id @@ -0,0 +1 @@ +a2a275baf9d8593fc625411a481c24931007696d -- 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-1, created. debian/2.5.0-1
The annotated tag, debian/2.5.0-1 has been created at 3da3296db06dac23898b1ce839c7e2400746d0ff (tag) tagging e03391a7b4564695c9331cae520abc2e99b21afa (commit) replaces debian/2.4.0+dfsg-0.1 tagged by David Paleino on Wed Dec 12 22:24:11 2012 +0100 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDI9fsACgkQ5qqQFxOSsXQyUQCfRVMVs0OB9H3WKjhk33wpBkbm 7PsAnRZUNRwdpNjL6PbQTqoN3yHPIZ/o =4599 -END PGP SIGNATURE- David Paleino (8): Acknowledge NMU. Imported Upstream version 2.5.0 Merge tag 'upstream/2.5.0' New upstream version. Standards-Version bump to 3.9.4, no changes needed. debhelper compat bumped to 9. Patch refreshed Uploading to experimental --- -- 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, upstream/2.5.0, created. upstream/2.5.0
The annotated tag, upstream/2.5.0 has been created at 2535812d3f63a869778768baf071bef9bdab47cb (tag) tagging 03271ca7a8799c0c9e21408cd32d97ba926496ba (commit) replaces upstream/2.4.0+dfsg tagged by David Paleino on Mon Dec 10 19:23:46 2012 +0100 - Shortlog Upstream version 2.5.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlDGKLIACgkQ5qqQFxOSsXTxMgCgrjglI4/w7Q8NXVhztxTB00O7 xaYAn3iKkWyvPkB8Hm0o9PmZ1u3keQh+ =mZTT -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 2.5.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 branch, master, updated. debian/2.4.0-1-3-gaea5604
The following commit has been merged in the master branch: commit aea5604be791c3b7c4878462b333e8f1ae05a452 Author: David Paleino da...@debian.org Date: Mon Dec 10 19:21:47 2012 +0100 Acknowledge NMU. diff --git a/debian/changelog b/debian/changelog index 2ce0aec..9ccabb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +imposm (2.4.0+dfsg-1) UNRELEASED; urgency=low + + * Acknowledge NMU. + + -- David Paleino da...@debian.org Mon, 10 Dec 2012 19:21:34 +0100 + imposm (2.4.0+dfsg-0.1) unstable; urgency=low * Non-maintainer upload. -- 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
