* Fake merge from Debian experimental git. Remaining Ubuntu changes: - debian/control + Drop lesstif-dev from Build-Depends; it's in Universe. + Comment out GLw libs since it depends on lesstif-dev. + Drop i686 swx11 libgl package. + Add libdrm-dev to mesa-common-dev Depends. + Drop libwayland-dev from Build-Depends; it's in Universe. + Update Breaks for Ubuntu versions - debian/rules + Use --disable-glw for swx11 targets too. + Don't enable motif for swx11 targets. + Use lzma compression for binary debs to save CD space. + Drop unloved mach64 driver. + Use --enable-shared-dricore to claw back CD space. + Enable llvmpipe software rasteriser on amd64 and x86. + Drop Wayland EGL platform. - debian/patches + 100_no_abi_tag.patch + 101_ubuntu_hidden_glname.patch + 103_savage-expose_fbmodes_with_nonzero_alpha.patch - rules, libgl1-mesa-{glx,dev,swx11,swx11-dev}.install.in, libgl1-mesa-{glx,swx11}.{postinst,prerm}.in, libgl1-mesa-dev.links.in: Install libGL.so* in /usr/lib/mesa to allow things to work with alternatives. - debian/not-installed: + Drop i686 files; we don't build 686-optimised packages in the first place. - debian/gbp.conf + Point at Ubuntu branch to make git-buildpackage less narky. - debian/libgl1-mesa-dri-experimental.install.{i386,amd64}.in: + Install llvmpipe and i915g on i386 and amd64 - 113_fix_tls.diff: Fix crashes in unrelated code due to TLS usage. - debian/patches/111_export_searchdirs_in_dripc.diff: + Add drisearchdirs variable to dri.pc so the Xserver can pick up the alternate DRI driver dirs. - debian/patches/115_llvm_dynamic_linking.diff + Dynamically link DRI drivers to libllvm. Saves ~6MiB per DRI driver. - debian/patches/116_use_shared_galliumcore.diff: - debian/libgl1-mesa-dri.install.in: + Link gallium DRI drivers against shared gallium routines to save CD space. * Enable llvm on armel as well as i386 and amd64