[openstreetmap-map-icons] 01/02: Merge tag 'debian/0.0.svn32641-1' into jessie-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository openstreetmap-map-icons.

commit 8e9b8a15ec59e7ee1f0a39e3132e89d3cf1deffe
Merge: c8974b2 db8efb9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 17 19:18:58 2016 +0200

    Merge tag 'debian/0.0.svn32641-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 classic.small/nautical/ferry.png                | Bin 170 -> 0 bytes
 classic.small/nautical/ferry.svg                | 118 +++++++++++++++++
 classic.small/transport/bus.svg                 | 137 +++++++++++++++++++
 classic.small/transport/funicular.svg           | 129 ++++++++++++++++++
 classic.small/transport/platform.svg            | 101 ++++++++++++++
 classic.small/transport/share_taxi.svg          | 162 +++++++++++++++++++++++
 classic.small/transport/station.svg             | 161 ++++++++++++++++++++++
 classic.small/transport/train.svg               | 167 +++++++++++++++++++++++
 classic.small/transport/trolleybus.svg          | 169 ++++++++++++++++++++++++
 debian/changelog                                |   6 +
 debian/openstreetmap-map-icons-classic.install  |   4 +-
 debian/openstreetmap-map-icons-scalable.install |   2 +-
 debian/openstreetmap-map-icons-square.install   |   2 +-
 debian/patches/use-local-icons.patch            |   2 +-
 14 files changed, 1155 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 8f8faa1,6108ae3..d6b0dfc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ openstreetmap-map-icons (1:0.0.svn32641-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jul 2016 12:41:53 +0200
+ 
 +openstreetmap-map-icons (1:0.0.svn32149-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 19 Jun 2016 22:09:11 +0200
 +
  openstreetmap-map-icons (1:0.0.svn32149-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.

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