Merge lp:~racb/ubuntu/precise/modsecurity-apache/988819_2 into lp:ubuntu/precise/modsecurity-apache

[Robie Basak]

[James Page (james-page)]

LGTM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-28 16:51:11 +0000
+++ debian/changelog	2012-07-19 12:50:36 +0000
@@ -1,3 +1,22 @@
+modsecurity-apache (2.6.3-1ubuntu0.2) precise-proposed; urgency=low
+
+  * debian/mod-security.load: revert previous change, since an alternate
+    solution has been agreed in the bug.
+  * debian/mod-security.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 11:33:40 +0000
+
+modsecurity-apache (2.6.3-1ubuntu0.1) precise-proposed; urgency=low
+
+  * debian/mod-security.load: remove libxml2.so.2 path, since with
+    multiarch it is always incorrect on i386 and amd64. Use no path and
+    a corresponding apache2 change to use the standard dlopen search
+    path in this case to allow the library to be found (LP: #988819).
+
+ -- Robie Basak <[e-mail]>  Fri, 08 Jun 2012 15:40:04 +0100
+
 modsecurity-apache (2.6.3-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/control'
--- debian/control	2011-06-16 13:58:40 +0000
+++ debian/control	2012-07-19 12:50:36 +0000
@@ -1,7 +1,8 @@
 Source: modsecurity-apache
 Section: httpd
 Priority: optional
-Maintainer: Alberto Gonzalez Iniesta <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alberto Gonzalez Iniesta <[e-mail]>
 Build-Depends: debhelper (>> 7.0.0), apache2-threaded-dev|apache2-prefork-dev, libxml2-dev (>= 2.0.50-10), liblua5.1-0-dev, libcurl4-gnutls-dev
 Standards-Version: 3.9.2
 Homepage: http://www.modsecurity.org/

=== modified file 'debian/mod-security.load'
--- debian/mod-security.load	2011-03-23 18:36:29 +0000
+++ debian/mod-security.load	2012-07-19 12:50:36 +0000
@@ -1,2 +1,1 @@
-LoadFile /usr/lib/libxml2.so.2
 LoadModule security2_module /usr/lib/apache2/modules/mod_security2.so