date:20141021

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a change to branch master
in repository jmapviewer.

  from  fd34114   debian/control: use default-jre instead of openjdk-7-jre
   new  83a031f   1.03+dfsg-2: add patch to download Bing logo at runtime

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog  |  9 ++
 debian/patches/04-bing-logo.patch | 59 +++
 debian/patches/series |  1 +
 3 files changed, 69 insertions(+)
 create mode 100644 debian/patches/04-bing-logo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/jmapviewer.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[jmapviewer] 01/01: 1.03+dfsg-2: add patch to download Bing logo at runtime

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository jmapviewer.

commit 83a031f7d1bc6c881928a5f1a5d979396f814354
Author: Felix Natter fnat...@gmx.net
Date:   Tue Oct 21 17:45:24 2014 +0200

1.03+dfsg-2: add patch to download Bing logo at runtime
---
 debian/changelog  |  9 ++
 debian/patches/04-bing-logo.patch | 59 +++
 debian/patches/series |  1 +
 3 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 01db403..3d9de00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jmapviewer (1.03+dfsg-2) unstable; urgency=medium
+
+  * Download the bing logo at runtime from the link in the
+attribution XML (thanks to Marcus Lundblad m...@update.uu.se and
+Martin Krüger martin.krue...@gmx.com)
+  * Closes: #765421
+
+ -- Felix Natter fnat...@gmx.net  Tue, 21 Oct 2014 17:39:41 +0200
+
 jmapviewer (1.03+dfsg-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/04-bing-logo.patch 
b/debian/patches/04-bing-logo.patch
new file mode 100644
index 000..87a8c01
--- /dev/null
+++ b/debian/patches/04-bing-logo.patch
@@ -0,0 +1,59 @@
+Description: Download the Bing logo when it's not installed.
+ The Bing logo is required for attribution when using the imagery, but the
+ license terms covering the image are unclear. JMapViewer is licesed under
+ the GPL, but the Bing logo is mostly likely not.
+ .
+ To not require the inclusion of the bing_maps.png file in the jmapviewer
+ package, the image is downloaded using the URL provided in the BrandLogoUri
+ attribute of the attribution response.
+ .
+Author: Marcus Lundblad m...@update.uu.se  Martin Krüger 
martin.krue...@gmx.com
+Bug-Debian: https://bugs.debian.org/765421
+
+--- 
a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
 
b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
+@@ -3,6 +3,7 @@ package org.openstreetmap.gui.jmapviewer
+ 
+ import java.awt.Image;
+ import java.io.IOException;
++import java.io.InputStream;
+ import java.net.MalformedURLException;
+ import java.net.URL;
+ import java.util.ArrayList;
+@@ -45,6 +46,7 @@ public class BingAerialTileSource extend
+ private static final Pattern subdomainPattern = 
Pattern.compile(\\{subdomain\\});
+ private static final Pattern quadkeyPattern = 
Pattern.compile(\\{quadkey\\});
+ private static final Pattern culturePattern = 
Pattern.compile(\\{culture\\});
++private String BrandLogoUri = null;
+ 
+ public BingAerialTileSource() {
+ super(Bing Aerial Maps, http://example.com/;);
+@@ -97,6 +99,9 @@ public class BingAerialTileSource extend
+ subdomains[i] = subdomainTxt.item(i).getNodeValue();
+ }
+ 
++XPathExpression BrandLogoUriXpath = 
xpath.compile(/Response/BrandLogoUri/text());
++this.BrandLogoUri = BrandLogoUriXpath.evaluate(document);
++
+ XPathExpression attributionXpath = 
xpath.compile(Attribution/text());
+ XPathExpression coverageAreaXpath = xpath.compile(CoverageArea);
+ XPathExpression zoomMinXpath = xpath.compile(ZoomMin/text());
+@@ -173,8 +178,17 @@ public class BingAerialTileSource extend
+ 
+ @Override
+ public Image getAttributionImage() {
++  for( int i=0 ; i5  getAttribution()==null ; i++ ) ;
+ try {
+-return 
ImageIO.read(JMapViewer.class.getResourceAsStream(images/bing_maps.png));
++final InputStream imageResource = 
JMapViewer.class.getResourceAsStream(images/bing_maps.png);
++if (imageResource != null) {
++return ImageIO.read(imageResource);
++} else {
++if (this.BrandLogoUri != null)
++return ImageIO.read(new URL(this.BrandLogoUri));
++else
++return null;
++}
+ } catch (IOException e) {
+ return null;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 32e8c24..d21e4d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-build_less.patch
 03-use-installed-library-in-demo.patch
+04-bing-logo.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/jmapviewer.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?

Sebastiaan Couwenberg sebas...@xs4all.nl writes:

hi Bas,
hi debian-gis members,

 On 10/20/2014 11:17 PM, Felix Natter wrote:
 Felix Natter fnat...@gmx.net writes:
 = I think we need to investigate that for jessie+1, but now I think we
 should parse the attribution data and use the included link to
 download the logo at runtime (many thanks to the patch [1] from Marcus
 Lundblad m...@update.uu.se and Martin Krüger martin.krue...@gmx.com)?
 We should really agree on something now ;-)
 
 -- Can we all agree on this solution for jessie?
 (which is probably legal if JMapViewer itself is legal)
 
 I'd suggest to apply this patch now to make sure it's fixed for jessie!

 Yes, until we hear otherwise it seems to me the best solution to the
 Bing logo license problem.

 I've cleaned up the patch a little and added DEP3 headers for inclusion
 in the jmapviewer package. When the patch is forwarded upstream we have
 a nice opportunity to get the upstream point of view on this issue.

Thanks for your help! I pushed the change to jmapviewer git and tested
with josm (and freeplane).

Don Armstrong wrote:
 At the very least, I'd stick a note in NEWS.Debian.gz.

= Do we really want to do this? I think that problematic
bing support is not quite new for this package?

@Andreas: Could you sponsor this tomorrow?

Cheers and Best Regards,
-- 
Felix Natter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?

2014-10-21 Thread Sebastiaan Couwenberg

Hi Felix,

 Sebastiaan Couwenberg sebas...@xs4all.nl writes:
 On 10/20/2014 11:17 PM, Felix Natter wrote:
 Felix Natter fnat...@gmx.net writes:
 = I think we need to investigate that for jessie+1, but now I think
 we
 should parse the attribution data and use the included link to
 download the logo at runtime (many thanks to the patch [1] from Marcus
 Lundblad m...@update.uu.se and Martin KrÃ¼ger
 martin.krue...@gmx.com)?
 We should really agree on something now ;-)

 -- Can we all agree on this solution for jessie?
 (which is probably legal if JMapViewer itself is legal)

 I'd suggest to apply this patch now to make sure it's fixed for jessie!

 Yes, until we hear otherwise it seems to me the best solution to the
 Bing logo license problem.

 I've cleaned up the patch a little and added DEP3 headers for inclusion
 in the jmapviewer package. When the patch is forwarded upstream we have
 a nice opportunity to get the upstream point of view on this issue.

 Thanks for your help! I pushed the change to jmapviewer git and tested
 with josm (and freeplane).

Do you intent to update the package with the 1.04 upstream release?

JMapViewer 1.04 contains the patch in slightly modified form, more in line
with the upstream coding convention.

 Don Armstrong wrote:
 At the very least, I'd stick a note in NEWS.Debian.gz.

 = Do we really want to do this? I think that problematic
 bing support is not quite new for this package?

Documenting the problems with the Bing logo is a good idea in general.

I'm inclined to document it in README.Debian instead of in a NEWS item,
because the logo was never part of the package. But NEWS items are more
visible thanks to apt-listchanges.

 @Andreas: Could you sponsor this tomorrow?

Would it make sense to sponsor the new upstream version instead of the
patches 1.03?

Kind Regards,

Bas

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[hdf4] tag debian/4.2.10-3 created (now 6235a82)

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a change to tag debian/4.2.10-3
in repository hdf4.

at  6235a82   (commit)
No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[hdf4] 01/01: Remove suggests for old package

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository hdf4.

commit 238d2578a46b5341590343f86e20aaa0999635d1
Author: Johan Van de Wauw johan.vandew...@gmail.com
Date:   Tue Oct 21 17:28:52 2014 +0200

Remove suggests for old package
---
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6e97ee5..c58fd02 100644
--- a/debian/control
+++ b/debian/control
@@ -123,8 +123,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends}
 Suggests: libhdf4-doc,
   libhdf4-alt-dev,
-  hdf4-tools,
-  libnetcdf4
+  hdf4-tools
 Description: Hierarchical Data Format library (without NetCDF)
  HDF is a multi-object file format for storing and transferring
  graphical and numerical data mainly used in scientific computing. HDF

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[hdf4] branch master updated (6235a82 - 238d257)

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a change to branch master
in repository hdf4.

  from  6235a82   update changelog/ready for unstable
   new  238d257   Remove suggests for old package

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf4.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

saga 2.1.2+dfsg-3 MIGRATED to testing

2014-10-21 Thread Debian testing watch

FYI: The status of the saga source package
in Debian's testing distribution has changed.

  Previous version: 2.1.2+dfsg-2
  Current version:  2.1.2+dfsg-3

-- 
This email is automatically generated once a day.  As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[jmapviewer] 01/01: mention 'download bing logo at runtime' hack in README.Debian

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository jmapviewer.

commit 33f755cad60bb567bf67c120d252642be3014c3b
Author: Felix Natter fnat...@gmx.net
Date:   Tue Oct 21 20:36:58 2014 +0200

mention 'download bing logo at runtime' hack in README.Debian
---
 debian/README.Debian | 13 +
 1 file changed, 13 insertions(+)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..93c7d77
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,13 @@
+jmapviewer
+--
+
+The Bing logo is required for attribution when using the imagery, but the
+license terms covering the image are unclear. JMapViewer is licensed under
+the GPL, but the Bing logo is mostly likely not.
+
+In order not to require the inclusion of the bing_maps.png file in the
+jmapviewer package, the image is downloaded using the URL provided in the
+BrandLogoUri attribute of the attribution response.
+(see patches/04-bing-logo.patch for details)
+
+ -- Felix Natter fnat...@gmx.net  Tue, 21 Oct 2014 20:29:00 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/jmapviewer.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[jmapviewer] branch master updated (83a031f - 33f755c)

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a change to branch master
in repository jmapviewer.

  from  83a031f   1.03+dfsg-2: add patch to download Bing logo at runtime
   new  33f755c   mention 'download bing logo at runtime' hack in 
README.Debian

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/README.Debian | 13 +
 1 file changed, 13 insertions(+)
 create mode 100644 debian/README.Debian

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/jmapviewer.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?

Sebastiaan Couwenberg sebas...@xs4all.nl writes:

 Hi Felix,

hello Bas,

 Sebastiaan Couwenberg sebas...@xs4all.nl writes:
 On 10/20/2014 11:17 PM, Felix Natter wrote:
 Felix Natter fnat...@gmx.net writes:
 = I think we need to investigate that for jessie+1, but now I think
 we
 should parse the attribution data and use the included link to
 download the logo at runtime (many thanks to the patch [1] from Marcus
 Lundblad m...@update.uu.se and Martin KrÃ¼ger
 martin.krue...@gmx.com)?
 We should really agree on something now ;-)

 -- Can we all agree on this solution for jessie?
 (which is probably legal if JMapViewer itself is legal)

 I'd suggest to apply this patch now to make sure it's fixed for jessie!

 Yes, until we hear otherwise it seems to me the best solution to the
 Bing logo license problem.

 I've cleaned up the patch a little and added DEP3 headers for inclusion
 in the jmapviewer package. When the patch is forwarded upstream we have
 a nice opportunity to get the upstream point of view on this issue.

 Thanks for your help! I pushed the change to jmapviewer git and tested
 with josm (and freeplane).

 Do you intent to update the package with the 1.04 upstream release?

 JMapViewer 1.04 contains the patch in slightly modified form, more in line
 with the upstream coding convention.

