Merge lp:~kroq-gar78/ubuntu/quantal/mod-proxy-html/fix-1005425 into lp:ubuntu/quantal/mod-proxy-html

[Aditya V]

I fixed the path of libxml.so.2 by using the debian/postinst script.

[Andrew Starr-Bochicchio (andrewsomething)]

There are some remnants of a bzr conflict in debian/changelog

Also, I'm not sure we need to be using sed for this. Could you look at version 3.0.1-1.1 from Debian which is now in quantal?

It seems to fix this with:

diff -u mod-proxy-html-3.0.1/debian/conf/proxy_html.load mod-proxy-html-3.0.1/debian/conf/proxy_html.load
--- mod-proxy-html-3.0.1/debian/conf/proxy_html.load
+++ mod-proxy-html-3.0.1/debian/conf/proxy_html.load
@@ -1,2 +1,2 @@
-LoadFile /usr/lib/libxml2.so.2
+LoadFile libxml2.so.2
 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

The sync from Sid fixed this for quantal

review: Disapprove

Unmerged revisions

8. By Aditya V on 2012-05-31

debian/postinst: use 'uname' instead of 'dpkg-architecture' for path configuration

7. By Aditya V on 2012-05-29

debian/postinst: replace the path for libxml2.so.2 in field
'LoadFile' in file 'debian/conf/proxy_html.load' with the multiarch-
friendly path using sed (LP: #1005425)

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-30 08:59:37 +0000
+++ debian/changelog	2012-06-12 02:49:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 mod-proxy-html (3.0.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -13,6 +14,16 @@
 
  -- Aron Xu <[e-mail]>  Wed, 30 May 2012 08:59:37 +0000
 
+=======
+mod-proxy-html (3.0.1-1ubuntu1) quantal; urgency=low
+
+  * debian/postinst: replace the path for libxml2.so.2 in field
+    'LoadFile' in file 'debian/conf/proxy_html.load' with the multiarch-
+    friendly path using sed (LP: #1005425)
+
+ -- Aditya Vaidya <[e-mail]>  Mon, 28 May 2012 22:28:41 -0500
+
+>>>>>>> MERGE-SOURCE
 mod-proxy-html (3.0.1-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'debian/postinst'
--- debian/postinst	2007-10-16 11:38:11 +0000
+++ debian/postinst	2012-06-12 02:49:20 +0000
@@ -40,12 +40,15 @@
                 reload_apache
             fi
         else 
-        # Enable the module
-        if [ -e /etc/apache2/apache2.conf ]; then
-            a2enmod proxy_html >/dev/null || true
-            reload_apache
+            # Enable the module
+            if [ -e /etc/apache2/apache2.conf ]; then
+                a2enmod proxy_html >/dev/null || true
+                reload_apache
+            fi
         fi
-    fi
+        
+        # Use multiarch-friendly paths for libxml.so.2 in proxy_html.load
+        sed  -i "s/\/usr\/lib\/libxml2.so.2/\/usr\/lib\/`uname -i`-linux-gnu\/libxml2.so.2/g" /etc/apache2/mods-available/proxy_html.load
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)