← Back to branch summary

~smoser/ubuntu/quantal/module-init-tools/lp-1115710

Viewing all changes in revision 204.

  • Committer: Bazaar Package Importer
  • Author(s): Andy Whitcroft
  • Date: 2011-06-16 13:10:43 UTC
  • mfrom: (0.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110616131043-1vpt92u0vdzzq38f
Tags: 3.16-1ubuntu1
* 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
* debian/patches/ubuntu-modinfo-wantparm-uninitialised dropped
  now upstream

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: