lp:~brian-murray/ubuntu/natty/apport/linux-staging

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-core-dev/ubuntu/natty/apport/ubuntu

Kees Cook: Pending requested 2011-04-21

Colin Watson: Pending requested 2011-04-21

Diff: 0 lines api

Superseded for merging into lp:~package-import/ubuntu/natty/apport/defunct

Colin Watson (community): Needs Resubmitting on 2011-04-20

Kees Cook (community): Approve on 2011-04-20

Diff: 9642 lines (+3224/-1814)

59 files modified

NEWS (+187/-1)
apport/REThread.py (+7/-7)
apport/__init__.py (+23/-1)
apport/chroot.py (+7/-6)
apport/crashdb.py (+35/-27)
apport/crashdb_impl/launchpad.py (+327/-271)
apport/crashdb_impl/memory.py (+41/-16)
apport/crashdb_impl/multipartpost_handler.py (+1/-1)
apport/fileutils.py (+22/-12)
apport/hookutils.py (+151/-38)
apport/packaging.py (+19/-19)
apport/report.py (+306/-219)
apport/ui.py (+458/-287)
apport_python_hook.py (+21/-17)
backends/packaging-apt-dpkg.py (+85/-116)
bin/apport-cli (+24/-22)
bin/apport-retrace (+10/-13)
bin/apport-unpack (+4/-7)
bin/crash-digger (+17/-20)
bin/dupdb-admin (+5/-6)
data/apport (+15/-16)
data/dump_acpi_tables.py (+2/-1)
data/gcc_ice_hook (+2/-2)
data/general-hooks/parse_segv.py (+23/-32)
data/general-hooks/ubuntu.py (+145/-49)
data/java_uncaught_exception (+86/-0)
data/kernel_crashdump (+8/-4)
data/package-hooks/source_linux.py (+6/-87)
data/package-hooks/source_ubiquity.py (+11/-2)
data/package_hook (+1/-1)
data/unkillable_shutdown (+21/-9)
debian/apport.install (+3/-0)
debian/apport.postinst (+10/-0)
debian/changelog (+379/-0)
debian/control (+42/-22)
debian/local/apport-chroot (+5/-5)
debian/local/setup-apport-retracer (+13/-55)
debian/python-apport.install (+1/-1)
debian/rules (+3/-12)
doc/crashdb-conf.txt (+2/-2)
doc/package-hooks.txt (+6/-0)
doc/symptoms.txt (+1/-1)
etc/apport/blacklist.d/apport (+5/-0)
etc/apport/crashdb.conf (+3/-4)
etc/bash_completion.d/apport_completion (+85/-74)
etc/default/apport (+0/-3)
gtk/apport-gtk (+96/-95)
gtk/apport-gtk.ui (+5/-17)
java/README (+13/-0)
java/com/ubuntu/apport/ApportUncaughtExceptionHandler.java (+108/-0)
java/crash.java (+8/-0)
kde/apport-kde (+3/-4)
man/apport-cli.1 (+8/-0)
problem_report.py (+131/-136)
setup.py (+65/-9)
test/crash-digger (+52/-52)
test/hooks (+17/-13)
test/java (+86/-0)
test/run (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1774. By Brian Murray on 2011-04-20

link to bug number

1773. By Brian Murray on 2011-04-20

Only prepend linux bug titles with [STAGING] if a title exists

1772. By Martin Pitt on 2011-04-20

releasing version 1.20.1-0ubuntu3

1771. By Martin Pitt on 2011-04-20

etc/default/apport: Disable by default for the final release.

1770. By Martin Pitt on 2011-04-20

* Merge from trunk:
  - Use kde-open instead of kfmclient to open URLs under KDE. Thanks Philip
    Muškovac. (LP: #765808)

1769. By Martin Pitt on 2011-04-19

releasing version 1.20.1-0ubuntu2

1768. By Martin Pitt on 2011-04-19

* Merge bug fixes from trunk:
  - apport-gtk: HTML-escape text for dialogs with URLs. (LP: #750870)
  - dump_acpi_tables.py: Check to see if acpi/tables dir is mounted first.
    Thanks Brian Murray. (LP: #729622)
  - man/apport-cli.1: Document recently added -w/--window option. Thanks
    Abhinav Upadhyay. (LP: #765600)

1767. By Martin Pitt on 2011-04-19

The kernel team has decided that asking the user for a bunch of
information which they may not be able to answer is the wrong thing to do.
Therefore, all the propmpting of the user for said information has been
removed. Also removed is the tagging of "needs-upstream-testing".

1766. By Martin Pitt on 2011-03-31

releasing version 1.20.1-0ubuntu1

1765. By Martin Pitt on 2011-03-31

new upstream release 1.20.1