[pnetcdf] 04/06: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 20 14:12:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository pnetcdf.
commit 3f6220cc9c91452d591e08f0f27a8d9099d52abf
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Apr 20 14:05:05 2017 +0100
refresh patches
---
debian/patches/destdir.patch | 33 +++++++--------------------------
debian/patches/hardening.patch | 27 +++++++--------------------
debian/patches/manpages.patch | 12 ++++++------
debian/patches/pkgconfig.patch | 16 ++--------------
4 files changed, 22 insertions(+), 66 deletions(-)
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
index e28ad97..6d12a94 100644
--- a/debian/patches/destdir.patch
+++ b/debian/patches/destdir.patch
@@ -2,14 +2,14 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Description: Add DESTDIR support so that installs can be staged
in $DESTDIR for packaging builds
Forwarded: no
-Last-Updated: 2016-01-23
+Last-Updated: 2017-04-20
-Index: pnetcdf-1.7.0~pre1/Makefile.in
+Index: pnetcdf-1.8.1/Makefile.in
===================================================================
---- pnetcdf-1.7.0~pre1.orig/Makefile.in
-+++ pnetcdf-1.7.0~pre1/Makefile.in
-@@ -103,20 +103,20 @@ INSTALLDIRS = $(INSTALL_SUBDIRS:%=instal
- install: $(INSTALLDIRS)
+--- pnetcdf-1.8.1.orig/Makefile.in
++++ pnetcdf-1.8.1/Makefile.in
+@@ -113,20 +113,20 @@ INSTALLDIRS = $(INSTALL_SUBDIRS:%=instal
+ install: $(INSTALLDIRS) install_PKGCONFIG install_CONFIG
@echo '+----------------------------------------------------------------------------+'
@echo '|'
- @echo '| PnetCDF has been successfully installed under $(prefix)'
@@ -37,7 +37,7 @@ Index: pnetcdf-1.7.0~pre1/Makefile.in
@echo '|'
@echo '| PnetCDF is jointly developed by a team at Northwestern University and'
@echo '| Argonne National Laboratory.'
-@@ -202,7 +202,7 @@ $(FTPBINDIR)/$(PACKAGE_FILENAME).tar.Z:
+@@ -231,7 +231,7 @@ $(FTPBINDIR)/$(PACKAGE_FILENAME).tar.Z:
$(RM) -f $@
id=$(PACKAGE_FILENAME) \
&& $(RM) -f $$id \
@@ -46,22 +46,3 @@ Index: pnetcdf-1.7.0~pre1/Makefile.in
&& tar $(TARFLAGS) - README $$id/bin $$id/include \
$$id/lib $$id/man | compress > $@ \
&& $(RM) -f $$id
-Index: pnetcdf-1.7.0~pre1/macros.make.in
-===================================================================
---- pnetcdf-1.7.0~pre1.orig/macros.make.in
-+++ pnetcdf-1.7.0~pre1/macros.make.in
-@@ -13,10 +13,10 @@ LN_S = @LN_S@
- # Installation Directories:
- # SRCDIR = @SRCDIR@
- prefix = @prefix@
--INCDIR = $(prefix)/include
--LIBDIR = $(prefix)/lib
--BINDIR = $(prefix)/bin
--MANDIR = $(prefix)/man
-+INCDIR = $(DESTDIR)$(prefix)/include
-+LIBDIR = $(DESTDIR)$(prefix)/lib
-+BINDIR = $(DESTDIR)$(prefix)/bin
-+MANDIR = $(DESTDIR)$(prefix)/man
- BUILDDIR = @BUILDDIR@
- LIBRARY = @BUILDDIR@/src/lib/libpnetcdf.a
-
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 3dd7d44..3bc6c79 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,32 +1,19 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Use $(CFLAGS), $(LDFLAGS) when using CC compiler
Needed to ensure hardedning options are passed
-Last-Updated: 2016-01-23
+Last-Updated: 2017-04-20
Forwarded: no
-Index: pnetcdf-1.7.0~pre1/macros.make.in
+Index: pnetcdf-1.8.1/macros.make.in
===================================================================
---- pnetcdf-1.7.0~pre1.orig/macros.make.in
-+++ pnetcdf-1.7.0~pre1/macros.make.in
-@@ -48,7 +48,7 @@ MPICXX = @MPICXX@
+--- pnetcdf-1.8.1.orig/macros.make.in
++++ pnetcdf-1.8.1/macros.make.in
+@@ -69,7 +69,7 @@ MPICXX = @MPICXX@
MPIF77 = @MPIF77@
MPIF90 = @MPIF90@
--SEQ_CC = @SEQ_CC@
-+SEQ_CC = @SEQ_CC@ @CFLAGS@ @LDFLAGS@
+-SEQ_CC = @SEQ_CC@
++SEQ_CC = @SEQ_CC@ @CFLAGS@ @LDFLAGS@
# debugging and optimization options for compiling and linking
CFLAGS = @CFLAGS@
-Index: pnetcdf-1.7.0~pre1/src/utils/pnetcdf_version/Makefile.in
-===================================================================
---- pnetcdf-1.7.0~pre1.orig/src/utils/pnetcdf_version/Makefile.in
-+++ pnetcdf-1.7.0~pre1/src/utils/pnetcdf_version/Makefile.in
-@@ -38,7 +38,7 @@ GARBAGE = $(PROGRAM)
- all: $(PROGRAM)
-
- pnetcdf_version: pnetcdf_version.c
-- $(SEQ_CC) $(DEFS) -o $@ $<
-+ $(SEQ_CC) $(DEFS) -o $@ $<
-
- install: $(PROGRAM) $(MANUAL)
- $(INSTALL) -d -m 755 $(MANDIR)/man1
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
index 59f7bdb..344667f 100644
--- a/debian/patches/manpages.patch
+++ b/debian/patches/manpages.patch
@@ -3,10 +3,10 @@ Description: Minor manpage fixes needed for Debian
Last-Updated: 2016-01-23
Forwarded: no
-Index: pnetcdf-1.7.0~pre1/man/pnetcdf_f90.m4
+Index: pnetcdf-1.8.1/man/pnetcdf_f90.m4
===================================================================
---- pnetcdf-1.7.0~pre1.orig/man/pnetcdf_f90.m4
-+++ pnetcdf-1.7.0~pre1/man/pnetcdf_f90.m4
+--- pnetcdf-1.8.1.orig/man/pnetcdf_f90.m4
++++ pnetcdf-1.8.1/man/pnetcdf_f90.m4
@@ -1,7 +1,7 @@
.nr yr \n(yr+1900
.af mo 01
@@ -16,10 +16,10 @@ Index: pnetcdf-1.7.0~pre1/man/pnetcdf_f90.m4
.SH NAME
PnetCDF \- Parallel library for accessing files in Network Common Data Form (CDF, CDF-2 and CDF-5 formats)
.SH SYNOPSIS
-Index: pnetcdf-1.7.0~pre1/src/utils/ncmpigen/ncmpigen.1
+Index: pnetcdf-1.8.1/src/utils/ncmpigen/ncmpigen.1
===================================================================
---- pnetcdf-1.7.0~pre1.orig/src/utils/ncmpigen/ncmpigen.1
-+++ pnetcdf-1.7.0~pre1/src/utils/ncmpigen/ncmpigen.1
+--- pnetcdf-1.8.1.orig/src/utils/ncmpigen/ncmpigen.1
++++ pnetcdf-1.8.1/src/utils/ncmpigen/ncmpigen.1
@@ -338,7 +338,7 @@ are all acceptable \fIfloat\fP constants
-2.0f
3.14159265358979f // will be truncated to less precision
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index e4cca7f..af51667 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,22 +3,10 @@ Description: Add pkgconfig support
Last-Updated: 2016-02-19
Forwarded: no
-Index: pnetcdf-1.7.0~pre1/configure.in
-===================================================================
---- pnetcdf-1.7.0~pre1.orig/configure.in
-+++ pnetcdf-1.7.0~pre1/configure.in
-@@ -1124,6 +1124,7 @@ AC_SUBST(SEQ_CC)
- AC_CONFIG_HEADERS([src/libf/nfconfig_inc])
- AC_CONFIG_FILES(macros.make \
- Makefile \
-+ src/pkgconfig/pnetcdf.pc \
- src/Makefile \
- src/lib/Makefile \
- src/lib/pnetcdf.h \
-Index: pnetcdf-1.7.0~pre1/pnetcdf.pc.in
+Index: pnetcdf-1.8.1/src/pkgconfig/pnetcdf.pc.in
===================================================================
--- /dev/null
-+++ pnetcdf-1.7.0~pre1/src/pkgconfig/pnetcdf.pc.in
++++ pnetcdf-1.8.1/src/pkgconfig/pnetcdf.pc.in
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pnetcdf.git
More information about the debian-science-commits
mailing list