[josm-plugins] 181/369: Merge branch 'master' into dh7

[Bas Couwenberg]

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

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

commit db6ef113177fe2ee48eb007288e3489a427ed3ef
Merge: 44005c6 8100c1a
Author: David Paleino <dapal at debian.org>
Date:   Tue Oct 12 22:37:25 2010 +0200

    Merge branch 'master' into dh7
    
    Conflicts:
    	debian/changelog

 debian/changelog                 |  4 +++-
 debian/control                   | 14 +++++++++-----
 debian/patches/60_wmsplugin.diff |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 770dcae,f374fbd..26ad2fa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,11 -3,10 +3,13 @@@ josm-plugins (0.0.svn23479-1) UNRELEASE
    * New upstream snapshot
    * debian/control:
      - added two new packages: webkit-image-qt and webkit-image-gtk
 +    - bump debhelper dependency to >= 8~
+     - bumped dependencies on JOSM to 3592
 +  * debian/rules rewritten to use dh7
 +  * debian/compat bumped to 8
+   * debian/patches/60_wmsplugin.diff refreshed to cleanly apply
  
-  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 22:00:30 +0200
+  -- David Paleino <dapal at debian.org>  Sun, 10 Oct 2010 22:04:33 +0200
  
  josm-plugins (0.0.svn23040-1) unstable; urgency=low
  
diff --cc debian/control
index 4a9a9b1,a15fe89..b5edc63
--- a/debian/control
+++ b/debian/control
@@@ -9,9 -9,10 +9,9 @@@ Uploaders
   , Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
  Build-Depends:
   ant
 - , cdbs
 - , debhelper (>= 5)
 + , debhelper (>= 8~)
   , default-jdk
-  , josm (>= 0.0.svn3514)
+  , josm (>= 0.0.svn3592)
   , libmetadata-extractor-java
   , liblog4j1.2-java
   , libjgrapht0.8-java

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