[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-11-g45abf2d

[David Paleino]

The following commit has been merged in the master branch:
commit 45abf2df0b316da2bf3ef91862d5291a9b078d41
Merge: 2c04afc3c41f2f0d64b2d9a01bfcc98439582cfe a2e5d14c6d87932893b55867510771bfbd333c13
Author: David Paleino <dapal at debian.org>
Date:   Tue Jun 15 21:22:11 2010 +0200

    Merge remote branch 'origin/master'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 76aa4e8,7d76df8..2985ef6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,20 @@@
  josm (0.0.svn3329-1) UNRELEASED; urgency=low
  
+   [ David Paleino ]
    * New upstream release
    * debian/patches/* refreshed
 +  * debian/rules converted to dh7
 +  * debian/control:
 +    - bumped debhelper build-dependency to >= 7.0.50~
 +    - removed build-dependency on cdbs
 +  * debian/compat bumped to 7
 +  * debian/README.source removed
 +  * debian/copyright: added myself to debian/*
  
-  -- David Paleino <dapal at debian.org>  Tue, 15 Jun 2010 21:18:12 +0200
+   [ Giovanni Mascellani ]
+   * My email address updated
+ 
+  -- Giovanni Mascellani <gio at debian.org>  Mon, 14 Jun 2010 15:53:15 +0200
  
  josm (0.0.svn3208-1) unstable; urgency=low
  
diff --combined debian/control
index ef5c39a,81a2978..d5ed992
--- a/debian/control
+++ b/debian/control
@@@ -4,14 -4,15 +4,14 @@@ Priority: extr
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders:
   Andreas Putzo <andreas at putzo.net>,
-  Giovanni Mascellani <mascellani at poisson.phc.unipi.it>,
+  Giovanni Mascellani <gio at debian.org>,
   Petter Reinholdtsen <pere at debian.org>,
   David Paleino <dapal at debian.org>,
   Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
  DM-Upload-Allowed: yes
  Build-Depends:
   ant,
 - cdbs,
 - debhelper (>= 5),
 + debhelper (>= 7.0.50~),
   gettext,
   default-jdk,
   libgettext-commons-java (>= 0.9.6),

-- 
Java OpenStreetMap editor