[geographiclib] 07/10: Drop manpage_lintian.patch, applied upstream. Refresh remaining patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository geographiclib.

commit 38710dda180659b8442ece838d49eb690e3b1f4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 19 13:06:04 2016 +0100

    Drop manpage_lintian.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                          |  2 ++
 debian/patches/disable-python-build.patch |  6 +++---
 debian/patches/manpage_lintian.patch      | 22 ----------------------
 debian/patches/series                     |  1 -
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1db068a..6b581fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ geographiclib (1.46-1) UNRELEASED; urgency=medium
   * Update copyright years for Charles Karney, BMW Car IT GmbH &
     Free Software Foundation, Inc.
   * Bump Standards-Version to 3.9.7, no changes.
+  * Drop manpage_lintian.patch, applied upstream.
+    Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 19 Feb 2016 11:49:33 +0100
 
diff --git a/debian/patches/disable-python-build.patch b/debian/patches/disable-python-build.patch
index 2640198..5054b75 100644
--- a/debian/patches/disable-python-build.patch
+++ b/debian/patches/disable-python-build.patch
@@ -14,9 +14,9 @@ Forwarded: not-needed
 -SUBDIRS = src man tools doc js include matlab python cmake examples
 +SUBDIRS = src man tools doc js include matlab cmake examples
  
- EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md pom.xml \
- 	Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet
-@@ -47,4 +47,4 @@ install-doc:
+ EXTRA_DIST = AUTHORS 00README.txt LICENSE.txt NEWS INSTALL README.md \
+ 	Makefile.mk CMakeLists.txt windows maxima doc legacy java js dotnet \
+@@ -51,4 +51,4 @@ install-doc:
  man:
  	$(MAKE) -C man man
  
diff --git a/debian/patches/manpage_lintian.patch b/debian/patches/manpage_lintian.patch
deleted file mode 100644
index ce1e9b9..0000000
--- a/debian/patches/manpage_lintian.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Remove manpage hyphen lintian warning
- Escape the -h so that the minus sign does not appear to be
- a hyphen.
-Author: Ross Gammon <rossgammon at mail.dk>
-Forwarded: mailto:charles at karney.com
-Applied-Upstream: http://sourceforge.net/p/geographiclib/code/ci/9fa812a9f0bc11c1b6a11b371c157d2e9cc37ee6/
-
---- a/man/script.8.in
-+++ b/man/script.8.in
-@@ -5,10 +5,10 @@
- .B @SCRIPT@
- downloads and installs the @DATA@ datasets used by GeographicLib,
- <http://geographiclib.sf.net>.  For documentation, supply the
--.B -h
-+.B \-h
- option:
- .PP
--    @SCRIPT@ -h
-+    @SCRIPT@ \-h
- .PP
- By default, the datasets are installed in
- .I @GEOGRAPHICLIB_DATA@/@DATA@
diff --git a/debian/patches/series b/debian/patches/series
index 2b70e9d..4cc203e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 css.patch
 privacy.patch
-manpage_lintian.patch
 disable-python-build.patch

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