[petsc] 03/07: Build doc package from files installed for the debug package.

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit 5d83fcd0c9c1a7a8e2a78ea4538a357bac5dce7f
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Mar 11 23:27:38 2016 +0800

    Build doc package from files installed for the debug package.
    
    The architecture-independent doc package is built using doc (html)
    files taken from the architecture-dependent upstream installation of
    the real-debug package.  So the doc package needs to be specified
    alongside the debug package in debhelper commands.
    
    Closes: #817165.
---
 debian/changelog | 2 ++
 debian/rules     | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75b0d7d..8e6fa63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ petsc (3.6.3.dfsg1-1) UNRELEASED; urgency=medium
   * New upstream version.
   * debian/rules: only print the configure log of failed builds.
     Closes: #811257. 
+  * Build doc package from files installed for the debug package.
+    Closes: #817165.
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 11 Mar 2016 22:16:50 +0800
 
diff --git a/debian/rules b/debian/rules
index 808641c..9e4c724 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ CONFIGURATION_OPTIONS=--with-shared-libraries \
 
 override_dh_auto_clean:
 	if [ -d $(PETSC_DEBUG_BUILD_DIR) ]; then \
-	  dh_auto_clean -p$(PETSC_DEBUG_PACKAGE) -- \
+	  dh_auto_clean -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) -- \
 	    PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR); \
 	fi
 	if [ -d $(PETSC_BUILD_DIR) ]; then \
@@ -127,7 +127,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	@echo ===================== $(PETSC_DEBUG_PACKAGE) =====================
-	if dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) --  \
+	if dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
           --with-debugging=1  \
           --shared-library-extension=_real \
           --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
@@ -191,7 +191,7 @@ override_dh_auto_configure:
 
 
 override_dh_auto_build:
-	dh_auto_build -p$(PETSC_DEBUG_PACKAGE) --  \
+	dh_auto_build -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
           PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR)
 	dh_auto_build -p$(PETSC_VERSIONED_DEV_PACKAGE)  --  \
           PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR)
@@ -217,7 +217,7 @@ override_dh_auto_test:
 
 
 override_dh_auto_install:
-	dh_auto_install -p$(PETSC_DEBUG_PACKAGE) --destdir=$(PACKAGE_DEBUG_INSTALL_DIR) --  \
+	dh_auto_install -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --destdir=$(PACKAGE_DEBUG_INSTALL_DIR) --  \
           DESTDIR=$(PACKAGE_DEBUG_INSTALL_DIR)  \
           PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR)
 	dh_auto_install -p$(PETSC_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_INSTALL_DIR) --  \

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