[Pkg-virtualbox-commits] [virtualbox] 12/17: Revert "Try to use Vbox provided GL.so and EGL.so libraries"

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit b0096cc0322414d558ddd8d88e596f0d688e294a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Aug 23 18:18:31 2016 +0200

    Revert "Try to use Vbox provided GL.so and EGL.so libraries"
    
    This reverts commit 9b4eb6f74ca9bb1a289f2786585d4df606f78e1d.
---
 debian/changelog                                   |  4 ----
 debian/virtualbox-guest-x11.dirs                   |  1 -
 debian/virtualbox-guest-x11.files/00vboxvideo.conf |  1 -
 debian/virtualbox-guest-x11.install                |  4 ----
 debian/virtualbox-guest-x11.links                  |  4 ----
 debian/virtualbox-guest-x11.postinst               | 17 -----------------
 debian/virtualbox-guest-x11.prerm                  | 16 ----------------
 7 files changed, 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3111721..247a071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,9 @@
 virtualbox (5.1.4-dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream major release, patch refresh.
-    LP: #1599775
   * Update dependencies to qt5
   * Regenerate manpages
 
-  [ Gianfranco Costamagna, Peter Meiser ]
-  * Major rewrite of the guest-additions GL library handling
-
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 17 Aug 2016 10:33:49 +0200
 
 virtualbox (5.0.24-dfsg-1) unstable; urgency=medium
diff --git a/debian/virtualbox-guest-x11.dirs b/debian/virtualbox-guest-x11.dirs
deleted file mode 100644
index 0369ff7..0000000
--- a/debian/virtualbox-guest-x11.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.files/00vboxvideo.conf b/debian/virtualbox-guest-x11.files/00vboxvideo.conf
deleted file mode 100644
index 0369ff7..0000000
--- a/debian/virtualbox-guest-x11.files/00vboxvideo.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.install b/debian/virtualbox-guest-x11.install
index 04db04c..3b7aa74 100644
--- a/debian/virtualbox-guest-x11.install
+++ b/debian/virtualbox-guest-x11.install
@@ -3,7 +3,3 @@ src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox
 src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d
 out/bin/additions/VBoxOGL*.so /usr/lib
 out/bin/additions/VBoxEGL*.so /usr/lib
-out/bin/additions/VBoxOGL*.so /usr/lib/virtualbox/additions
-out/bin/additions/VBoxEGL*.so /usr/lib/virtualbox/additions
-
-debian/virtualbox-guest-x11.files/00vboxvideo.conf /usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.links b/debian/virtualbox-guest-x11.links
deleted file mode 100644
index 282e9ac..0000000
--- a/debian/virtualbox-guest-x11.links
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/lib/virtualbox/additions/VBoxOGL.so /usr/lib/virtualbox/additions/libGL.so.1
-/usr/lib/virtualbox/additions/VBoxOGL.so /usr/lib/virtualbox/additions/libGL.so
-/usr/lib/virtualbox/additions/VBoxEGL.so /usr/lib/virtualbox/additions/libEGL.so.1
-/usr/lib/virtualbox/additions/VBoxEGL.so /usr/lib/virtualbox/additions/libEGL.so
diff --git a/debian/virtualbox-guest-x11.postinst b/debian/virtualbox-guest-x11.postinst
index 2e3bcff..748d03a 100644
--- a/debian/virtualbox-guest-x11.postinst
+++ b/debian/virtualbox-guest-x11.postinst
@@ -2,24 +2,7 @@
 
 set -e
 
-ARCH=`dpkg --print-architecture`
-
 if [ "$1" = "configure" ]; then
-
-        if [ "$ARCH" = "amd64" ]; then
-            update-alternatives --force \
-                --install /etc/ld.so.conf.d/x86_64-linux-gnu_GL.conf x86_64-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
-
-            update-alternatives --force \
-               --install /etc/ld.so.conf.d/x86_64-linux-gnu_EGL.conf x86_64-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
-        else
-            update-alternatives --force \
-               --install /etc/ld.so.conf.d/i386-linux-gnu_GL.conf i386-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
-
-            update-alternatives --force \
-               --install /etc/ld.so.conf.d/i386-linux-gnu_EGL.conf i386-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
-        fi
-
 	ldconfig
 fi
 
diff --git a/debian/virtualbox-guest-x11.prerm b/debian/virtualbox-guest-x11.prerm
deleted file mode 100644
index d1ec441..0000000
--- a/debian/virtualbox-guest-x11.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-ARCH=`dpkg --print-architecture`
-
-case "$1" in
-	remove)
-            update-alternatives --remove x86_64-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
-            update-alternatives --remove x86_64-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
-            update-alternatives --remove i386-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
-            update-alternatives --remove i386-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
-	    ldconfig
-	;;
-
-esac
-##DEBHELPER##

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git