This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf4-python.
commit ead655b06ae0b1ac51a7d3691f83b9b2b311016e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jul 31 01:13:24 2015 +0200 Drop patches, applied upstream. --- debian/changelog | 1 + debian/patches/cython-clean.patch | 16 ----------- debian/patches/fix-manpage-syntax.patch | 49 --------------------------------- debian/patches/no-online-tests.patch | 19 ------------- debian/patches/series | 3 -- 5 files changed, 1 insertion(+), 87 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1e0c17..f8d1c91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ netcdf4-python (1.1.9-1) UNRELEASED; urgency=medium * New upstream release. + * Drop patches, applied upstream. -- Bas Couwenberg <sebas...@debian.org> Fri, 31 Jul 2015 01:08:35 +0200 diff --git a/debian/patches/cython-clean.patch b/debian/patches/cython-clean.patch deleted file mode 100644 index 6a7eb58..0000000 --- a/debian/patches/cython-clean.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Don't compile netCDF4.pyx on clean. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/Unidata/netcdf4-python/pull/427 -Applied-Upstream: https://github.com/Unidata/netcdf4-python/commit/9560f1c89e4d5fd921ba790f5f6e2b337b93963e - ---- a/setup.py -+++ b/setup.py -@@ -353,7 +353,7 @@ else: - cmdclass = {} - netcdf4_src_root = osp.join('netCDF4', '_netCDF4') - netcdf4_src_c = netcdf4_src_root + '.c' --if has_cython and 'sdist' not in sys.argv[1:]: -+if has_cython and 'sdist' not in sys.argv[1:] and 'clean' not in sys.argv[1:]: - sys.stdout.write('using Cython to compile netCDF4.pyx...\n') - extensions = [Extension("netCDF4._netCDF4", - [netcdf4_src_root + '.pyx'], diff --git a/debian/patches/fix-manpage-syntax.patch b/debian/patches/fix-manpage-syntax.patch deleted file mode 100644 index 5d1261a..0000000 --- a/debian/patches/fix-manpage-syntax.patch +++ /dev/null @@ -1,49 +0,0 @@ -Description: Fix bolded closing bracket in man pages. - Previously fixed in commit f2a027d5026c54f02a93bc96a45a78f85b03cac2 - for man pages included in the Debian package only. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/Unidata/netcdf4-python/pull/429 -Applied-Upstream: https://github.com/Unidata/netcdf4-python/commit/0e5d2e0e6a3d9a29882b00c685dda61e5660be98 - ---- a/man/nc3tonc4.1 -+++ b/man/nc3tonc4.1 -@@ -6,15 +6,15 @@ - nc3tonc4 \- a program to convert netCDF 3 files to netCDF 4 format files - .SH SYNOPSIS - .B nc3tonc4 --.RB [\-h ] --.RB [\-o ] --.RB [\-\-vars=\fIvar1,var2,..\fR ] --.RB [\-\-zlib=\fI(0|1)\fR ] --.RB [\-\-complevel=\fI(1\-9)\fR ] --.RB [\-\-shuffle=\fI(0|1)\fR ] --.RB [\-\-fletcher32=\fI(0|1)\fR ] --.RB [\-\-unpackshort=\fI(0|1)\fR ] --.RB [\-\-quantize=\fIvar1=n1,var2=n2,..\fR ] -+.RB [ \-h ] -+.RB [ \-o ] -+.RB [ \-\-vars=\fIvar1,var2,..\fR ] -+.RB [ \-\-zlib=\fI(0|1)\fR ] -+.RB [ \-\-complevel=\fI(1\-9)\fR ] -+.RB [ \-\-shuffle=\fI(0|1)\fR ] -+.RB [ \-\-fletcher32=\fI(0|1)\fR ] -+.RB [ \-\-unpackshort=\fI(0|1)\fR ] -+.RB [ \-\-quantize=\fIvar1=n1,var2=n2,..\fR ] - .I netcdf3filename - .I netcdf4filename - .br ---- a/man/nc4tonc3.1 -+++ b/man/nc4tonc3.1 -@@ -6,9 +6,9 @@ - nc4tonc3 \- a program to convert a classic netCDF 4 file to netCDF 3 format - .SH SYNOPSIS - .B nc4tonc3 --.RB [\-h ] --.RB [\-o ] --.RB [\-\-chunk] -+.RB [ \-h ] -+.RB [ \-o ] -+.RB [ \-\-chunk ] - .I netcdf4filename - .I netcdf3filename - .br diff --git a/debian/patches/no-online-tests.patch b/debian/patches/no-online-tests.patch deleted file mode 100644 index 8901b16..0000000 --- a/debian/patches/no-online-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Don't run tests that require network connectivity if NO_NET is set. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/Unidata/netcdf4-python/pull/428 -Applied-Upstream: https://github.com/Unidata/netcdf4-python/commit/97b756ed70ff77c3042263e900b36565276781c5 - ---- a/test/run_all.py -+++ b/test/run_all.py -@@ -18,6 +18,11 @@ if __netcdf4libversion__ < '4.2.1': - test_files.remove('tst_diskless.py') - sys.stdout.write('not running tst_diskless.py ...\n') - -+# Don't run tests that require network connectivity -+if os.getenv('NO_NET'): -+ test_files.remove('tst_dap.py'); -+ sys.stdout.write('not running tst_dap.py ...\n') -+ - # Build the test suite from the tests found in the test files. - testsuite = unittest.TestSuite() - for f in test_files: diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9afe037..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -cython-clean.patch -no-online-tests.patch -fix-manpage-syntax.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.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