Bug#712304: glx-diversions: broken symlinks with libgl1-mesa-glx 9.1.3-6

[Michael Moravec]

Package: glx-diversions
Version: 0.3.90
Followup-For: Bug #712304

Hello,

I have also experienced this problem. Installing glx-diversions=0.3.90
completely breaks mesa installation:
$ glxinfo
glxinfo: error while loading shared libraries: libGL.so.1: cannot open shared
object file: No such file or directory

Purging glx-diversions didn't help, only reinstalling libgl1-mesa-glx fixed the
problem.

I was digging into this previously, when I was experimenting with fglrx. It
seems mesa 9.1.x installs libGL.so.1 and libGL.so.1.2.0 whereas mesa 8.0.x used
to install libGL.so.1 and libGL.so.1.2.

The attached patch fixed all the problems for me.



-- System Information:
Debian Release: jessie/sid
  APT prefers experimental
  APT policy: (750, 'experimental'), (700, 'unstable'), (650, 'testing'), (600,
'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11-rc4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages glx-diversions depends on:
ii  dpkg                      1.17.0
ii  nvidia-installer-cleanup  20130803+1

Versions of packages glx-diversions recommends:
pn  glx-alternative-mesa  <none>

glx-diversions suggests no packages.


*** /data/build/glx-diversions/fix-mesa-divert/fix-712304.diff
Index: debian/glx-diversions.postinst
===================================================================
--- debian/glx-diversions.postinst      (revision 4097)
+++ debian/glx-diversions.postinst      (working copy)
@@ -26,7 +26,6 @@
        # make new diversions
        add_multiarch_diversion libGL.so /usr/lib /usr/lib/mesa-diverted
        add_multiarch_diversion libGL.so.1 /usr/lib /usr/lib/mesa-diverted
-       add_multiarch_diversion libGL.so.1.2 /usr/lib /usr/lib/mesa-diverted
        add_multiarch_diversion libGL.so.1.2.0 /usr/lib /usr/lib/mesa-diverted

 fi
@@ -72,7 +71,7 @@
        # do some validation of the diverted libGL.so and libGL.so.1
        for triplet in $TRIPLETS ; do
                validate_diverted_symlink /usr/lib${triplet}libGL.so /usr/lib
/mesa-diverted${triplet}libGL.so mesa/libGL.so libGL.so.1
-               validate_diverted_symlink /usr/lib${triplet}libGL.so.1 /usr/lib
/mesa-diverted${triplet}libGL.so.1 mesa/libGL.so.1 libGL.so.1.2
+               validate_diverted_symlink /usr/lib${triplet}libGL.so.1 /usr/lib
/mesa-diverted${triplet}libGL.so.1 mesa/libGL.so.1 libGL.so.1.2.0
        done

 fi
Index: debian/glx-diversions.postrm
===================================================================
--- debian/glx-diversions.postrm        (revision 4097)
+++ debian/glx-diversions.postrm        (working copy)
@@ -37,7 +37,6 @@

        # restore libGL.so* from libgl1-mesa-{glx,dev}, diverted to /usr/lib
/mesa-diverted
        remove_multiarch_diversion libGL.so.1.2.0 /usr/lib /usr/lib/mesa-
diverted
-       remove_multiarch_diversion libGL.so.1.2 /usr/lib /usr/lib/mesa-diverted
        remove_multiarch_diversion libGL.so.1 /usr/lib /usr/lib/mesa-diverted