[geolinks] 02/06: Merge tag 'upstream/0.2.0'

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository geolinks.

commit d2f658d999b5fa11f66a501120a7f215a1f71ef9
Merge: d4eb4c2 e64cde5
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Mon Sep 14 21:53:34 2015 +0200

    Merge tag 'upstream/0.2.0'
    
    Upstream version 0.2.0

 PKG-INFO             |  10 ++++-
 README.md            |   2 +-
 debian/changelog     |   6 +++
 geolinks/__init__.py |  83 ++++++++++++++++++++++++++++++++++++++-
 geolinks/links.py    | 108 ---------------------------------------------------
 setup.py             |   6 +++
 6 files changed, 103 insertions(+), 112 deletions(-)

diff --cc debian/changelog
index 518e711,0000000..3a00cf1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,0 +1,22 @@@
++geolinks (0.2.0-1) UNRELEASED; urgency=medium
++
++  * Imported Upstream version 0.2.0
++
++ -- Johan Van de Wauw <johan at vandewauw.be>  Mon, 14 Sep 2015 21:53:45 +0200
++
 +geolinks (0.1.0-1) unstable; urgency=medium
 +
 +  [ Bas Couwenberg ]
 +  * Fix broken watch file, use pypi.debian.net instead of pypi.python.org.
 +
 +  [ Johan Van de Wauw ]
 +  * Imported Upstream version 0.1.0
 +  * Specify myself as source for the debian packaging; bump copyright year
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 23 Jun 2015 16:27:47 +0200
 +
 +geolinks (0.0.1-1) unstable; urgency=medium
 +
 +  * Initial upload (closes: #763538)
 +
 + -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Sat, 11 Oct 2014 02:00:54 +0200

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