[Pkg-apache-commits] r1047 - in /trunk/apr-util: changelog control libaprutil1-dev.install rules

[sf at alioth.debian.org]

Author: sf
Date: Sat Sep 12 13:03:11 2009
New Revision: 1047

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1047
Log:
build the html docs

Modified:
    trunk/apr-util/changelog
    trunk/apr-util/control
    trunk/apr-util/libaprutil1-dev.install
    trunk/apr-util/rules

Modified: trunk/apr-util/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/changelog?rev=1047&op=diff
==============================================================================
--- trunk/apr-util/changelog (original)
+++ trunk/apr-util/changelog Sat Sep 12 13:03:11 2009
@@ -2,6 +2,8 @@
 
   * Fix FTBFS (closes: #545718). The FTBFS didn't happen with dash as /bin/sh
     due to dash bug #514863.
+  * Ship the html documentation in the -dev package. Thanks to Joel Smith for
+    the patch (closes: #543554).
   * Make libaprutil1-dev depend on libmysqlclient-dev instead of
     libmysqlclient15-dev.
 

Modified: trunk/apr-util/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/control?rev=1047&op=diff
==============================================================================
--- trunk/apr-util/control (original)
+++ trunk/apr-util/control Sat Sep 12 13:03:11 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen at debian.org>, Stefan Fritsch <sf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>, Peter Samuelson <peter at p12n.org>
-Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb4.7-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev
+Build-Depends: debhelper (>> 6.0.7~), autoconf, autotools-dev, mawk, libldap2-dev, libexpat1-dev, libdb4.7-dev, libpcre3-dev, dpatch (>= 1.11), binutils (>= 2.14.90.0.7), libapr1-dev (>= 1.3.2), libsqlite3-dev, libpq-dev, python, libmysqlclient-dev, freetds-dev, unixodbc-dev, doxygen
 Standards-Version: 3.8.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util
 Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr-util

Modified: trunk/apr-util/libaprutil1-dev.install
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/libaprutil1-dev.install?rev=1047&op=diff
==============================================================================
--- trunk/apr-util/libaprutil1-dev.install (original)
+++ trunk/apr-util/libaprutil1-dev.install Sat Sep 12 13:03:11 2009
@@ -3,3 +3,4 @@
 debian/tmp/usr/lib/libaprutil-1.so
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/bin
+docs/dox/html usr/share/doc/libaprutil1-dev

Modified: trunk/apr-util/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr-util/rules?rev=1047&op=diff
==============================================================================
--- trunk/apr-util/rules (original)
+++ trunk/apr-util/rules Sat Sep 12 13:03:11 2009
@@ -71,6 +71,7 @@
 	# given _after_ it on the command line, but apr's libtool puts the 
 	# "-l..." _before_ the "-Wl,--as-needed"
 	$(MAKE) CFLAGS="$(CFLAGS) $(H_CFLAGS)" LDFLAGS="$(LDFLAGS) $(H_LDFLAGS)" EXTRA_CFLAGS=""
+	$(MAKE) dox
 
 	touch $@
 
@@ -82,6 +83,7 @@
 	rm -f test/data/test-db test/data/test-sdbm.dir test/data/test-sdbm.pag
 	rm -f xml/expat/aclocal.m4 xml/expat/configure xml/expat/conftools/ltmain.sh
 	rm -f build-outputs.mk build/apr_common.m4 build/config.guess build/config.sub config.nice configure config.log
+	rm -rf docs/dox
 
 	dh_clean