[pnetcdf] 07/08: Put inc, mod files in /usr/include/$(ARCH) as not arch-independent

[Alastair McKinstry]

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

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

commit 71576693007426a21f89bc95b3ca4bea70ca5e3c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jun 14 16:05:01 2016 +0100

    Put inc, mod files in /usr/include/$(ARCH) as not arch-independent
---
 debian/changelog              | 6 ++++--
 debian/libpnetcdf-dev.install | 4 +++-
 debian/rules                  | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa11148..19ec153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
-pnetcdf (1.7.0-1) UNRELEASED; urgency=medium
+pnetcdf (1.7.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Add dependency on libpnetcdf0d to -dev package.
   * Add pkgconfig support
   * Make libpnetcdf0d properly Multi-Arch. Closes: #815821.
+  * Put inc, mod files in /usr/include/$(ARCH) as not
+    arch-independent
   * Ensure no rpath in shared lib.
   * Move to Standards-Version: 3.9.8
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 19 Feb 2016 06:15:51 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 14 Jun 2016 16:04:59 +0100
 
 pnetcdf (1.7.0~pre1-1) unstable; urgency=medium
 
diff --git a/debian/libpnetcdf-dev.install b/debian/libpnetcdf-dev.install
index fcea134..b65788f 100644
--- a/debian/libpnetcdf-dev.install
+++ b/debian/libpnetcdf-dev.install
@@ -1,3 +1,5 @@
-usr/include/*
+usr/include/pnetcdf.h
+usr/include/*/pnetcdf.inc
+usr/include/*/pnetcdf.mod
 usr/share/man/man3/*
 usr/lib/*/libpnetcdf.a
diff --git a/debian/rules b/debian/rules
index 64e4329..0f9c677 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ export DH_VERBOSE=1
 DESTDIR:=$(CURDIR)/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+INCDIR:=/usr/include/$(DEB_HOST_MULTIARCH)
 
 # To enable all, uncomment following line
 DEB_BUILD_MAINT_OPTIONS:= hardening=+all
@@ -39,7 +40,8 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	$(MAKE) -C build-static install DESTDIR=$(DESTDIR)
-	mkdir -p $(DESTDIR)/$(LIBDIR) $(DESTDIR)/usr/share
+	mkdir -p $(DESTDIR)/$(LIBDIR) $(DESTDIR)/usr/share $(DESTDIR)/$(INCDIR)
+	cp $(DESTDIR)/usr/include/pnetcdf.inc $(DESTDIR)/usr/include/pnetcdf.mod $(DESTDIR)/$(INCDIR)
 	cp -a $(DESTDIR)/usr/man $(DESTDIR)/usr/share
 	cp -a $(DESTDIR)/usr/lib/lib* $(DESTDIR)/$(LIBDIR)
 	cp -a build-shared/src/lib/$(SHLIB) $(DESTDIR)/$(LIBDIR)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pnetcdf.git