[DebianGIS-dev] r2809 - in packages/netcdf/branches/4.1/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-04-03 09:03:20 +0000 (Sat, 03 Apr 2010)
New Revision: 2809

Removed:
   packages/netcdf/branches/4.1/debian/patches/test
Modified:
   packages/netcdf/branches/4.1/debian/changelog
   packages/netcdf/branches/4.1/debian/patches/series
   packages/netcdf/branches/4.1/debian/rules
Log:
Upgraded to 4.1.1-rc3


Modified: packages/netcdf/branches/4.1/debian/changelog
===================================================================
--- packages/netcdf/branches/4.1/debian/changelog	2010-04-01 22:53:40 UTC (rev 2808)
+++ packages/netcdf/branches/4.1/debian/changelog	2010-04-03 09:03:20 UTC (rev 2809)
@@ -1,10 +1,12 @@
-netcdf (1:4.1.1~rc2-2) experimental; urgency=low
+netcdf (1:4.1.1~rc3-1) experimental; urgency=low
 
+  * New upstream pre-release with various building fix merged. Thanks Ed
+    and other UCAR folks.
   * Now OpenDAP support has been enabled: added required buil-deps on both.
         libdap-dev
         libcurl4-gnutls-dev
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 24 Mar 2010 13:02:50 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 03 Apr 2010 10:13:53 +0200
 
 netcdf (1:4.1.1~rc2-1) experimental; urgency=low
 

Modified: packages/netcdf/branches/4.1/debian/patches/series
===================================================================
--- packages/netcdf/branches/4.1/debian/patches/series	2010-04-01 22:53:40 UTC (rev 2808)
+++ packages/netcdf/branches/4.1/debian/patches/series	2010-04-03 09:03:20 UTC (rev 2809)
@@ -1,3 +1,2 @@
 # no patches currently
 cfortran
-test

Deleted: packages/netcdf/branches/4.1/debian/patches/test
===================================================================
--- packages/netcdf/branches/4.1/debian/patches/test	2010-04-01 22:53:40 UTC (rev 2808)
+++ packages/netcdf/branches/4.1/debian/patches/test	2010-04-03 09:03:20 UTC (rev 2809)
@@ -1,40 +0,0 @@
-Index: netcdf-4.1.1-rc2/libcf/src/Makefile.am
-===================================================================
---- netcdf-4.1.1-rc2.orig/libcf/src/Makefile.am	2010-03-23 14:32:20.000000000 +0100
-+++ netcdf-4.1.1-rc2/libcf/src/Makefile.am	2010-03-23 14:32:30.000000000 +0100
-@@ -23,11 +23,11 @@
- tst_subsets
- 
- if BUILD_F90
--lib_LTLIBRARIES += libcff.la
-+lib_LTLIBRARIES += libcff.la libnetcdff90.la libnetcdff.la
- libcff_la_SOURCES = cffcvars.f90
- check_PROGRAMS += tst_f03_file
- tst_f03_file_SOURCES = tst_f03_file.f90
--LDADD += libcf.la
-+LDADD += libcf.la ../../f90/libnetcdff90.la ../../fortran/libnetcdff.la ../../ncdump/nctime.o
- nodist_include_HEADERS = libcf.mod
- if UPPER_CASE_MOD
- LIBCF.mod: cffcvars.o
-Index: netcdf-4.1.1-rc2/libcf/src/Makefile.in
-===================================================================
---- netcdf-4.1.1-rc2.orig/libcf/src/Makefile.in	2010-03-23 14:32:26.000000000 +0100
-+++ netcdf-4.1.1-rc2/libcf/src/Makefile.in	2010-03-23 14:32:30.000000000 +0100
-@@ -52,7 +52,7 @@
- @USE_NETCDF_DIR_TRUE at am__append_4 = -lnetcdf
- @USE_NETCDF_DIR_TRUE at am__append_5 = -I at NETCDFDIR@/include
- @USE_NETCDF_DIR_TRUE at am__append_6 = -L at NETCDFDIR@/lib
-- at USE_NETCDF4_TRUE@@USE_NETCDF_DIR_FALSE at am__append_7 = ../../libsrc4/libnetcdf.la 
-+ at USE_NETCDF4_TRUE@@USE_NETCDF_DIR_FALSE at am__append_7 = ../../libsrc4/libnetcdf.la  ../../f90/libnetcdff90.la ../../fortran/libnetcdff.la ../../ncdump/nctime.o
- @USE_NETCDF4_TRUE@@USE_NETCDF_DIR_FALSE at am__append_8 = -I$(top_srcdir)/../libsrc4
- @USE_NETCDF4_TRUE@@USE_NETCDF_DIR_FALSE at am__append_9 = -L../../libsrc4
- @USE_NETCDF4_FALSE@@USE_NETCDF_DIR_FALSE at am__append_10 = ../../libsrc/libnetcdf.la
-@@ -114,7 +114,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
- 	"$(DESTDIR)$(includedir)"
--LTLIBRARIES = $(lib_LTLIBRARIES)
-+LTLIBRARIES = $(lib_LTLIBRARIES)  ../../f90/libnetcdff90.la ../../fortran/libnetcdff.la
- libcf_la_LIBADD =
- am_libcf_la_OBJECTS = nccoord.lo cffiles.lo cfvars.lo cfcvars.lo \
- 	cfsubsets.lo cferror.lo cdTimeConv.lo

Modified: packages/netcdf/branches/4.1/debian/rules
===================================================================
--- packages/netcdf/branches/4.1/debian/rules	2010-04-01 22:53:40 UTC (rev 2808)
+++ packages/netcdf/branches/4.1/debian/rules	2010-04-03 09:03:20 UTC (rev 2809)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # change at every upstream upgrade
-DEB_TAR_SRCDIR = netcdf-4.1.1-rc2
+DEB_TAR_SRCDIR = netcdf-4.1.1-rc3
 DEB_TARBALL = $(CURDIR)/upstream/$(DEB_TAR_SRCDIR).tar.gz
 SRC_TREE = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)