Viewing all changes in revision 16.
- Committer: Bazaar Package Importer
- Date: 2011-01-31 21:35:58 UTC
- mfrom: (1.1.4 upstream)
- Revision ID: james.westby@ubuntu.com-20110131213558-6zbj49ntalh7roxi
* Merge from debian unstable. Remaining changes:
  - Copied debian/am-utils.copyright to debian/copyright (now made via cat
    debian/am-utils.copyright.in COPYING > debian/copyright) to pass Ubuntu's
    upload checks for missing debian/copyright
* Dropped changes, now in Debian:
  - Fix the build by changing debian/patches/nfs-mount-version.patch to just
    hardcode the value, rather than testing NFS_MOUNT_VERSION, which isn't
    defined at that point, and including a file to get it causes namespace
    collisions. We know the value is 6 on Ubuntu and only going to rise.
  - Copied debian/am-utils.copyright to debian/copyright (now made via cat
    debian/am-utils.copyright.in COPYING > debian/copyright) to pass Ubuntu's
    upload checks for missing debian/copyright
* Dropped changes, now in Debian:
  - Fix the build by changing debian/patches/nfs-mount-version.patch to just
    hardcode the value, rather than testing NFS_MOUNT_VERSION, which isn't
    defined at that point, and including a file to get it causes namespace
    collisions. We know the value is 6 on Ubuntu and only going to rise.
- files added:
- .cvsignore
- files removed:
- Makefile.in
- files modified:
- AUTHORS
expand all
collapse all
added
removed
