[openstreetmap-map-icons] 74/87: Merge remote-tracking branch 'origin/master'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository openstreetmap-map-icons.

commit b7e1e1c30d54cad7d0ae7512cb6944035d28108a
Merge: 0d70afb ead9b39
Author: David Paleino <dapal at debian.org>
Date:   Wed Dec 19 23:28:50 2012 +0100

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

 debian/changelog | 5 +++++
 debian/control   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 4795209,4ced48a..3449c10
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,14 @@@
 -openstreetmap-map-icons (1:0.0.svn27763-2) UNRELEASED; urgency=low
 +openstreetmap-map-icons (1:0.0.svn28731-1) UNRELEASED; urgency=low
  
++  [ Giovanni Mascellani ]
+   * Remove myself from the uploaders list, since I have no time
+     anymore to look after this package.
++  
++  [ David Paleino ]
 +  * New SVN snapshot
 +  * Standards-Version bump to 3.9.4, no changes needed
  
 - -- Giovanni Mascellani <gio at debian.org>  Tue, 28 Aug 2012 00:09:22 +0200
 + -- David Paleino <dapal at debian.org>  Wed, 19 Dec 2012 22:58:43 +0100
  
  openstreetmap-map-icons (1:0.0.svn27763-1) unstable; urgency=low
  
diff --cc debian/control
index 3e4e80c,8bb19e4..9c0e189
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,10 +2,10 @@@ Source: openstreetmap-map-icon
  Section: utils
  Priority: optional
  Maintainer: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
- Uploaders: Giovanni Mascellani <gio at debian.org>
-  , David Paleino <dapal at debian.org>
+ Uploaders:
+  David Paleino <dapal at debian.org>
  Build-Depends: debhelper (>= 8~)
 -Standards-Version: 3.9.3
 +Standards-Version: 3.9.4
  Homepage: http://wiki.openstreetmap.org/index.php/Map_Icons
  Vcs-Git: git://git.debian.org/pkg-osm/openstreetmap-map-icons.git
  Vcs-Browser: http://git.debian.org/?p=pkg-osm/openstreetmap-map-icons.git

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