[imposm-parser] 28/29: Merge changes from unreleased 1.0.5-2.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository imposm-parser.

commit b5536bc2c54a6d59b21c826c28ef57a51dac7017
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 13 19:57:35 2015 +0100

    Merge changes from unreleased 1.0.5-2.
---
 debian/changelog | 6 ++++++
 debian/copyright | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de9630d..8bc5d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+imposm-parser (1.0.6-1) UNRELEASED; urgency=low
+
+  * Updated debian/copyright.
+
+ -- David Paleino <dapal at debian.org>  Mon, 04 Nov 2013 17:33:40 +0100
+
 imposm-parser (1.0.6-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/copyright b/debian/copyright
index 43217f2..1168ba0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: imposm-parser
 Upstream-Author: Oliver Tonnhofer <olt at omniscale.de>
 Source: http://dev.omniscale.net/imposm.parser/
@@ -8,7 +8,7 @@ Copyright: © 2011, Omniscale GmbH & Co. KG
 License: Apache-2.0
 
 Files: debian/*
-Copyright: © 2011, David Paleino <dapal at debian.org>
+Copyright: © 2011-2013, David Paleino <dapal at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

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