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

Wed Mar 24 11:40:20 UTC 2010

Author: frankie
Date: 2010-03-24 11:40:19 +0000 (Wed, 24 Mar 2010)
New Revision: 2795

Added:
   packages/netcdf/branches/4.1/debian/patches/test
Modified:
   packages/netcdf/branches/4.1/debian/changelog
   packages/netcdf/branches/4.1/debian/netcdf-doc.info
   packages/netcdf/branches/4.1/debian/patches/series
   packages/netcdf/branches/4.1/debian/rules
Log:
New upstream pre-release.


Modified: packages/netcdf/branches/4.1/debian/changelog
===================================================================

--- packages/netcdf/branches/4.1/debian/changelog	2010-03-23 21:35:19 UTC (rev 2794)
+++ packages/netcdf/branches/4.1/debian/changelog	2010-03-24 11:40:19 UTC (rev 2795)
@@ -1,3 +1,11 @@
+netcdf (1:4.1.1~rc2-1) experimental; urgency=low
+
+  * New upstream pre-release.
+  * Added a test patch to fix a linking problem with some test programs
+    used at check time.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 23 Mar 2010 13:47:27 +0100
+
 netcdf (1:4.1~beta2-1) experimental; urgency=low
 
   [ Francesco Paolo Lovergine ]

Modified: packages/netcdf/branches/4.1/debian/netcdf-doc.info
===================================================================
--- packages/netcdf/branches/4.1/debian/netcdf-doc.info	2010-03-23 21:35:19 UTC (rev 2794)
+++ packages/netcdf/branches/4.1/debian/netcdf-doc.info	2010-03-24 11:40:19 UTC (rev 2795)
@@ -1,6 +1,5 @@
 debian/tmp/usr/share/info/netcdf-tutorial.info
 debian/tmp/usr/share/info/netcdf-cxx.info
-debian/tmp/usr/share/info/netcdf-cxx4.info
 debian/tmp/usr/share/info/netcdf-c.info
 debian/tmp/usr/share/info/netcdf-f77.info
 debian/tmp/usr/share/info/netcdf.info

Modified: packages/netcdf/branches/4.1/debian/patches/series
===================================================================
--- packages/netcdf/branches/4.1/debian/patches/series	2010-03-23 21:35:19 UTC (rev 2794)
+++ packages/netcdf/branches/4.1/debian/patches/series	2010-03-24 11:40:19 UTC (rev 2795)
@@ -1,2 +1,3 @@
 # no patches currently
 cfortran
+test

Added: packages/netcdf/branches/4.1/debian/patches/test
===================================================================
--- packages/netcdf/branches/4.1/debian/patches/test	                        (rev 0)
+++ packages/netcdf/branches/4.1/debian/patches/test	2010-03-24 11:40:19 UTC (rev 2795)
@@ -0,0 +1,40 @@
+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-03-23 21:35:19 UTC (rev 2794)
+++ packages/netcdf/branches/4.1/debian/rules	2010-03-24 11:40:19 UTC (rev 2795)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # change at every upstream upgrade
-DEB_TAR_SRCDIR = netcdf-4.1-beta2
+DEB_TAR_SRCDIR = netcdf-4.1.1-rc2
 DEB_TARBALL = $(CURDIR)/upstream/$(DEB_TAR_SRCDIR).tar.gz
 SRC_TREE = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)
   
@@ -14,14 +14,14 @@
 
 # Note that hdf5 dir has to be specified due to a bug into fortran/Makefile.am which causes
 # skipping of fort-nc4.c without that.
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf 
 DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran"
 DEB_CONFIGURE_SCRIPT_ENV += CXX="g++"
 DEB_CONFIGURE_SCRIPT_ENV += CC="gcc"
 DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran"
 
 # Test fails currently
-#DEB_MAKE_CHECK_TARGET = check
+DEB_MAKE_CHECK_TARGET = check
 
 DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES
 
@@ -37,7 +37,8 @@
 	install -m 644 -o root -g root  $(SRC_TREE)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/.
 	# removes an erroneous libpath due to an upstream oversight in configure.ac
 	sed -i -e 's,-L/usr ,,' -e 's, at FLIBS@,,' debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
-	find debian/tmp/usr/lib/ -type l -a -name '*.so' -exec cp {} debian/libnetcdf-dev/usr/lib/. \;
+	# move links and files
+	find debian/tmp/usr/lib/ -type l -a -name '*.so' -exec cp -P {} debian/libnetcdf-dev/usr/lib/. \;
 	find debian/tmp/usr/lib/ -type f -a -name '*.a' -exec cp {} debian/libnetcdf-dev/usr/lib/. \;
 
 install/netcdf-bin::


