[apophenia] 02/04: Introduce build-arch/build-indep scheme (Closes: #764903)

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository apophenia.

commit dd2dc414bb0afe58b90b0f91422f1b29001f6ba2
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sun Oct 12 14:42:06 2014 +0200

    Introduce build-arch/build-indep scheme (Closes: #764903)
---
 debian/changelog                         |  7 +++++--
 debian/control                           |  3 ++-
 debian/patches/debianization-adhoc.patch |  2 +-
 debian/patches/debianization.patch       | 13 ++-----------
 debian/rules                             |  5 +++++
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d12627..a684970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ apophenia (0.999b+ds3-2) unstable; urgency=medium
 
   * Debianization:
     - debian/control:
-      - Priority, promote to optional.
+      - Priority, promote to optional;
+      - Build-Depends-Indep field, introduce (build-indep scheme, see below);
+    - build-arch/build-indep scheme, introduce and consolidate (Closes: #764903)
+      (thanks to Aaron M. Ucko <ucko at debian.org> for the hint);
 
- -- Jerome Benoit <calculus at rezozer.net>  Sun, 12 Oct 2014 12:31:21 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Sun, 12 Oct 2014 14:00:25 +0000
 
 apophenia (0.999b+ds3-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 69637b2..29d0e19 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends:
  autotools-dev, autoconf-archive, gnulib, dh-autoreconf, libtool,
  pkg-config, help2man,
  zlib1g-dev, libmysqlclient-dev, libsqlite3-dev, libgsl0-dev,
- bc, sqlite3,
+ bc, sqlite3
+Build-Depends-Indep:
  doxygen, texlive-latex-recommended, texlive-fonts-recommended, ghostscript,
  rdfind, symlinks
 Standards-Version: 3.9.6
diff --git a/debian/patches/debianization-adhoc.patch b/debian/patches/debianization-adhoc.patch
index 0dbf74f..fd6eeea 100644
--- a/debian/patches/debianization-adhoc.patch
+++ b/debian/patches/debianization-adhoc.patch
@@ -9,7 +9,7 @@ Last-Update: 2014-09-08
 
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -33,6 +33,7 @@
+@@ -31,6 +31,7 @@
  doc: documentation.h model_doc.h $(apophenia_IMAGES) $(apophenia_JS)
  	doxygen doxygen.conf
  	cp $(apophenia_IMAGES) $(apophenia_JS) html/
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 0e21429..b03e0e2 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -7,16 +7,7 @@ Last-Update: 2014-10-09
 
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -3,6 +3,8 @@
- 
- default:
- 
-+all: html
-+
- ## adhoc
- html man: doc
- 
-@@ -35,6 +37,8 @@
+@@ -35,6 +35,8 @@
  	sed -i -f edit_globals.sed html/globals.html
  	sed -i -f edit_group.sed html/group__models.html
  	sed -i -f edit_width.sed html/*.html
@@ -25,7 +16,7 @@ Last-Update: 2014-10-09
  
  doc-clean:
  	-rm -rf html latex man
-@@ -58,3 +62,12 @@
+@@ -58,3 +60,12 @@
  	typical.css \
  	documentation.h
  
diff --git a/debian/rules b/debian/rules
index ef04931..ab96951 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,11 @@ default:
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_build-indep:
+	$(MAKE) -C docs doc
+
+override_dh_auto_test-indep:
+
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-maintainer-mode
 

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