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

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

commit 6e97c2b16f72cf290def89a89e8e297c8a552115
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Dec 19 12:11:40 2014 +0100

    Drop man page patches, applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/completely-typo.patch           | 16 ----------------
 debian/patches/hyphen-used-as-minus-sign.patch | 16 ----------------
 debian/patches/series                          |  2 --
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3f616d..0e1646e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mkgmap (0.0.0+svn3383-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
   * Mangle upstream version in watch file to properly rename orig.tar.gz.
+  * Drop man page patches, applied upstream.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Fri, 19 Dec 2014 12:08:27 +0100
 
diff --git a/debian/patches/completely-typo.patch 
b/debian/patches/completely-typo.patch
deleted file mode 100644
index 32c784b..0000000
--- a/debian/patches/completely-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'completly' typo, replace with 'completely'.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2014q4/022328.html
-Applied-Upstream: r3370, 
http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2014q4/022329.html
-
---- a/doc/mkgmap.1
-+++ b/doc/mkgmap.1
-@@ -13,7 +13,7 @@ command.
- \fBmkgmap\fP is a program that converts OpenStreetMap (OSM) data into a map 
that can be
- loaded onto a Garmin GPS device. 
- The mapping between OSM features and the features in the map can be
--completly customized by writing what we term a "style".
-+completely customized by writing what we term a "style".
- .SH OPTIONS
- .TP
- .B \-\-help <filename>
diff --git a/debian/patches/hyphen-used-as-minus-sign.patch 
b/debian/patches/hyphen-used-as-minus-sign.patch
deleted file mode 100644
index 9f1c853..0000000
--- a/debian/patches/hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Escape minus signs in options to not interpret them as a hyphen.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2014q4/022331.html
-Applied-Upstream: r3371, 
http://www.mkgmap.org.uk/pipermail/mkgmap-dev/2014q4/022332.html
-
---- a/doc/mkgmap.1
-+++ b/doc/mkgmap.1
-@@ -18,7 +18,7 @@ completely customized by writing what we
- .TP
- .B \-\-help <filename>
- Use this option to get alist of the built in help topics.
--In particular calling --help=options will list all the available
-+In particular calling \-\-help=options will list all the available
- options and is always up to date.
- .SH ACKNOWLEDGEMENTS
- This project is almost entirely based on the file format specification
diff --git a/debian/patches/series b/debian/patches/series
index 2e236aa..46a7f4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 build_xml.patch
-completely-typo.patch
-hyphen-used-as-minus-sign.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mkgmap.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