[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.8-dfsg-1-2-g19ab752

[Felix Geyer]

The following commit has been merged in the master branch:
commit 19ab7525b7c8a06eaecacb586cb458c9c7fc418d
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Feb 19 18:37:18 2012 +0100

    Install vboxvideo_dri.so into the directory provided by the dri pkg-config file. (LP: #930324)

diff --git a/debian/changelog b/debian/changelog
index 1e4af3d..ea6e31f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.1.8-dfsg-2) unstable; urgency=low
+
+  * Install vboxvideo_dri.so into the directory provided by the dri pkg-config
+    file. (LP: #930324)
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 19 Feb 2012 17:17:04 +0100
+
 virtualbox (4.1.8-dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 87d20f0..1e5e8ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,6 +164,11 @@ ifeq ($(DIST_NAME),Ubuntu)
 	    debian/$(gdkms)/usr/share/apport/package-hooks/$(gdkms).py
 endif
 
+override_dh_link:
+	dh_link
+	dh_link -p$(uxname) --ignore debian/$(uxname).links \
+	    /usr/lib/VBoxOGL.so $(shell pkg-config --variable dridriverdir dri)/vboxvideo_dri.so
+
 override_dh_fixperms:
 	dh_fixperms
 
diff --git a/debian/virtualbox-guest-x11.links b/debian/virtualbox-guest-x11.links
deleted file mode 100644
index 270fbd4..0000000
--- a/debian/virtualbox-guest-x11.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/VBoxOGL.so /usr/lib/dri/vboxvideo_dri.so

-- 
virtualbox Debian packaging