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

Proposed by Robie Basak on 2012-07-19
Status: Merged
Merge reported by: St├ęphane Graber
Merged at revision: not available
Proposed branch: lp:~racb/ubuntu/precise/mod-proxy-html/988819
Merge into: lp:ubuntu/precise/mod-proxy-html
Diff against target: 52 lines (+14/-3)
4 files modified
debian/changelog (+11/-0)
debian/conf/proxy_html.load (+0/-1)
debian/control (+2/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~racb/ubuntu/precise/mod-proxy-html/988819
Reviewer Review Type Date Requested Status
James Page Approve on 2012-07-19
Ubuntu branches 2012-07-19 Pending
Review via email: mp+115724@code.launchpad.net
To post a comment you must log in.
James Page (james-page) wrote :

LGTM - uploaded

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2008-08-20 12:06:58 +0000
3+++ debian/changelog 2012-07-19 12:50:41 +0000
4@@ -1,3 +1,14 @@
5+mod-proxy-html (3.0.1-1ubuntu0.1) precise-proposed; urgency=low
6+
7+ * debian/rules: explicitly link against libxml2.so, so that it gets
8+ declared as a dependency. This will allow apache to load the module
9+ without explicitly specifying the correct multiarch path.
10+ * debian/conf/mod-proxy.load: drop LoadFile directive entirely, and rely
11+ on the loader to resolve all required dependencies. This avoids the
12+ hardcoded path which fails on multiarch-enabled systems (LP: #988819).
13+
14+ -- Robie Basak <robie.basak@ubuntu.com> Thu, 19 Jul 2012 12:09:11 +0000
15+
16 mod-proxy-html (3.0.1-1) unstable; urgency=low
17
18 * New upstream release
19
20=== modified file 'debian/conf/proxy_html.load'
21--- debian/conf/proxy_html.load 2004-11-29 09:11:20 +0000
22+++ debian/conf/proxy_html.load 2012-07-19 12:50:41 +0000
23@@ -1,2 +1,1 @@
24-LoadFile /usr/lib/libxml2.so.2
25 LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so
26
27=== modified file 'debian/control'
28--- debian/control 2008-08-20 12:06:58 +0000
29+++ debian/control 2012-07-19 12:50:41 +0000
30@@ -1,7 +1,8 @@
31 Source: mod-proxy-html
32 Section: web
33 Priority: optional
34-Maintainer: Emmanuel Lacour <elacour@home-dn.net>
35+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
36+XSBC-Original-Maintainer: Emmanuel Lacour <elacour@home-dn.net>
37 Build-Depends: debhelper (>= 4.0.0), apache2-prefork-dev (>> 2.2), libxml2-dev (>> 2.5.10)
38 Standards-Version: 3.8.0
39
40
41=== modified file 'debian/rules'
42--- debian/rules 2006-11-02 23:33:45 +0000
43+++ debian/rules 2012-07-19 12:50:41 +0000
44@@ -13,7 +13,7 @@
45
46 build-stamp:
47 dh_testdir
48- apxs2 -c -I/usr/include/libxml2 mod_proxy_html.c
49+ apxs2 -c -I/usr/include/libxml2 -lxml2 mod_proxy_html.c
50 touch build-stamp
51
52 clean:

Subscribers

People subscribed via source and target branches

to all changes: