The following commit has been merged in the master branch:
commit a2b7b2a12febb2f5e973ec7b34748d0aab7f9abe
Merge: 2240a78ea6b062d5d0b9d2e81cc272774f841472 
d6268b57c616c9c96cdf6347a5282a3625118843
Author: David Paleino <da...@debian.org>
Date:   Wed Jun 2 10:20:50 2010 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/josm-plugins
    
    Conflicts:
        debian/changelog
        debian/control
        debian/patches/150_routing.diff

diff --combined debian/changelog
index 7716e07,54ccfb1..cfd46f2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- josm-plugins (0.0.svn20358-1) UNRELEASED; urgency=low
+ josm-plugins (0.0.svn20981-1) unstable; urgency=low
  
    [ David Paleino ]
    * debian/control:
@@@ -7,11 -7,10 +7,11 @@@
      - move package from Section java to utils, according to archive
        override
      - Vcs-* fields updated, package moved to Git
 +    - Build-Depend on libgrapht0.8
    * debian/copyright updated
  
    [ Giovanni Mascellani ]
-   * Updated to revision 20358 (closes: #571140)
+   * Updated to revision 20981 (closes: #571140)
    * Added plugins:
      + cadastre-fr - A special handler for the French land registry WMS
        server (closes: #555723)
@@@ -26,8 -25,9 +26,9 @@@
      + utilsplugin - Dropped upstream
      + validator - Bad license
    * Standards-Version bumped to 3.8.4 (no changes required)
+   * Updated my email address
  
-  -- David Paleino <da...@debian.org>  Wed, 02 Jun 2010 10:10:36 +0200
+  -- Giovanni Mascellani <g...@debian.org>  Mon, 31 May 2010 17:00:28 +0200
  
  josm-plugins (0.0.svn18009-1) unstable; urgency=low
  

-- 
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