-
Committer:
Bazaar Package Importer
-
Author(s):
Luca Falavigna
-
Date:
2008-11-25 19:18:20 UTC
-
mfrom:
(3.2.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081125191820-1s47h04i2biz387r
Tags: 1.6c.really1.6c.nobin-1ubuntu1
* Merge from Debian unstable (LP: #295811), remaining Ubuntu changes:
- debian/rules: Remove 'dpkg-distaddfile $(loadlin_zip).zip
byhand -' so that the package gets uploaded properly.
* Build-depend against yasm (>= 0.7.1-0ubuntu2) for TASM support.
* Fix FTBFS with Ubuntu toolchain:
- debian/patch-stack_protector: make put_hex function static.
- debian/rules: apply debian/patch-stack_protector patch.