[SCM] WorldForge math library branch, master, updated. upstream/0.3.11-12-g605878e

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 605878e01f27f583e085dd626c5d3aef53d36491
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Jan 11 04:00:10 2012 -0500

    refined doc packaging rules

diff --git a/debian/changelog b/debian/changelog
index 413ef41..5c60fba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ wfmath (0.3.11-1) UNRELEASED; urgency=low
   * fixed a missing symbol error (0001-add-missing-expand-symbol.patch)
   * updated Standards-Version to 3.9.2 (no changes required)
   * debian/control: added Vcs- fields
+  * refined doc packaging rules
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 06 Jan 2012 09:50:11 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 11 Jan 2012 03:55:38 -0500
 
 wfmath (0.3.9-2) unstable; urgency=low
 
diff --git a/debian/libwfmath-doc.dirs b/debian/libwfmath-doc.dirs
deleted file mode 100644
index 936209a..0000000
--- a/debian/libwfmath-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libwfmath-doc/html
diff --git a/debian/libwfmath-doc.doc-base b/debian/libwfmath-doc.doc-base
new file mode 100644
index 0000000..4fad8f6
--- /dev/null
+++ b/debian/libwfmath-doc.doc-base
@@ -0,0 +1,7 @@
+Document: libwfmath-doc
+Title: WorldForge Math Library Documentation
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/libwfmath-doc/html/index.html
+Files: /usr/share/doc/libwfmath-doc/html/*
diff --git a/debian/libwfmath-doc.docs b/debian/libwfmath-doc.docs
new file mode 100644
index 0000000..0bd3136
--- /dev/null
+++ b/debian/libwfmath-doc.docs
@@ -0,0 +1 @@
+doc/html
diff --git a/debian/rules b/debian/rules
index 6398b1b..29d0648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ clean::
 	rm -rf $(CURDIR)/doc/man
 
 install/libwfmath-doc::
-	( cd  $(CURDIR)/doc ; doxygen )
-	cp -a $(CURDIR)/doc/html/* $(CURDIR)/debian/libwfmath-doc/usr/share/doc/libwfmath-doc/html
+	make docs
 
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp

-- 
WorldForge math library