[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 564918d4865990fde4237b3458401dcd2e78b861
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Oct 25 14:48:16 2011 +0200

    Moving to new upstream release.

diff --git a/debian/changelog b/debian/changelog
index fda53bc..1afc8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netcdf (1:4.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Moved to source format 3.0 with direct quilt support.
+  * Dropped all current patches (obsolete or applied upstream).
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 25 Oct 2011 14:43:38 +0200
+
 netcdf (1:4.1.1-6) unstable; urgency=low
 
   * Moved repository to git.
diff --git a/debian/control b/debian/control
index 09669e5..2c75ffd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, quilt, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev,
+Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev,
  texlive-base, texlive-latex-base
 Standards-Version: 3.9.2
 Homepage: http://www.unidata.ucar.edu/software/netcdf/
diff --git a/debian/patches/series b/debian/patches/series
index 7f09501..ca0aa34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-la_libadd_fix
-noshutdown
-dumplib
+#la_libadd_fix
+#noshutdown
+#dumplib
diff --git a/debian/rules b/debian/rules
index ff1f983..0f475d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 
-# change at every upstream upgrade
-DEB_TAR_SRCDIR = netcdf-4.1.1
-DEB_TARBALL = $(CURDIR)/upstream/$(DEB_TAR_SRCDIR).tar.gz
-SRC_TREE = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)
-  
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Add here any variable or target overrides you need.
 
@@ -25,9 +18,9 @@ DEB_CONFIGURE_SCRIPT_ENV += CC="gcc"
 DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran"
 
 # Test fails under buildds currently
-#DEB_MAKE_CHECK_TARGET = check
+DEB_MAKE_CHECK_TARGET = check
 
-DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES
+#DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES
 
 # Any makebuilddir/binary would do, /source doesn't:
 #makebuilddir/libnetcdf4::

-- 
The NetCDF Library