Merge lp:~barry/aptdaemon/some-packaging-fixes into lp:~aptdaemon-developers/aptdaemon/ubuntu-raring
Status: | Merged |
---|---|
Merged at revision: | 288 |
Proposed branch: | lp:~barry/aptdaemon/some-packaging-fixes |
Merge into: | lp:~aptdaemon-developers/aptdaemon/ubuntu-raring |
Diff against target: |
156 lines (+86/-4) 6 files modified
debian/changelog (+15/-0) debian/control (+5/-1) debian/patches/lp1153725-temporary-workaround.patch (+15/-0) debian/patches/pep8-fixes.patch (+30/-0) debian/patches/series (+2/-0) debian/rules (+19/-3) |
To merge this branch: | bzr merge lp:~barry/aptdaemon/some-packaging-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastian Heinlein | Pending | ||
Review via email: mp+152776@code.launchpad.net |
Description of the change
Fixes various build failures on a local sbuild (so hopefully on the buildds too)
[ Barry Warsaw ]
* debian/control:
- Add Build-Depend on gir1.2-
and xvfb.
- Bump Standards-Version to 3.9.4.
* debian/rules: Run the tests under xvfb-run to avoid core dumps.
* debian/
* debian/
disable two tests which fail during the build.
* debian/rules:
- Add the missing test directory and symlinks before running tests.
- Clean up symlink directory in override_
- Sleep before the xvfb-run with a different Python version. Tear
down of xvfb-run resources is apparently not immediate.
Hey Barry!
I was independently starting to fix autopkgtests this morning, I didn't see this before. I'll apply the remaining of your fixes to the package and adjust them a bit. For example, we really sholdn't just "sleep 5", but instead either use xvfb-run -a or wait until the previous socket is gone.