I would rather not like to do this, because i.e. from 1.02 to 1.03 they
introduced incompatibilies and I had to fix freeplane, and I might
not have enough time to fix freeplane (and josm) before the freeze :-/

 Don Armstrong wrote:
 At the very least, I'd stick a note in NEWS.Debian.gz.

 = Do we really want to do this? I think that problematic
 bing support is not quite new for this package?

 Documenting the problems with the Bing logo is a good idea in general.

 I'm inclined to document it in README.Debian instead of in a NEWS item,
 because the logo was never part of the package. But NEWS items are more
 visible thanks to apt-listchanges.

Ok, I added your patch description to README.Debian.

 @Andreas: Could you sponsor this tomorrow?

BTW: the git repo is here:
http://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git

 Would it make sense to sponsor the new upstream version instead of the
 patches 1.03?

I appreciate that you reported the patch upstream so quickly, but I
would prefer to stick with 1.03 for jessie.

Thanks and Best Regards,
-- 
Felix Natter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?

2014-10-21 Thread Vincent Privat

I made the 1.04 release especially for this bug :/
There are very few other changes: one bug fix, optimized PNGs and code now
requiring Java 7, but that should not be a problem:
https://trac.openstreetmap.org/log/subversion/applications/viewer/jmapviewer?action=stop_on_copymode=stop_on_copyrev=30760stop_rev=30424

