lp:~mvo/firefox/fix-518747

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:firefox/3.6

Mozilla Team: Pending requested 2010-02-09

Diff: 28 lines (+7/-0)

2 files modified

debian/changelog (+6/-0)
debian/control (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #518747: dapper->hardy->lucid upgrade file overwrite error

High

Fix Released

Link a bug report

Related blueprints

510. By Michael Vogt on 2010-02-09

merged from ubuntu.head

509. By Michael Vogt on 2010-02-08

* debian/control:
  - add missing Replace: firefox-3.0 for the firefox-branding
    package (LP: #518747). This fixes a upgrade issues from
    hardy to lucid.

508. By Jamie Strandboge on 2010-01-27

debian/usr.bin.firefox.apparmor.in: suppress mkdir of /usr/share/mozilla/
 (DAC prevents it anyway)

507. By Jamie Strandboge on 2010-01-27

add LP reference for last commit (LP: #513160)

506. By Jamie Strandboge on 2010-01-27

debian/usr.bin.firefox.apparmor.in: adjustments in rules for name change

505. By Jamie Strandboge on 2010-01-26

- remove extraneous -T -W from apparmor_parser
- check for disabled profile ourselves, since apparmor_parser on Ubuntu
  9.04 and earlier didn't honor the disable/ directory
- debian/firefox.preinst.in: unconditionally disable the AppArmor profile
  on Ubuntu 9.04 and earlier, since it requires abstractions found only
  in 9.10
- debian/control: have firefox Depends on lsb-release (needed in preinst)

504. By Jamie Strandboge on 2010-01-26

* debian/firefox.postinst.in:
  - remove AppArmor profile from dailies on upgrades (LP: #512470)
  - remove -T -W from apparmor_parser, so it works when people enable the
    profile on Ubuntu 9.04 and earlier

503. By Jamie Strandboge on 2010-01-25

[ Jamie Strandboge <email address hidden> ]
debian/firefox.postinst.in: remove AppArmor profile from dailies on
upgrades (LP: #512470)

502. By Alexander Sack on 2010-01-24

* fix firefox-3.5-gnome-support transitional package typo; depend
  on firefox-gnome-support instead of firefox-3.5-gnome-support
  - update debian/control

501. By Alexander Sack on 2010-01-23

releasing version 3.6+nobinonly-0ubuntu1