OK, I've had a look at the ia32-libs package, and the sed script for
fixing the shlibs files is presumably broken, as it generates those two
lines in the shlibs file without a library.

I replaced the two sed calls around line 90 of debian/rules with this:

sed -e "s/^\(\(udeb: \)*[^ ]* *[^ ]* *\)$*.*$$/\1$(notdir $(DEST)) (>= 
$(SHLIB_VERSION))/"

And it seems to work, producing the following diff from the installed
2.2 to the rebuilt package:
--- /var/lib/dpkg/info/ia32-libs.shlibs 2007-12-19 00:21:26.000000000
+1100
+++ debian/ia32-libs/DEBIAN/shlibs      2008-01-16 12:12:08.000000000 +1100
@@ -93,7 +93,7 @@
 libQtOpenGL 4 ia32-libs (>= 1.6)
 libQtAssistantClient 4 ia32-libs (>= 1.6)
 libQtDesigner 4 ia32-libs (>= 1.6)
-ia32-libs (>= 1.6)
+libsane 1 ia32-libs (>= 1.6)
 libsasl2 2 ia32-libs (>= 1.6)
 libSDL-1.2 0 libsdl1.2debian (>= 1.2.10-1)
 libsigc-2.0 0 ia32-libs (>= 1.6)
@@ -119,7 +119,7 @@
 libXft 2 ia32-libs (>= 1.6)
 libXi 6 ia32-libs (>= 1.6)
 libXinerama 1 ia32-libs (>= 1.6)
-ia32-libs (>= 1.6)
+libxml2 2 ia32-libs (>= 1.6)
 libXmu 6 ia32-libs (>= 1.6)
 libXmuu 1 ia32-libs (>= 1.6)
 libXp 6 ia32-libs (>= 1.6)

So that seems to fix the two occurances of bad shlibs lines, and should
hence fix the wine build.

I guess the udeb: could really be [^ ]*:, but I dunno if that syntax is
generic in shlibs files, or an exception for udebs. And in fact, udebs
support here is probably wrong, since udebs built under -m32 would end
up with dependancies on ia32-libs rather than the original -udeb
package. I'm not totally sure the should be left alone, either. It just
looks messy all over, maybe it'd be best to strip udeb: lines?

Regardless of udebs, this change looks to only be improvements to me.

I hope this change or equivalent can go in soonish so I can stop
rebuilding the wine package locally. ^_^

-- 
Paul "TBBle" Hampson, [EMAIL PROTECTED]

Shorter .sig for a more eco-friendly paperless office.

Attachment: pgpQ9MSB1EcSA.pgp
Description: PGP signature

Reply via email to