lp:~ubuntu-branches/ubuntu/trusty/aptdaemon/trusty-proposed-201404111728

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/trusty-proposed/aptdaemon

Ubuntu Development Team: Pending requested 2014-04-11

Diff: 44 lines (+19/-0) (has conflicts)

2 files modified

debian/changelog (+14/-0)
debian/patches/series (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

153. By Michael Vogt on 2014-04-11

* debian/python3-aptdaemon.test.install:
  - install all test deb files
* debian/patches/dbus_timeout.patch:
  - fix pep8 issue
* debian/patches/fix-configparser.patch:
  - do not crash when "#" are in comments

152. By Michael Vogt on 2014-04-10

* debian/patches/dbus_timeout.patch
  - increase dbus timeouts to avoid a dbus timeout error if a
    policykit authentication dialog is not answered for a while
* debian/patches/lp1266844.patch:
  - workaround for LP: #1266844, thanks to Brian Murray

151. By Matthias Klose on 2014-02-20

Rewrite the python shebang path to /usr/bin/python3.

150. By Michael Vogt on 2013-12-05

Backport fix for LP: #1024590 from trunk r963

149. By Martin Pitt on 2013-10-24

* Merge with Debian unstable. Remaining Ubuntu changes:
  - Build-depend on dh-translations and use it in debian/rules.
  - Add upstream_lintian_2.5.18.patch: Recently updated lintian 2.5.18
    dropped $LINTIAN_ROOT, adjust tests accordingly (cherrypicked from
    upstream trunk). Fixes autopkgtest.
  - fix_ftbs.patch: Fix FTBFS (LP: #1226100) with latest pep8 version.
* Move Vcs-Bzr to trusty branch.

148. By Martin Pitt on 2013-06-06

* Update Vcs-* to saucy branch.
* Add upstream-dropped-lintian-check.patch: Drop
  missing-pre-dependency-on-multiarch-support, it was dropped from saucy
  lintian.

147. By Colin Watson on 2013-04-02

Flush debconf-communicate stdin after writing to it
(LP: #1163142, #1163163).

146. By Brian Murray on 2013-03-22

*debian/patches/fix-lp898851.patch: Workaround a random crash during
 progress dialog. Thanks to Sebastian Heinlein for the patch. (LP: #898851)

145. By Martin Pitt on 2013-03-18

debian/rules: Drop the hackery again to salvage the "whitelist directory"
test case, and instead exclude it in lp1153725-temporary-workaround.patch
as well. This fixes the failing autopkgtest.

144. By Martin Pitt on 2013-03-18

[ Martin Pitt ]
* Add gir1.2-vte-2.90 build and test dependency.
* debian/rules: Wait for previous xvfb to finish before starting the next
  one.

[ Barry Warsaw ]
* debian/control:
  - Add Build-Depend on xvfb.
  - Bump Standards-Version to 3.9.4.
* debian/rules: Run the tests under xvfb-run to avoid core dumps.
* debian/patches/lp1153725-temporary-workaround.patch: Temporarily
  disable test which fails during the build.
* debian/rules: Add the missing test directory and symlinks before running
  tests, as a workaround to LP #1153725. Clean up symlink directory in
  override_dh_auto_clean.