I am also releasing a new tested version of JOSM right now (7643). It's a
bugfix release that addresses major problems present in version 7588, this
version is meant for Jessie if possible...

Didn't know Freeplane was using JMapViewer however, it's great to see we're
not alone to use it after all :)

2014-10-21 20:52 GMT+02:00 Felix Natter fnat...@gmx.net:

Sebastiaan Couwenberg sebas...@xs4all.nl writes:

Hi Felix,

hello Bas,

Sebastiaan Couwenberg sebas...@xs4all.nl writes:
On 10/20/2014 11:17 PM, Felix Natter wrote:
Felix Natter fnat...@gmx.net writes:
= I think we need to investigate that for jessie+1, but now I think
we
should parse the attribution data and use the included link to
download the logo at runtime (many thanks to the patch [1] from
Marcus
Lundblad m...@update.uu.se and Martin KrÃ¼ger
martin.krue...@gmx.com)?
We should really agree on something now ;-)

-- Can we all agree on this solution for jessie?
(which is probably legal if JMapViewer itself is legal)

I'd suggest to apply this patch now to make sure it's fixed for
jessie!

Yes, until we hear otherwise it seems to me the best solution to the
Bing logo license problem.

I've cleaned up the patch a little and added DEP3 headers for inclusion
in the jmapviewer package. When the patch is forwarded upstream we have
a nice opportunity to get the upstream point of view on this issue.

Thanks for your help! I pushed the change to jmapviewer git and tested
with josm (and freeplane).

Do you intent to update the package with the 1.04 upstream release?

JMapViewer 1.04 contains the patch in slightly modified form, more in
line
with the upstream coding convention.

I would rather not like to do this, because i.e. from 1.02 to 1.03 they
introduced incompatibilies and I had to fix freeplane, and I might
not have enough time to fix freeplane (and josm) before the freeze :-/

Don Armstrong wrote:
At the very least, I'd stick a note in NEWS.Debian.gz.

= Do we really want to do this? I think that problematic
bing support is not quite new for this package?

Documenting the problems with the Bing logo is a good idea in general.

I'm inclined to document it in README.Debian instead of in a NEWS item,
because the logo was never part of the package. But NEWS items are more
visible thanks to apt-listchanges.

Ok, I added your patch description to README.Debian.

@Andreas: Could you sponsor this tomorrow?

BTW: the git repo is here:
http://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git

Would it make sense to sponsor the new upstream version instead of the
patches 1.03?

I appreciate that you reported the patch upstream so quickly, but I
would prefer to stick with 1.03 for jessie.

Thanks and Best Regards,
--
Felix Natter

--
To unsubscribe, send mail to 765421-unsubscr...@bugs.debian.org.

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#765421: jmapviewer: Download bing logo via attribution XML at runtime?

2014-10-21 Thread Sebastiaan Couwenberg

On 10/21/2014 08:52 PM, Felix Natter wrote:
 Sebastiaan Couwenberg sebas...@xs4all.nl writes:
 JMapViewer 1.04 contains the patch in slightly modified form, more in line
 with the upstream coding convention.
 
 I would rather not like to do this, because i.e. from 1.02 to 1.03 they
 introduced incompatibilies and I had to fix freeplane, and I might
 not have enough time to fix freeplane (and josm) before the freeze :-/

