-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-10-28 18:05:40 UTC
-
mfrom:
(4.1.4 sid)
-
Revision ID:
james.westby@ubuntu.com-20101028180540-r13381kpkamebpng
Tags: 6.1.5-15+nmu1ubuntu1
* 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
- 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.
* Dropped changes:
- Pull in updated debian/control from Debian for the tetex-bin transition:
already present in the merged version