[Python-modules-commits] [cf-python] 11/14: merge patched into master

[Klaus Zimmermann]

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

zklaus-guest pushed a commit to branch master
in repository cf-python.

commit 155e371a18184cbf2c2ccf6905bb18f312810108
Merge: 05b79bb 81ec8d9
Author: Klaus Zimmermann <klaus_zimmermann at gmx.de>
Date:   Fri Sep 9 14:08:41 2016 +0200

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0003-Fixed-man-page-cfa.1.patch | 23 +++++++++++++++++++++++
 debian/patches/series                          |  1 +
 scripts/man1/cfa.1                             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b999e81,0000000..05f3a54
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3b2224e9a47a43405df8634138f595e653876661
- 3b2224e9a47a43405df8634138f595e653876661
++81ec8d9aca447f3038fe67d434de2be07e7ed53c
++81ec8d9aca447f3038fe67d434de2be07e7ed53c
 +bd3fd7886d0148932d954e6ea9a3edaca1c8b944
 +bd3fd7886d0148932d954e6ea9a3edaca1c8b944
 +cf-python_1.3.orig.tar.gz
 +b26a07fdf95aaff7cff6b34926637c440705cc54
 +3676025
diff --cc debian/patches/0003-Fixed-man-page-cfa.1.patch
index 0000000,0000000..eaa1cb6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Fixed-man-page-cfa.1.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 81ec8d9aca447f3038fe67d434de2be07e7ed53c Mon Sep 17 00:00:00 2001
++From: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++Date: Fri, 9 Sep 2016 14:08:33 +0200
++Subject: Fixed man page cfa.1.
++
++Signed-off-by: Klaus Zimmermann <klaus_zimmermann at gmx.de>
++---
++ scripts/man1/cfa.1 | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/scripts/man1/cfa.1 b/scripts/man1/cfa.1
++index e858f18..145990e 100644
++--- a/scripts/man1/cfa.1
+++++ b/scripts/man1/cfa.1
++@@ -153,7 +153,7 @@ By default, NETCDF3_CLASSIC is assumed.
++ Display the man page.
++ .
++ .
++-..
+++.
++ .TP
++ .B \-o outfile, \-\-outfile=file
++ Set the output netCDF file name. In this case the CF fields from all
diff --cc debian/patches/series
index ca3dc3e,0000000..e03a43c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Removed-bundled-versions-of-javascript-libraries.patch
 +0002-Remove-check-for-python-version.patch
++0003-Fixed-man-page-cfa.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cf-python.git