That's entirely reasonable with only two weeks left until the freeze.

I mostly asked in case you missed the message by Vincent Privat in his
role as JOSM  JMapViewer upstream, who asked if it was possible to get
the new upstream version into jessie. See:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765421#95

I've reviewed the changes between 1.03 and 1.04, and they are very
minimal (if you exclude whitespace changes), but two weeks may not be
enough to test the rdeps and have the updated package(s) migrate to testing.

 Would it make sense to sponsor the new upstream version instead of the
 patches 1.03?
 
 I appreciate that you reported the patch upstream so quickly, but I
 would prefer to stick with 1.03 for jessie.

Just for the record, I didn't forward the patch, Vincent Privat was
apparently following the bug report and/or mailinglist(s).

It's your call to update to 1.04 or not. I would update the packaging
and upload it to experimental at least if you have the time.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/E88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch experimental/master created (now 5869bbe)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch experimental/master
in repository josm.

at  5869bbe   (Build-)Depend on jmapviewer (= 
1.02+svn30322.really+dfsg1), since its API changed, and JOSM now depends on the 
new one

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch experimental/upstream created (now df67177)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch experimental/upstream
in repository josm.

at  df67177   Imported Upstream version 0.0.svn6891+dfsg1

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch lucid created (now a5ce37d)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch lucid
in repository josm.

at  a5ce37d   Imported Debian patch 0.0.svn2255-1ubuntu1

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch maverick created (now b654f07)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch maverick
in repository josm.

at  b654f07   Releasing to maverick-updates

This branch includes the following new commits:

   new  ab0deee   Update Maintainer field
   new  2b1d62e   Backport fixed failed authorisation dialog from 4021, 
gives more verbose message of why the authorisation process failed. (needed for 
OSM License Change Phase III) (LP: #762634)
   new  b654f07   Releasing to maverick-updates

The 3 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 03/03: Releasing to maverick-updates

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch maverick
in repository josm.

commit b654f0723d1cf7731d446c6dcb231e6d2619f6f4
Author: David Paleino da...@debian.org
Date:   Sat Apr 16 23:30:48 2011 +0200

Releasing to maverick-updates
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6eea7a..0cafc03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-josm (0.0.svn3514-2ubuntu1) UNRELEASED; urgency=low
+josm (0.0.svn3514-2ubuntu1) maverick-updates; urgency=low
 
   * Update Maintainer field
   * Backport fixed failed authorisation dialog from 4021, gives
 more verbose message of why the authorisation process failed.
 (needed for OSM License Change Phase III) (LP: #762634)
 
- -- David Paleino da...@debian.org  Sat, 16 Apr 2011 23:20:05 +0200
+ -- David Paleino da...@debian.org  Sat, 16 Apr 2011 23:24:58 +0200
 
 josm (0.0.svn3514-2) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 01/03: Update Maintainer field

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch maverick
in repository josm.

commit ab0deee6f8c3dbd4d160bf2d973049d311f5a547
Author: David Paleino da...@debian.org
Date:   Sat Apr 16 19:48:03 2011 +0200

Update Maintainer field
---
 debian/changelog | 6 ++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e0ec7b7..8b397ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn3514-2ubuntu1) UNRELEASED; urgency=low
+
+  * Update Maintainer field
+
+ -- David Paleino da...@debian.org  Sat, 16 Apr 2011 19:47:30 +0200
+
 josm (0.0.svn3514-2) unstable; urgency=low
 
   * debian/patches/90-fix_version.patch added, fix inconsistency
diff --git a/debian/control b/debian/control
index a90fff5..94374e4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: josm
 Section: utils
 Priority: extra
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
+XSBC-Original-Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders:
  Andreas Putzo andr...@putzo.net,
  Giovanni Mascellani g...@debian.org,

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch squeeze created (now 50b6197)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch squeeze
in repository josm.

at  50b6197   Releasing to p-u

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] branch natty created (now 8371fd1)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch natty
in repository josm.

