~vibhavp/ubuntu/raring/spl/merge-from-debian

Viewing all changes in revision 22.

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2012-07-26 12:27:29 UTC
  • mfrom: (3.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20120726122729-rtfllxh43ai83hlz
Tags: 1.0~pre6-3.1ubuntu1
* Merge from Debian unstable. Remaining changes:
  + Add 03_ubuntu_multiarch:
    debian/rules: Use multiarch locations. Fixes FTBFS. (LP: #852606)
  - Prefer Debian's 02_fix-ld---as-needed-ftbfs, which means we need
    to reverse-apply it in the actual source so that the patch will
    apply upon `quilt push -a'.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: