Ubuntu
espeakup package

Merge lp:~jtaylor/ubuntu/oneiric/espeakup/fix-831131 into lp:ubuntu/oneiric/espeakup

  1. Oneiric (11.10)
  2. fix-831131
  3. Merge into oneiric
Proposed by Julian Taylor
Status: Merged
Merged at revision: 4
Proposed branch: lp:~jtaylor/ubuntu/oneiric/espeakup/fix-831131
Merge into: lp:ubuntu/oneiric/espeakup
Diff against target: 41 lines (+10/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/rules (+2/-1)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/espeakup/fix-831131
Reviewer Review Type Date Requested Status
Felix Geyer (community) Approve
Ubuntu branches Pending
Review via email: mp+72867@code.launchpad.net

Description of the change

fixes ftbs
a path in debian/rules needed adapting for jack-audio-connection-kit being multiarched now

To post a comment you must log in.
Revision history for this message
Felix Geyer (debfx) wrote :

Merged, thanks!

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 2011-06-11 23:51:54 +0000
3+++ debian/changelog 2011-08-25 12:23:26 +0000
4@@ -1,3 +1,9 @@
5+espeakup (1:0.71-2ubuntu1) oneiric; urgency=low
6+
7+ * debian/rules: adapt paths for multiarched libjack.a (LP: #831131)
8+
9+ -- Julian Taylor <jtaylor.debian@googlemail.com> Thu, 25 Aug 2011 14:17:33 +0200
10+
11 espeakup (1:0.71-2) unstable; urgency=low
12
13 * debian/control:
14
15=== modified file 'debian/control'
16--- debian/control 2011-06-11 23:51:54 +0000
17+++ debian/control 2011-08-25 12:23:26 +0000
18@@ -1,7 +1,8 @@
19 Source: espeakup
20 Section: admin
21 Priority: extra
22-Maintainer: Debian Accessibility Team <debian-accessibility@lists.debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Debian Accessibility Team <debian-accessibility@lists.debian.org>
25 Uploaders: Samuel Thibault <sthibault@debian.org>
26 Build-Depends: debhelper (>= 7.0.50), libespeak-dev, portaudio19-dev (>= 19+svn20110326-1.1), libjack-dev, libasound2-dev, po-debconf
27 Standards-Version: 3.9.2
28
29=== modified file 'debian/rules'
30--- debian/rules 2011-06-11 23:51:54 +0000
31+++ debian/rules 2011-08-25 12:23:26 +0000
32@@ -1,7 +1,8 @@
33 #!/usr/bin/make -f
34
35+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
36 UDEB_CFLAGS ?= $(CFLAGS) -Os
37-UDEB_LDLIBS ?= /usr/lib/libespeak.a /usr/lib/libportaudio.a /usr/lib/libjack.a -lm -lpthread -lasound -lrt
38+UDEB_LDLIBS ?= /usr/lib/libespeak.a /usr/lib/libportaudio.a /usr/lib/$(DEB_HOST_MULTIARCH)/libjack.a -lm -lpthread -lasound -lrt
39 UDEB_LDFLAGS += -u _Unwind_Resume -u __gcc_personality_v0 -u _Unwind_ForcedUnwind -u _Unwind_GetCFA -u _Unwind_GetBSP -lgcc_s
40
41 clean:

Subscribers

People subscribed via source and target branches

to all changes: