The following commit has been merged in the master branch:
commit db6ef113177fe2ee48eb007288e3489a427ed3ef
Merge: 44005c607f46d8d48a8d828e02505a8f321e9d0c 
8100c1a7a6dacfb595bb1c103491b82e22ad1581
Author: David Paleino <da...@debian.org>
Date:   Tue Oct 12 22:37:25 2010 +0200

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

diff --combined 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 <da...@debian.org>  Sun, 10 Oct 2010 22:00:30 +0200
+  -- David Paleino <da...@debian.org>  Sun, 10 Oct 2010 22:04:33 +0200
  
  josm-plugins (0.0.svn23040-1) unstable; urgency=low
  
diff --combined debian/control
index 4a9a9b1,a15fe89..b5edc63
--- a/debian/control
+++ b/debian/control
@@@ -9,13 -9,14 +9,13 @@@ Uploaders
   , Debian OpenStreetMap Team <pkg-osm-ma...@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
- Build-Conflicts: josm (>= 0.0.svn3515)
+ Build-Conflicts: josm (>= 0.0.svn3593)
  Standards-Version: 3.9.1
  Homepage: http://josm.openstreetmap.de/wiki/Plugins
  Vcs-Git: git://git.debian.org/pkg-grass/josm-plugins.git
@@@ -25,11 -26,11 +25,11 @@@ Package: josm-plugin
  Architecture: all
  Depends:
   ${misc:Depends}
-  , josm (>= 0.0.svn3514)
+  , josm (>= 0.0.svn3592)
   , libmetadata-extractor-java
   , liblog4j1.2-java
   , libjgrapht0.8-java
- Breaks: josm (>= 0.0.svn3515)
+ Breaks: josm (>= 0.0.svn3593)
  Suggests: gpsd
  Description: Plugins for JOSM
   JOSM (Java OpenStreetMap) plugin collection.
@@@ -66,6 -67,8 +66,8 @@@
  
  Package: webkit-image-qt
  Architecture: any
+ Depends: ${shlibs:Depends}
+  , ${misc:Depends}
  Description: generate images from webpages - Qt version
   webkit-image is a small tool that lets you generate images
   from web page snapshots.
@@@ -74,8 -77,10 +76,10 @@@
  
  Package: webkit-image-gtk
  Architecture: any
+ Depends: ${shlibs:Depends}
+  , ${misc:Depends}
  Description: generate images from webpages - GTK version
   webkit-image is a small tool that lets you generate images
   from web page snapshots.
   .
-  This package contains the Qt version
+  This package contains the GTK version

-- 
Plugins for josm

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

Reply via email to