~ubuntu-branches/ubuntu/lucid/procps/lucid-proposed

Viewing all changes in revision 13.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-11-03 18:28:41 UTC
  • mfrom: (2.1.1 etch)
  • Revision ID: james.westby@ubuntu.com-20061103182841-vy1e757c36kyxjil
Tags: 1:3.2.7-3ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - debian/rules: Add debian/sysctl.conf.$(DEB_HOST_ARCH) to default
    sysctl.conf file.
  - debian/sysctl.conf.powerpc: Mouse button emulation.
  - debian/postinst, debian/rules: Place init script at priority 17.
  - debian/sysctl.conf: Set kernel.printk to default values 4 4 1 7 to avoid
    cluttering consoles on powerpc.
  - debian/procps.sh: Respect $VERBOSE.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: