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

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit 7c18498fb68d95b0a8e9c5caed7c31cddde94bf4
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu Jul 10 19:16:28 2014 +0200

    Add Forwarded and Applied-Upstream headers to patches forwared by Jochen 
Topf.
---
 debian/patches/01-hyphen-used-as-minus-sign.patch | 2 ++
 debian/patches/02-spelling-error-in-manpage.patch | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/patches/01-hyphen-used-as-minus-sign.patch 
b/debian/patches/01-hyphen-used-as-minus-sign.patch
index 7692a5d..1795653 100644
--- a/debian/patches/01-hyphen-used-as-minus-sign.patch
+++ b/debian/patches/01-hyphen-used-as-minus-sign.patch
@@ -1,5 +1,7 @@
 Description: Fix hyphen-used-as-minus-sign lintian warnings by escaping -.
 Author: Bas Couwenberg <sebas...@xs4all.nl>
+Forwarded: https://github.com/openstreetmap/osm2pgsql/pull/140
+Applied-Upstream: 
https://github.com/openstreetmap/osm2pgsql/commit/aac083ddd309d2b66ce74873c073c93d03fbb09a
 --- a/docs/osm2pgsql.1
 +++ b/docs/osm2pgsql.1
 @@ -36,7 +36,7 @@ database up to date.
diff --git a/debian/patches/02-spelling-error-in-manpage.patch 
b/debian/patches/02-spelling-error-in-manpage.patch
index c9ecbee..d39dd4d 100644
--- a/debian/patches/02-spelling-error-in-manpage.patch
+++ b/debian/patches/02-spelling-error-in-manpage.patch
@@ -1,5 +1,7 @@
 Description: Fix spelling-error-in-manpage by using 'allows one to'.
 Author: Bas Couwenberg <sebas...@xs4all.nl>
+Forwarded: https://github.com/openstreetmap/osm2pgsql/pull/140
+Applied-Upstream: 
https://github.com/openstreetmap/osm2pgsql/commit/aac083ddd309d2b66ce74873c073c93d03fbb09a
 --- a/docs/osm2pgsql.1
 +++ b/docs/osm2pgsql.1
 @@ -58,7 +58,7 @@ to (default: gis).

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to