at  8371fd1   Releasing to natty

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 02/03: Backport fixed failed authorisation dialog from 4021, gives more verbose message of why the authorisation process failed. (needed for OSM License Change Phase III) (LP: #762634)

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch maverick
in repository josm.

commit 2b1d62e1a1c3b42e995de1661fafe9df272726e4
Author: David Paleino da...@debian.org
Date:   Sat Apr 16 23:20:23 2011 +0200

Backport fixed failed authorisation dialog from 4021, gives more verbose 
message of why the authorisation process failed. (needed for OSM License Change 
Phase III) (LP: #762634)
---
 debian/changelog   |  5 +-
 .../100-backport_failedauth_explaination.patch | 57 ++
 debian/patches/series  |  1 +
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b397ee..a6eea7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 josm (0.0.svn3514-2ubuntu1) UNRELEASED; urgency=low
 
   * Update Maintainer field
+  * Backport fixed failed authorisation dialog from 4021, gives
+more verbose message of why the authorisation process failed.
+(needed for OSM License Change Phase III) (LP: #762634)
 
- -- David Paleino da...@debian.org  Sat, 16 Apr 2011 19:47:30 +0200
+ -- David Paleino da...@debian.org  Sat, 16 Apr 2011 23:20:05 +0200
 
 josm (0.0.svn3514-2) unstable; urgency=low
 
diff --git a/debian/patches/100-backport_failedauth_explaination.patch 
b/debian/patches/100-backport_failedauth_explaination.patch
new file mode 100644
index 000..d1ccec5
--- /dev/null
+++ b/debian/patches/100-backport_failedauth_explaination.patch
@@ -0,0 +1,57 @@
+From: David Paleino da...@debian.org
+Subject: backport fixed failed authorisation dialog from 4021
+Origin: vendor
+Forwarded: not-needed
+
+---
+ src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java |3 +-
+ src/org/openstreetmap/josm/tools/ExceptionUtil.java |   24 

+ 2 files changed, 26 insertions(+), 1 deletion(-)
+
+--- josm.orig/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
 josm/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+@@ -271,9 +271,10 @@ public class ExceptionDialogUtil {
+  * @param e the exception
+  */
+ public static void explainAuthorizationFailed(OsmApiException e) {
++// Fixme: add special handling that calls 
ExceptionUtil.explainFailedOAuthAuthorisation(e)
+ HelpAwareOptionPane.showOptionDialog(
+ Main.parent,
+-ExceptionUtil.explainFailedOAuthAuthorisation(e),
++ExceptionUtil.explainFailedAuthorisation(e),
+ tr(Authorisation Failed),
+ JOptionPane.ERROR_MESSAGE,
+ ht(/ErrorMessages#AuthenticationFailed)
+--- josm.orig/src/org/openstreetmap/josm/tools/ExceptionUtil.java
 josm/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+@@ -128,6 +128,30 @@ public class ExceptionUtil {
+ );
+ }
+ 
++   public static String explainFailedAuthorisation(OsmApiException e) {
++e.printStackTrace();
++String header = e.getErrorHeader();
++String body = e.getErrorBody();
++String msg = null;
++if (header != null) {
++if (body != null  !header.equals(body)) {
++msg = header +  ( + body + );
++} else {
++msg = header;
++}
++} else {
++msg = body;
++}
++
++return tr(html
+++ Authorisation at the OSM server failed.br
+++ The server reported the following error:br
+++ ''{0}''
+++ /html,
++msg
++);
++}
++
+ public static String explainFailedOAuthAuthorisation(OsmApiException e) {
+ e.printStackTrace();
+ return tr(html
diff --git a/debian/patches/series b/debian/patches/series
index f6aacf6..01e3792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 70-default_look_and_feel.patch
 80-fix_images.patch
 90-fix_version.patch
+100-backport_failedauth_explaination.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[avce00] branch master updated (69e5a1f - 3924566)

This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a change to branch master
in repository avce00.

  from  69e5a1f   Fix changelog comment
   new  3924566   Merge changelogs for git versions -3 and -4

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 23 ---
 1 file changed, 8 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/avce00.git

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[avce00] 01/01: Merge changelogs for git versions -3 and -4