[yorick] 01/01: Separate build-indep from build-arch

Thu May 21 16:02:32 UTC 2015

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

thibaut pushed a commit to branch master
in repository yorick.

commit 80b88e38834154aa758b331ce6522a2971f70a30
Author: Thibaut Paumard <thibaut at debian.org>
Date:   Thu May 21 18:02:16 2015 +0200

    Separate build-indep from build-arch
---
 debian/control |  3 ++-
 debian/rules   | 34 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 9bb1c84..c4b4a10 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,11 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Thibaut Paumard <thibaut at debian.org>
 Build-Depends: libx11-dev, texinfo, debhelper (>= 7.0.0), quilt (>= 0.40),
- imagemagick, po-debconf, mpi-default-dev,
+ po-debconf, mpi-default-dev,
  libmpich-dev   [!powerpcspe !sh4 !x32],
  libopenmpi-dev [!hppa !s390 !sh4 !x32 !s390x],
  xvfb, xauth, xfonts-base
+Build-Depends-Indep: imagemagick
 Standards-Version: 3.9.6
 Testsuite: autopkgtest
 Vcs-Git:      git://anonscm.debian.org/debian-science/packages/yorick.git
diff --git a/debian/rules b/debian/rules
index a302b1e..724e16d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,8 +41,22 @@ configure-stamp:
 
 BUILDDIR=../../build/
 build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
+build-arch: build-stamp build-mpy-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: build-stamp
+	sed 's/^.*Printed: .*$$//' -i build/doc/*.doc
+	cp debian/helpers/README build/doc
+	convert icons/yicon32.png build/yorick32x32.xpm
+	convert icons/yicon16.png build/yorick16x16.xpm
+	$(MAKE) -C doc/html BUILDDIR=$(BUILDDIR) manual refcard $(BUILDDIR)doc/README.html $(BUILDDIR)doc/images/triangle3.jpg $(BUILDDIR)doc/skull.css
+	cp doc/html/packinfo.txt build/00yorick.packinfo
+	cp doc/html/keywords.txt build/00yorick.keywords
+	cp doc/html/aliases.txt build/00yorick.aliases
+	find build/doc/manual -name "*.html" -not -name yorick_prt.html | xargs sed -e 's|^<body .*$$|&<div id="l-bar"><div id="links"><div class="nav1"><A href="http://dhmunro.github.io/yorick-doc/">Web Home</A></div><div class="nav1"><a href="../README.html">Getting Started</a></div><div class="nav1"><A href="../manual/index.html">Manual</A></div><div class="nav1"><A href="../html_xref/packages.html">Packages</A></div><div class="nav1"><a href="../refcard/index.html">Quick Reference</a></div> [...]
+	sed 's|yorick_1.html|index.html|' -i build/doc/*.html build/doc/*/*.html
+	touch build-indep-stamp
+
 build-stamp: configure-stamp 
 	dh_testdir
 	$(MAKE) CDG_FLAGS="$(CFLAGS) $(LDFLAGS)" install
@@ -52,8 +66,6 @@ build-stamp: configure-stamp
 	mkdir -p build/lib/yorick
 	cp -a relocate build/share/yorick
 	mv build/share/yorick/doc build
-	sed 's/^.*Printed: .*$$//' -i build/doc/*.doc
-	cp debian/helpers/README build/doc
 	mkdir -p build/share/yorick/packages/installed
 	mv build/share/yorick/bin build/lib/yorick/
 	mv build/share/yorick/lib build/lib/yorick/
@@ -65,14 +77,6 @@ build-stamp: configure-stamp
 	   mv codger install.grp install.sh libdep.sh libyor.a main.o \
               $(CURDIR)/build/yorick-dev/lib/yorick/lib
 	cp emacs/yorick-auto.el build/50yorick-auto.el
-	convert icons/yicon32.png build/yorick32x32.xpm
-	convert icons/yicon16.png build/yorick16x16.xpm
-	$(MAKE) -C doc/html BUILDDIR=$(BUILDDIR) manual refcard $(BUILDDIR)doc/README.html $(BUILDDIR)doc/images/triangle3.jpg $(BUILDDIR)doc/skull.css
-	cp doc/html/packinfo.txt build/00yorick.packinfo
-	cp doc/html/keywords.txt build/00yorick.keywords
-	cp doc/html/aliases.txt build/00yorick.aliases
-	find build/doc/manual -name "*.html" -not -name yorick_prt.html | xargs sed -e 's|^<body .*$$|&<div id="l-bar"><div id="links"><div class="nav1"><A href="http://dhmunro.github.io/yorick-doc/">Web Home</A></div><div class="nav1"><a href="../README.html">Getting Started</a></div><div class="nav1"><A href="../manual/index.html">Manual</A></div><div class="nav1"><A href="../html_xref/packages.html">Packages</A></div><div class="nav1"><a href="../refcard/index.html">Quick Reference</a></div> [...]
-	sed 's|yorick_1.html|index.html|' -i build/doc/*.html build/doc/*/*.html
 	touch build-stamp
 
 build-mpy-stamp: build-stamp
@@ -103,7 +107,7 @@ clean-mpy:
 
 clean: configure-stamp clean-mpy
 	dh_testdir
-	rm -Rf build-stamp configure-stamp build relocate
+	rm -Rf build-stamp build-indep-stamp configure-stamp build relocate
 	touch Make.cfg
 	$(MAKE) -C doc/html clean
 	$(MAKE) distclean
@@ -140,11 +144,11 @@ binary-common:
 
 # Build architecture independant packages using the common target.
 #binary-indep: build-indep install-indep
-binary-indep: build-stamp
+binary-indep: build-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build-mpy-stamp check
+binary-arch: build-arch check
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 ###### Getting the original source:

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

