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

Proposed by Aditya V
Status: Work in progress
Proposed branch: lp://staging/~kroq-gar78/ubuntu/quantal/mod-proxy-html/fix-1005425
Merge into: lp://staging/ubuntu/quantal/mod-proxy-html
Diff against target: 50 lines (+19/-5) (has conflicts)
2 files modified
debian/changelog (+11/-0)
debian/postinst (+8/-5)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~kroq-gar78/ubuntu/quantal/mod-proxy-html/fix-1005425
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio (community) Disapprove
Ubuntu branches Pending
Review via email: mp+109767@code.staging.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

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
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

The sync from Sid fixed this for quantal

review: Disapprove

Unmerged revisions

8. By Aditya V

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

7. By Aditya V

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: