Hi again, One outstanding blocker for co-installable multiarch libc6 packages is that libc6 ships a lintian override file that contains paths to libraries, and all lintian overrides are installed under /usr/share - meaning that libc6 from different architectures needs to install a file with different contents to the same path. Since lintian doesn't really allow for your lintian overrides to be put in a -common (or -bin) package, a fix is needed so that the contents of this file are architecture-independent. The attached patch is a proposed implementation of this, which uses globbing to match libpthread-2.13.so, ld-2.13.so in any directory. This is slightly broader than it perhaps should be, but as there should only be one of these files in the libc package at any one time there is no real risk of false positives. Anyway, bug #617991 in lintian precludes tightening this match. This also fixes the filenames in the override file to match the current 2.13 in experimental. I'm also going to follow up with a patch against lintian so that overrides for ld.so aren't needed in the future. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slangasek@ubuntu.com vorlon@debian.org
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: steve.langasek@linaro.org-20110313190747-\
# 7fzf8wnwozm41coq
# target_branch: svn://svn.debian.org/pkg-glibc/glibc-\
# package/branches/eglibc-2.13/
# testament_sha1: d6bdc09a8cd62a6e829ab5d1cd7f773cf07cc563
# timestamp: 2011-03-13 12:08:32 -0700
# base_revision_id: svn-v4:6ef976f9-4de5-0310-a40d-91cae572ec18:glibc-\
# package/branches/eglibc-2.13:4581
#
# Begin patch
=== modified file 'debian/changelog'
--- debian/changelog 2011-03-11 21:36:31 +0000
+++ debian/changelog 2011-03-13 19:07:47 +0000
@@ -154,6 +154,12 @@
* debian/debhelper.in/libc.install: ld is always installed relative to
RTLDDIR, not SLIBDIR; a no-op for the moment, but relevant once we start
building for multiarch.
+ * debian/debhelper.in/libc.lintian-overrides: use a glob for the library
+ paths instead of doing a build-time substitution, so that the final
+ lintian override is architecture-independent and doesn't cause file
+ conflicts for multiarch.
+ * while we're at it, bump the soname in the lintian override so it actually
+ matches the current package.
-- Aurelien Jarno <aurel32@debian.org> Mon, 28 Feb 2011 23:43:03 +0100
=== modified file 'debian/debhelper.in/libc.lintian-overrides'
--- debian/debhelper.in/libc.lintian-overrides 2010-05-28 21:51:08 +0000
+++ debian/debhelper.in/libc.lintian-overrides 2011-03-13 19:07:47 +0000
@@ -1,13 +1,13 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.11.1.so
+LIBC: unstripped-binary-or-object */libpthread-2.13.so
# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit SLIBDIR/ld-2.11.1.so 0755
+LIBC: shlib-with-executable-bit */ld-2.13.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC: shared-lib-without-dependency-information .SLIBDIR/ld-2.11.1.so
+LIBC: shared-lib-without-dependency-information */ld-2.13.so
# dependency on debconf is not needed, as glibc has a fallback to tty
LIBC: missing-debconf-dependency-for-preinst
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb3vF9QAEoRfgEAwVvf//38n
XoS////wYBOfbffUXjJiyrSPRpVISkoJAKg4pajpqqA1gqSkKV2MVKwxkQ1U/VPKAabU2oGEyaGQ
AAAGRkNANCaTU9MJlRtQDQAAAAAB6gBzAEYJiAYBME0ZDQwCYIxMJNSEUypvSabE1TyJ41Jtpqmg
9CAZABkAikI0TExMgQlHjUyZqNIBkaNDRiHqBUogAEBAiYAptNJqZonqPUBo0NPUeTqFwu6dP7dO
zw8M81bcFafbP2w/oUP6aPzsWWlRgSICEGQanYO/zohzQ/TD2C4MPBjEamK1uWV+ZWJggczz98S4
X1fvsq6Gl1Q44dAAaKUDEAEInVaBJPMSCEq2yskWWV99VcEFu2kq7TobxEiQSStw4GFjGNWiTAUW
Eu6s8nK+WjDnYWbLya9js8WoWbNwPVABcLzvPxysGtIht5TPMAqLsDEXSWmQRVWIqkYwWCt+wNv9
QgacspFzkZIba5rKG1ldHIJaYetKEzTCGYZFSw4GYELm4KlzGQWhbkrAMHPBglr00pTOnfyA8AKc
X46kgkeleny/WXkip62ZIhkQfiseJRYZz2P6rHooRjmp/V/4/jJ1+MmG7TH7lqsWKuzhksS89oYu
cxcSXYsJgFVJIpii61gUNFzBY/diDRjNVGDBVRuxaGtOQsGvu4cPN2dd6Ow7fPdK8pOo0mwNZciX
L3WWOlgsm+TP471ZXjN3EcdxqOzoo0HovbLoPrkA2wt1212wJHxbBwQxOicEooUE5hakXIoX/lTj
TX1Wp+dE7tvcfvY6Nn7fXL2ySMduAngCHigp6L0VXwAPUBuJVVZAFi0VWZ1DkH6Bqsl9aND6Q4I1
Dijcu52LTgAaKhJak1fWB0uw5SnjkvsXSAJ0ts5XW3B2YDGmVc/PopQKFE5iwEoAUBzwJDmZNWoF
U+Xq179ejfss+e98Yya1gHJ44TlJka4S/iVEuRGbsiqoqqlVQVVVWqtam3g48Xq6fFasrvELCiKC
iVpGFIbBQKRiEs1JkdI+QAtJJO3FysGg3Bkqti1norIkZUV6Py+z7WZa4+5lc1K2yI98VYVS0LDU
yuRuvAIgTiYnKXDHlhMwuwxqH8MoNh1KND7+umc54xNOa83WtNbN0RvcGildi6iSUD9kc7ejY4vX
MVjmykV4kpxWZBiFuazvWLjTY51OWd8kTCFYcAswnOiE4teESAxlUojYuvNf6XCnyXgqvSe1yCkt
jMwn7Re2W1vvW2WawgpErr8L19FgRLQjOImQheeVCFXtSJjHmhHm97jc8iYL5LUCQvEZwicdbATf
SIEjTcVpwRv+S7Lnn1K1MSctszawKY8tNO8rBxMDny7HSvHibmtlRE0xg4cdVQ84AdbOuSJdwDW9
aQLsAbkym1OuEa2LMHIDvjzNRnJ2wripGHZMaZt7dDV532XBIMECso5GUBjGMrnOZ4L9sKhqVMC2
VEFKFDPkAc9qY3BhvljvXkVNZ1jUJYFpgVsRwvi+/CZ3dmrmxuOGl51Ms7qleW0SmhvioJk8Mi7J
OBXDIvMMrm9NOk7Foq5dhLQ/kKQ6umrJUyWt3V1cbKuVzK8oW0p3dJjhlvqqt5fwmGVT3o9EfmJi
AVzOaYwGFJJrwLJVwuyi5G2TEEEpCNu4iahRJKrS2y67C+SR0csYjLt6Zhupq57twooH70xSijO1
+wZRK40yka5q4bnPXhsbFzn4MsFMDm3q50axOUToM27Vks2ywvUw8OjMbWa6YxNwoxmGGvZZvrey
rfjWnVdHtxRpEosMIFQ1CgrxVWMsuAta23k+IdQK8w0R+lHbwWhZtbEIGsCeWl286ddka9TQAg5Q
XlsK7mNrt3GmZczMlnflVzrPFxW7K3BdJ8JJQOKpqJZGsp8QoYxkEg9Sq+gBLkbErIlBg7YkwCEd
5BPAmteTJMQLJlMlVnPWLYmPdrk0t6Z5dUZ1phdUMlF9NqNXa866MGq2WLsd+KjfX7LlIemVpbu4
zbMY7hocbbtEzfI3pAeRRCCDikc6naDevDNVeAah5pvEUolKFKFKRRULdZNWuWm7irKuhnqp9Ap4
sphxl4vBu3bLrFjPg0Ns2/bW3fr420tmdKje6uFzCbrvKqpzurdrljmUzrfna2zUdIlueLTJHbHi
+8dOmnToewNdeme/Rdhdvfhffvzd+yXWUnTdeZeC/5YS3SXSaiaNm+R4Ub0VpcxbUbs+s2X3gPNW
AGznZBF6qz+tHWZ2vrXADIApzuJPOAwNjhYGjBUXAORMnphOYZKrMdbZWJ0oLTFbvkLjjLbDy1va
7ambZl4SSThbKuatW5u0OVy1q6WbX+EmqSbkMt8vBv24OCjq5GSy+xvrYy0cmjVfyL1zlW1Rbuv2
epDkGPFOKOklkY7MV3OMeWFhciVUDLhdasqxWcmKUpyNOZ5X4cmCreJ1T8ZnZV3v5Tc5aUtt13ZJ
r3YW8O9DBS5bFxu0Y58turfJmvykoIvbc5LBMWTRXNszcMNi1Q6NnVjjyaV4vYMceobo/CJcMnRw
4d66eQCqq1LUSp0gzvuvBS7qqt4aZtpoPIw8GV67fS0Mp8gxOxwpp3112U8NW9mbvylZFcXlqGBw
u7Jg8iOWmJoXSO5QMnkUJF+su6zhbjKpBqWBMu2vrtj0mcS6xjMwlnhTC4nt5o9QD3I+xZnxP7CS
NunNc52xEd0YUorCWAQOC4rIiWUySxmsxUi0C9ZKlFkKwtixRUmCFVW25GG5YVZ9vkfh9ypMD1ye
U2kOVCNAI0KBVCREEikN5ZFigqij6e/rk4gHrA9QBzgcwGwgk07gAn6fJJyhzowjBBgwQiwP2Fp7
hI/EegflFIhnb+ffIUQoLap+g34CVDqAu2Bnw9/LIfC83eFe+qh9IDzE01O0hzkiRN0jJJw43ADB
PD0HmwSTNAOHSdx9Sd5maP1qrXX4fI+CNvxLMZE77qE/SZ9n2EsyLTES6C8xw4/K3W63ua2lrsp/
OJHg8Dvwc2DX8GRhQwWqrBh6IJ3XqqyfuHxPv5F8AfM1bBCa1XRIYkKvsP5AntQ/VbPv4xLFx4xE
0BNGqNVj+IicYsVYZTJWRs4esP0n8P1W+7IbSeXwMrPgUi/D2e/AtPe9h70+PwqHjFLZTS6WNEQ1
VcwtgFUTmGuclgiJBguFaLONy0pW4+Rk6kJoriv54bdHNlwx1vpIkfRO7QweMTrJ/6H4xLXvT2i9
G/1RJyVkE2GczpNVevbOwsPCW5v27F5bSgRicKnclPh3O5GGmuyWF2DZxwtY4rmUkk/06ubVqyv5
sq5NGiwsy0qFh5Fhoc+JUphxymXL5qde4PqH6CxFsY3yUJHrk/T1ZJ0HdgwVeKhnHviXrFikyw+R
YaxILLGyAiLFVmMiwsM8q1Oxtx+paePo9no28Xm1NGGv3Onrxep7Cq5pQy8pMGWTjTxE4OqSdOeD
ob8mMnRybTbo035SQzbNHbPLm1l5ksWNN1Sh4xqa8lG0kkzPJ5oe5KHmqqE/zt6evxsspTy0eSfE
o6bhyDvgnZ9JI7Os8KN0xk+Vz8B7XwffPiofRavCx9fq1WJjKqsFrJyYvbkJesNFi8EpEsCjx+fv
WMfD5X5fLjfGryfGzRS96Ho82753/M5HGMxZV7VUzS6glUKiLYZEREdtY3EAALYKgS28MxdSl05a
GhbsYuPb0r+8Ogdk70KUTzpSRDCSHqAc1Xew6HfQMLMs9VFNQoqu4feYH9w4m//vYaBhyMDEzj0f
OsjuYGq162zu8sZrctfFVcj3fFHqvxANFyXzARx9vHSz8NMl8bdeflvWq1l7dyPb+a2i5B7BD2CB
8DYJ+oZFhsQqe9EgVmNBAj3ea29qAFQS1ZBwIFA+DNQUrEsPvk+9kkyfrMWgibRA9A5zVCq3HxOp
3PGfGfPBHxqQHcjwvgvJS9y/8F0q+j0F8kk+Xs4Pc4kklWGzV2b+4bWq1X4MuMdrHJykjNW5sr6S
R7X7B+4KofNhU3WQe1Gc11A7jYEA9kFJEAQAjGqqEhCUnFELVQqYL0R8Q0U/iCg9ySKIULJDD0QW
ySfRbVcVGqiYLJXKAqAMAEIQEn1oCxmsj1r81QoCSWxfFUuWaP7g8BD6CAAtB3d0ofZJLWoJu7SS
ZuVDxbuGQ0MiPz9UnjJnJwO8QyZplHP1RDkWFjyHzkyGQb/ANAydImDxHpU9AVkqqsBLCR7A9Ukn
yieyJq9aknomJHNVmslkMIngADB+pHmfWBebpApyKAye1GLxOx95Ififm0VFSpxRs+D8wT8/da6h
3RZJRxJRq4Q9f/VUHSNqlrqjM/gj0O0PvR8AOgdDIDlpJTE7F8qFGb5C1J7pOwtk7ujGTCSOq07m
TMjkWiFWiBSoiCKEBAEnSWkJAHmrC0GCa8kYAZkFQCQgP1IzLAQvSCirIYK0QkpQRXquIgXJQGRQ
qizBIRItGQrJE+gDAfGA1Uk+LqCfgHqbrPo4WoVWSeD5ybJfLlQX0kzefn4SYjPRRFRwLHEklZPO
BPCsh/dbEdJ3+B0Mg59xc7Q/lyDDAMEKw+SwAQK7bVVOJ2HEQMFn0PDwaTOS6fJk+aPuC+S2JT7m
OawrqqWy1VYATIQn1Roq2ihaH81g+ZxLw6lAvncscuWx6iqI7LRaKnmjcgDpjG78OAJ5BQLyNASy
TrfgjFgRepJ/2/t/9tcjT8UNdPgP1mggVKrBAuIc0ofk9SdARwR0SUGXfJUlg0AQm7xiTtZFRFkT
aAWA0wgUAaA4oKCgsUFkb6DvIURSpOBBkoo8h6YnxESolESgZUiVBCoJQ1BKiURKiV4SbyVJJkZC
Sgp/OJYxbPs5WSx4KLntfBesdl9q1euXFJLJKB9QWHhIWqqSySxc7SfoLATcH1kuKyHKp8GS6Skm
2pFhvJ5sUeJUIMBkWK4E1W5EgIW0Q9QED0NitgrxWYQPE0LBLx79AmJ5r/VfQKFBDhhiro+sSrmw
dy4vTZHaSeaOSgJziMCPyiWRDYPXSJb60mweYfzRyS1Ty2HvGw+7YkX5d6UHR1KhqFsGeTCO4nmj
PdA7gfajsB+1HivYA/+LuSKcKEhe94vqAA==
Attachment:
signature.asc
Description: Digital signature