Merge lp:~elmo/ubuntu/natty/udev/udev-fix-740224 into lp:~ubuntu-core-dev/ubuntu/natty/udev/ubuntu

Proposed by James Troup on 2011-03-22
Status: Merged
Merged at revision: 2660
Proposed branch: lp:~elmo/ubuntu/natty/udev/udev-fix-740224
Merge into: lp:~ubuntu-core-dev/ubuntu/natty/udev/ubuntu
Diff against target: 29 lines (+11/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~elmo/ubuntu/natty/udev/udev-fix-740224
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-03-22 Pending
Review via email: mp+54397@code.launchpad.net

Description of the change

Fix (i.e. empty) depedency_libs in .la files which caused builds to fail in a multiarch world. (LP: #740224)

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
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-20 19:03:57 +0000
+++ debian/changelog 2011-03-22 17:45:56 +0000
@@ -1,3 +1,10 @@
1udev (166-0ubuntu6) natty; urgency=low
2
3 * Fix (i.e. empty) depedency_libs in .la files per Debian Policy 10.2.
4 (LP: #740224)
5
6 -- James Troup <james.troup@canonical.com> Tue, 22 Mar 2011 17:32:06 +0000
7
1udev (166-0ubuntu5) natty; urgency=low8udev (166-0ubuntu5) natty; urgency=low
29
3 * Build for multiarch.10 * Build for multiarch.
411
=== modified file 'debian/rules'
--- debian/rules 2011-03-20 19:03:50 +0000
+++ debian/rules 2011-03-22 17:45:56 +0000
@@ -85,6 +85,10 @@
85 T=`readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so`; \85 T=`readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so`; \
86 rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so; \86 rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so; \
87 ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$T` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so87 ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$T` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgudev-1.0.so
88 # Fix up dependency_libs in libtool .la files
89 for file in `find debian/tmp/usr/lib/ -name \*.la`; do \
90 sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
91 done
8892
89 # Documentation93 # Documentation
90 install -m 644 -o root -g root debian/README-etc-rules.d \94 install -m 644 -o root -g root debian/README-etc-rules.d \

Subscribers

People subscribed via source and target branches