Merge lp://staging/~darkxst/ubuntu/trusty/gjs/1.38.1 into lp://staging/ubuntu/trusty/gjs

Proposed by Tim Lunn
Status: Merged
Merged at revision: 73
Proposed branch: lp://staging/~darkxst/ubuntu/trusty/gjs/1.38.1
Merge into: lp://staging/ubuntu/trusty/gjs
Diff against target: 1124 lines (+448/-299)
17 files modified
Makefile-insttest.am (+4/-2)
Makefile.in (+53/-50)
aclocal.m4 (+237/-222)
configure (+20/-18)
configure.ac (+4/-4)
debian/changelog (+10/-0)
debian/control.in (+13/-0)
debian/gjs-tests.install (+3/-0)
debian/patches/git_fix_make_check.patch (+47/-0)
debian/patches/series (+1/-0)
debian/rules (+4/-1)
debian/tests/build (+27/-0)
debian/tests/control (+5/-0)
debian/tests/installed-tests (+10/-0)
gjs/console.c (+2/-2)
installed-tests/script.test.in (+3/-0)
installed-tests/scripts/testSystemExit.js (+5/-0)
To merge this branch: bzr merge lp://staging/~darkxst/ubuntu/trusty/gjs/1.38.1
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+192274@code.staging.launchpad.net
To post a comment you must log in.
69. By Tim Lunn

debian/patches/git_fix_make_check.patch: Upstream patch to fix tests

70. By Tim Lunn

debian/rules: Make tests fatal again

Revision history for this message
Jackson Doak (noskcaj) wrote :

Could you contact the debian pkg-gnome team and package this there as well, it would help everyone a lot

Revision history for this message
Jackson Doak (noskcaj) wrote :

The work looks good though, you'll just need a developer to upload it.

71. By Tim Lunn

* debian/control.in: add -tests package for installed tests
* debian/tests: Add autopkgtests

72. By Tim Lunn

Actually run the gjs tests

73. By Tim Lunn

Actually run gjstest

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: