Merge lp:~racb/ubuntu/precise/mod-proxy-html/988819 into lp:ubuntu/precise/mod-proxy-html

[Robie Basak]

[James Page (james-page)]

LGTM - uploaded

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2008-08-20 12:06:58 +0000
+++ debian/changelog	2012-07-19 12:50:41 +0000
@@ -1,3 +1,14 @@
+mod-proxy-html (3.0.1-1ubuntu0.1) precise-proposed; urgency=low
+
+  * debian/rules: explicitly link against libxml2.so, so that it gets
+    declared as a dependency. This will allow apache to load the module
+    without explicitly specifying the correct multiarch path. 
+  * debian/conf/mod-proxy.load: drop LoadFile directive entirely, and rely
+    on the loader to resolve all required dependencies. This avoids the
+    hardcoded path which fails on multiarch-enabled systems (LP: #988819).
+
+ -- Robie Basak <[e-mail]>  Thu, 19 Jul 2012 12:09:11 +0000
+
 mod-proxy-html (3.0.1-1) unstable; urgency=low
 
   * New upstream release
 
=== modified file 'debian/conf/proxy_html.load'
--- debian/conf/proxy_html.load	2004-11-29 09:11:20 +0000
+++ debian/conf/proxy_html.load	2012-07-19 12:50:41 +0000
@@ -1,2 +1,1 @@
-LoadFile /usr/lib/libxml2.so.2
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so
 
=== modified file 'debian/control'
--- debian/control	2008-08-20 12:06:58 +0000
+++ debian/control	2012-07-19 12:50:41 +0000
@@ -1,7 +1,8 @@
 Source: mod-proxy-html
 Section: web
 Priority: optional
-Maintainer: Emmanuel Lacour <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Emmanuel Lacour <[e-mail]>
 Build-Depends: debhelper (>= 4.0.0), apache2-prefork-dev (>> 2.2), libxml2-dev (>> 2.5.10)
 Standards-Version: 3.8.0
 
 
=== modified file 'debian/rules'
--- debian/rules	2006-11-02 23:33:45 +0000
+++ debian/rules	2012-07-19 12:50:41 +0000
@@ -13,7 +13,7 @@
 
 build-stamp:
 	dh_testdir
-	apxs2 -c -I/usr/include/libxml2 mod_proxy_html.c
+	apxs2 -c -I/usr/include/libxml2 -lxml2 mod_proxy_html.c
 	touch build-stamp
 
 clean: