Ubuntu
gjs package

Merge lp:~darkxst/ubuntu/trusty/gjs/1.38.1-2 into lp:ubuntu/trusty/gjs

  1. Trusty (14.04)
  2. 1.38.1-2
  3. Merge into trusty
Proposed by Tim Lunn
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~darkxst/ubuntu/trusty/gjs/1.38.1-2
Merge into: lp:ubuntu/trusty/gjs
Diff against target: 27 lines (+10/-0)
2 files modified
debian/changelog (+6/-0)
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/trusty/gjs/1.38.1-2
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+194414@code.launchpad.net

Description of the change

Tests are broken currently on powerpc so make them non-fatal for now.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

This was already uploaded: https://launchpad.net/ubuntu/+source/gjs/1.38.1-0ubuntu2

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 2013-10-30 21:20:33 +0000
3+++ debian/changelog 2013-11-07 20:33:14 +0000
4@@ -1,3 +1,9 @@
5+gjs (1.38.1-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/rules: Make tests non-fatal on powerpc
8+
9+ -- Tim Lunn <tim@feathertop.org> Wed, 06 Nov 2013 08:40:11 +1100
10+
11 gjs (1.38.1-0ubuntu1) trusty; urgency=low
12
13 [ Tim Lunn ]
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-10-25 23:55:41 +0000
17+++ debian/rules 2013-11-07 20:33:14 +0000
18@@ -17,5 +17,9 @@
19
20 DEB_MAKE_CHECK_TARGET := check
21
22+ifeq ($(DEB_HOST_ARCH), powerpc)
23+ DEB_MAKE_CHECK_TARGET += || true
24+endif
25+
26 install/libgjs0d::
27 echo gjs:Provides=libgjs0-$(LIBMOZJS) >> debian/$(cdbs_curpkg).substvars

Subscribers

People subscribed via source and target branches

to all changes: