Merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/module-init-tools/oneiric-201106161411 into lp://qastaging/ubuntu/oneiric/module-init-tools

Proposed by James Westby
Status: Rejected
Rejected by: James Westby
Proposed branch: lp://qastaging/~ubuntu-branches/ubuntu/oneiric/module-init-tools/oneiric-201106161411
Merge into: lp://qastaging/ubuntu/oneiric/module-init-tools
To merge this branch: bzr merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/module-init-tools/oneiric-201106161411
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+64841@code.qastaging.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/module-init-tools now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/module-init-tools/oneiric-201106161411. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

17. By Andy Whitcroft

releasing version 3.16-1ubuntu1

16. By Andy Whitcroft

* Resync with debian 3.16-1.
 - Remaining changes:
    + update to debhelper version 7 for upstart job support
    + Ubuntu specific control scripts carrying upgrade quirks
    + Ubuntu specific modprobe.d/depmod.d contents
    + debian/patches/ubuntu-maps_by_default -- Reenable map files
    + switch source to 'unapply-patches' to simplify merging with
      debian upstream

15. By Andy Whitcroft

uncommit all local patches to simplify merging

14. By Andy Whitcroft

Rebuild existing Ubuntu 3.13-1ubuntu1 with fileids from Debian UDD branch

13. By Marco d'Itri

* New upstream release.
  + Supports 3.x kernels.
* Switched from docbook2man to docbook-to-man. (Closes: #593834)
* Documented depmod -E. (Closes: #618338)
* Added patch modinfo_print_tags: make "depmod -F param" print also
  parameters without a description. (Closes: #604017)
* Added patch fix_modprobe.d.5_alias to create a proper man page alias
  and use docbook-to-man instead of docbook2man since it appears to be
  slightly less broken than the other. (Closes: #593834)
* Removed support for /etc/modules-*.

12. By Marco d'Itri

* New upstream release.
  + modprobe -o is not supported anymore.
  + Added support for modules.devname for the benefit of udev.

11. By Marco d'Itri

Fixed spurious output of modprobe. (Closes: #574584, #574797)

10. By Marco d'Itri

New upstream snapshot.

9. By Marco d'Itri

New upstream snapshot.

8. By Marco d'Itri

* New upstream release.
  + Fixes a fork bombing issue with kernels <= 2.6.19. (Closes: #524940)
* Removed a bashism from the init script. (Closes: #547754)

Subscribers

People subscribed via source and target branches

to all changes: