~allison/ubuntu/natty/bsdmainutils/bsdmainutils.allison-natty-merge

Viewing all changes in revision 28.

  • Committer: Allison Randal
  • Date: 2011-01-10 19:02:32 UTC
  • mfrom: (2.2.16 sid)
  • Revision ID: allison@canonical.com-20110110190232-2l6jm4h9ney9diki
* Updates from the upcoming FreeBSD release 8.2:
  - calendars
  - hexdump manpages
  - libcalendar
  - ncal (Closes: #607960)
* Updates from OpenBSD 4.8:
  - calendar
* Adapted, removed and/or re-diffed patches.
* Updated debian calendar (Closes: #607837)
* Replace Conflict: on older bsdutils version with Break: to make lintian happy.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: