[pnetcdf] 03/08: Next iteration

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Jan 24 09:06:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository pnetcdf.

commit b022a39ebbb49bdbe52c7d8bfb033bbd9bd41929
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 17 07:50:26 2016 +0000

    Next iteration
---
 debian/changelog                  |  2 +-
 debian/control                    | 42 +++++++++++++++++++++++++--
 debian/libpnetcdf-dev.docs        |  6 ++++
 debian/libpnetcdf-dev.install     |  2 ++
 debian/libpnetcdf0.install        |  1 +
 debian/patches/destdir.patch      | 61 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 debian/pnetcdf-bin.install        |  2 ++
 {source => debian/source}/format  |  0
 {source => debian/source}/options |  0
 10 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 246c417..5faf8af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 pnetcdf (1.7.0~pre1-1) UNRELEASED; urgency=medium
 
-  * Initial release. (Closes: #XXXXXX)
+  * Initial release. (Closes: #812187)
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 19 Jan 2016 18:52:30 +0000
diff --git a/debian/control b/debian/control
index a093257..6628455 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,11 @@
 Source: pnetcdf
-Section: utils
+Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstey at debian.org>
-Build-Depends: autoconf, automake
+Build-Depends: autoconf, automake, dh-autoreconf,
+ gfortran, mpi-default-dev,
+ texlive-latex-base, ghostscript,
+ debhelper (>= 9)
 Standards-Version: 3.9.6
 Homepage: https://trac.mcs.anl.gov/projects/parallel-netcdf
 
@@ -10,7 +13,7 @@ Package: libpnetcdf-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libcdi0 (= ${binary:Version})
+Depends: ${misc:Depends}
 Description: Development files for the parallel netCDF library
  PnetCDF is a library providing high-performance parallel I/O while still
  maintaining file-format compatibility with  Unidata's NetCDF, 
@@ -22,3 +25,36 @@ Description: Development files for the parallel netCDF library
  In addition, PnetCDF supports the CDF-5 file format, an extension of CDF-2,
  that supports more data types and allows users to define large dimensions, 
  attributes, and variables (>2B elements).
+
+
+Package: pnetcdf-bin
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Programs for reading and writing parallel NetCDF files
+ Contains tools for working on netCDF files in parallel.
+ .
+ PnetCDF provides high-performance parallel I/O while still
+ maintaining file-format compatibility with  Unidata's NetCDF,
+ specifically the formats of CDF-1 and CDF-2. 
+ .
+ In addition, PnetCDF supports the CDF-5 file format, an extension of CDF-2,
+ that supports more data types and allows users to define large dimensions,
+ attributes, and variables (>2B elements).
+
+#Package: libpnetcdf0d
+#Architecture: any
+#Section: libs
+#Depends: ${shlibs:Depends},
+#         ${misc:Depends}
+#Description: Libraryfor reading and writing parallel NetCDF files
+# PnetCDF provides high-performance parallel I/O while still
+# maintaining file-format compatibility with  Unidata's NetCDF,
+# specifically the formats of CDF-1 and CDF-2. 
+# .
+# In addition, PnetCDF supports the CDF-5 file format, an extension of CDF-2,
+# that supports more data types and allows users to define large dimensions,
+# attributes, and variables (>2B elements).
+# .
+# This package provides the static library libpnetcdf.a
+ 
diff --git a/debian/libpnetcdf-dev.docs b/debian/libpnetcdf-dev.docs
new file mode 100644
index 0000000..b558c3b
--- /dev/null
+++ b/debian/libpnetcdf-dev.docs
@@ -0,0 +1,6 @@
+CREDITS
+README
+RELEASE_NOTES
+doc/*.txt
+doc/*.pdf
+
diff --git a/debian/libpnetcdf-dev.install b/debian/libpnetcdf-dev.install
new file mode 100644
index 0000000..47d369f
--- /dev/null
+++ b/debian/libpnetcdf-dev.install
@@ -0,0 +1,2 @@
+usr/include/*
+usr/share/man/man3/*
diff --git a/debian/libpnetcdf0.install b/debian/libpnetcdf0.install
new file mode 100644
index 0000000..365bef5
--- /dev/null
+++ b/debian/libpnetcdf0.install
@@ -0,0 +1 @@
+usr/lib/libpnetcdf.a
diff --git a/debian/patches/destdir.patch b/debian/patches/destdir.patch
new file mode 100644
index 0000000..847e9d5
--- /dev/null
+++ b/debian/patches/destdir.patch
@@ -0,0 +1,61 @@
+Index: pnetcdf-1.7.0~pre1/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)
+ 	@echo '+----------------------------------------------------------------------------+'
+ 	@echo '|'
+-	@echo '|  PnetCDF has been successfully installed under $(prefix)'
++	@echo '|  PnetCDF has been successfully installed under $(DESTDIR)$(prefix)'
+ 	@echo '|'
+-	@echo '|  * PnetCDF header files are installed in $(prefix)/include'
+-	@echo '|  * PnetCDF library file is installed in $(prefix)/lib'
+-	@echo '|  * PnetCDF utility programs are installed in $(prefix)/bin'
+-	@echo '|  * PnetCDF man pages are installed in $(prefix)/man/man1 and'
+-	@echo '|    $(prefix)/man/man3'
++	@echo '|  * PnetCDF header files are installed in $(DESTDIR)$(prefix)/include'
++	@echo '|  * PnetCDF library file is installed in $(DESTDIR)$(prefix)/lib'
++	@echo '|  * PnetCDF utility programs are installed in $(DESTDIR)$(prefix)/bin'
++	@echo '|  * PnetCDF man pages are installed in $(DESTDIR)$(prefix)/man/man1 and'
++	@echo '|    $(DESTDIR)$(prefix)/man/man3'
+ 	@echo '|'
+ 	@echo '|  To compile your PnetCDF programs, please add the following to the command'
+ 	@echo '|  line, so the compiler can find the PnetCDF header files:'
+-	@echo '|      -I$(prefix)/include'
++	@echo '|      -I$(DESTDIR)$(prefix)/include'
+ 	@echo '|'
+ 	@echo '|  Add the following line to link your program to PnetCDF library:'
+-	@echo '|      -L$(prefix)/lib -lpnetcdf'
++	@echo '|      -L$(DESTDIR)$(prefix)/lib -lpnetcdf'
+ 	@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:
+ 	$(RM) -f $@
+ 	id=$(PACKAGE_FILENAME) \
+ 	&& $(RM) -f $$id \
+-	&& $(LN_S) $(prefix) $$id \
++	&& $(LN_S) $(DESTDIR)$(prefix) $$id \
+ 	&& 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/series b/debian/patches/series
new file mode 100644
index 0000000..9a5ac8d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+destdir.patch
diff --git a/debian/pnetcdf-bin.install b/debian/pnetcdf-bin.install
new file mode 100644
index 0000000..9fba287
--- /dev/null
+++ b/debian/pnetcdf-bin.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/man/man1*
diff --git a/source/format b/debian/source/format
similarity index 100%
rename from source/format
rename to debian/source/format
diff --git a/source/options b/debian/source/options
similarity index 100%
rename from source/options
rename to debian/source/options

-- 
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