[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

2012-12-20 Thread David Paleino 
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

2012-12-20 Thread David Paleino 
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, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

2012-12-20 Thread David Paleino 
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