~ubuntu-branches/ubuntu/maverick/wxwidgets2.6/maverick

Viewing all changes in revision 34.

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-08-06 22:29:31 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100806222931-vmbyz4kcnwzibbhi
Tags: 2.6.3.2.2-5ubuntu1
* Merge from Debian unstable (main), remaining Ubuntu changes:
  - remove files which broke update-alternatives
  - debian/rules: add debian/control target to .PHONY in order to regenerate
    debian/control from debian/control.in each time.
  - debian/python-wxgtk.{postinst, prerm} fix update-alternatives call to
    install links for each supported Python version.
  - debian/control.in: add bc to Build-Depends field.
  - debian/control.in: adjust dependencies and conflicts for the
    python-wxversion changes that were applied in Ubuntu on wxwidgets2.8
    2.8.6.1-0ubuntu2 package.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: