-
Committer:
Jackson Doak
-
Date:
2013-08-16 21:42:39 UTC
-
mfrom:
(7.1.13 sid)
-
Revision ID:
noskcaj@ubuntu.com-20130816214239-jhkowlj1eni45lzw
* Merge from Debian unstable. Remaining changes:
- dpkg-cross:
+ Handle datarootdir specially in .pc files; it should keep the original
prefix.
+ Handle lines containing '${exec_prefix}/bin' specially in .pc files;
these are normally development tools, so should keep the original
prefix. (For example, orbit_idl in ORBit-2.0.pc.)
+ Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
This fixes issues with arch-qualified include files being moved to
“doubly-qualified” paths.
+ Handle biarch linker scripts