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

sebastic pushed a commit to branch master
in repository netcdf4-python.

commit 4ee886733b31feb6292ba6ce1f80ae38bfb538ba
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jun 5 00:10:47 2015 +0200

    Drop nc4tonc3-indentation.patch, applied upstream.
---
 debian/changelog                          |  1 +
 debian/patches/nc4tonc3-indentation.patch | 22 ----------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65a18ca..3ac4606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ netcdf4-python (1.1.8-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Add myself to Uploaders.
+  * Drop nc4tonc3-indentation.patch, applied upstream.
 
  -- Bas Couwenberg <sebas...@debian.org>  Thu, 04 Jun 2015 23:12:36 +0200
 
diff --git a/debian/patches/nc4tonc3-indentation.patch 
b/debian/patches/nc4tonc3-indentation.patch
deleted file mode 100644
index 509e984..0000000
--- a/debian/patches/nc4tonc3-indentation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: nc4tonc3 -h fails due to indentation errors
- Tabs used instead of spaces.
-Bug: https://github.com/Unidata/netcdf4-python/issues/378
-Forwarded: https://github.com/Unidata/netcdf4-python/pull/379
-Author: Ross Gammon <rossgam...@mail.dk>
-Last-Update: 2015-03-22
-
---- netcdf4-python.orig/utils/nc4tonc3
-+++ netcdf4-python/utils/nc4tonc3
-@@ -38,9 +38,9 @@
-             FillValue = None 
-         var = 
ncfile3.createVariable(varname,ncvar.dtype,ncvar.dimensions,fill_value=FillValue)
-         # fill variable attributes.
--      attdict = ncvar.__dict__
--      if '_FillValue' in attdict: del attdict['_FillValue']
--      var.setncatts(attdict)
-+        attdict = ncvar.__dict__
-+        if '_FillValue' in attdict: del attdict['_FillValue']
-+        var.setncatts(attdict)
-         #for attname in ncvar.ncattrs():
-         #    if attname == '_FillValue': continue
-         #    setattr(var,attname,getattr(ncvar,attname))
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3f24802..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-nc4tonc3-indentation.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

Reply via email to