Ubuntu
subversion package

Merge lp:~lool/ubuntu/natty/subversion/ld-library-path-fix-for-barry into lp:~barry/ubuntu/natty/subversion/670139-py27

  1. Natty (11.04)
  2. ld-library-path-fix-for-barry
  3. Merge into 670139-py27
Proposed by Loïc Minier
Status: Merged
Merge reported by: Loïc Minier
Merged at revision: not available
Proposed branch: lp:~lool/ubuntu/natty/subversion/ld-library-path-fix-for-barry
Merge into: lp:~barry/ubuntu/natty/subversion/670139-py27
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~lool/ubuntu/natty/subversion/ld-library-path-fix-for-barry
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Review via email: mp+40940@code.launchpad.net

Description of the change

Fix LD_LIBRARY_PATH handling

To post a comment you must log in.

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 2010-11-12 20:17:49 +0000
3+++ debian/changelog 2010-11-16 10:16:14 +0000
4@@ -1,3 +1,10 @@
5+subversion (1.6.12dfsg-2ubuntu3) UNRELEASED; urgency=low
6+
7+ * Don't override LD_LIBRARY_PATH completely but prepend to it as to not
8+ break fakeroot.
9+
10+ -- Loïc Minier <loic.minier@ubuntu.com> Tue, 16 Nov 2010 02:09:09 +0100
11+
12 subversion (1.6.12dfsg-2ubuntu2) natty; urgency=low
13
14 * Fix FTBFS against Python 2.7 by disabling some problematic tests.
15
16=== modified file 'debian/rules'
17--- debian/rules 2010-07-02 06:54:21 +0000
18+++ debian/rules 2010-11-16 10:16:14 +0000
19@@ -367,7 +367,7 @@
20 # Create our default configuration files to be installed in
21 # /etc/subversion/
22 $(MAKE) -C debian/tools \
23- LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \
24+ LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
25 DEB_SRCDIR=$(CURDIR) DEB_BUILDDIR=$(CURDIR)/$(DEB_BUILDDIR)
26
27 $(MAKE_B) install-swig-pl-lib \

Subscribers

People subscribed via source and target branches

to all changes: