[Git][debian-gis-team/netcdf-fortran][master] Update reproducible-settings.patch with changes by Chris Lamb. (closes: #962401)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / netcdf-fortran


Commits:
e7299665 by Bas Couwenberg at 2020-06-07T17:05:17+02:00
Update reproducible-settings.patch with changes by Chris Lamb. (closes: #962401)

- - - - -


2 changed files:

- debian/changelog
- debian/patches/reproducible-settings.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+netcdf-fortran (4.5.3+ds-2) UNRELEASED; urgency=medium
+
+  * Update reproducible-settings.patch with changes by Chris Lamb.
+    (closes: #962401)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Jun 2020 17:04:37 +0200
+
 netcdf-fortran (4.5.3+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/reproducible-settings.patch
=====================================
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/libnetcdff.settings.in
 +++ b/libnetcdff.settings.in
-@@ -4,9 +4,6 @@
+@@ -4,15 +4,12 @@
  # General
  -------
  Library Version:		@PACKAGE_VERSION@
@@ -13,3 +13,20 @@ Author: Bas Couwenberg <sebastic at debian.org>
  Install Prefix:                 @prefix@
  
  # Compiling Options
+ -----------------
+ Fortran Compiler:               @FC_VERSION@
+-FFLAGS:                         @FFLAGS@
++FFLAGS:                         @FFLAGS_FILTERED@
+ LDFLAGS:		        @LDFLAGS@
+ AM_LDFLAGS:                     @AM_LDFLAGS@
+ Shared Library:		        @enable_shared@
+--- a/configure.ac
++++ b/configure.ac
+@@ -600,6 +600,7 @@ AC_SUBST(HAS_PNETCDF,[$nc_has_pnetcdf])
+ AC_SUBST(HAS_NC4_PARALLEL,[$nc_has_parallel4])
+ AC_SUBST(HAS_PARALLEL,[$nc_has_parallel])
+ AC_SUBST([AM_LDFLAGS])
++AC_SUBST(FFLAGS_FILTERED,[`echo "$FFLAGS" | sed -e 's@ [[^ ]]*-f\(file\|debug\)-prefix-map=[[^ ]]*@@g'`])
+ 
+ # Some files need to exist in build directories that do not correspond
+ # to their source directory, or the test program makes an assumption



View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf-fortran/-/commit/e7299665020f620166173f602a020f6e10178e9a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf-fortran/-/commit/e7299665020f620166173f602a020f6e10178e9a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200607/eacaf7eb/attachment-0001.html>