[Pkg-virtualbox-commits] [virtualbox] 01/02: Drop compatibility with old X11 server packages.

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository virtualbox.

commit 1fa82a754a347c2218a98c54218c9e62668133d6
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Feb 1 18:52:00 2014 +0100

    Drop compatibility with old X11 server packages.
---
 debian/changelog |  6 ++++++
 debian/control   |  2 +-
 debian/rules     | 61 +++-----------------------------------------------------
 3 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd381a2..273699b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (4.3.2-dfsg-2) UNRELEASED; urgency=medium
+
+  * Drop compatibility with old X11 server packages.
+
+ -- Felix Geyer <fgeyer at debian.org>  Sat, 01 Feb 2014 18:50:13 +0100
+
 virtualbox (4.3.2-dfsg-1) unstable; urgency=low
 
   [ Ritesh Raj Sarraf ]
diff --git a/debian/control b/debian/control
index 5f10655..ab66303 100644
--- a/debian/control
+++ b/debian/control
@@ -194,7 +194,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${xserver:Depends},
          virtualbox-guest-utils (= ${binary:Version})
-Provides: ${xviddriver:Provides}
+Provides: xorg-driver-video
 Description: x86 virtualization solution - X11 guest utilities
  VirtualBox is a free x86 virtualization solution allowing a wide range
  of x86 operating systems such as Windows, DOS, BSD or Linux to run on a
diff --git a/debian/rules b/debian/rules
index 18c4c43..e5aa82d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,61 +24,8 @@ DIST_NAME := $(shell lsb_release -si)
 DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
 
 XSERVER_VERSION = 17
-XORG_PKG_ABI = 3
-
-ifeq ($(DIST_RELEASE),Debian/squeeze)
-	XORG_PKG_ABI = 2
-endif
-
-ifeq ($(DIST_RELEASE),Ubuntu/maverick)
-	XORG_PKG_ABI = 2
-endif
-
-ifeq ($(DIST_RELEASE),Ubuntu/lucid)
-	XORG_PKG_ABI = 1
-endif
-
-
-ifeq ($(XORG_PKG_ABI),3)
-	VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-
-	SERVER_DEPENDS = $(VIDEODEP)
-	VIDDRIVER_PROVIDES = xorg-driver-video
-
-	ifeq ($(strip $(VIDEODEP)),)
-		XORG_PKG_ABI_ERROR = VIDEODEP is empty
-	endif
-endif
-ifeq ($(XORG_PKG_ABI),2)
-	VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-	VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-
-	SERVER_DEPENDS = $(VIDEODEP)
-	VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-
-	ifeq ($(strip $(VIDEODEP)),)
-		XORG_PKG_ABI_ERROR = VIDEODEP is empty
-	endif
-	ifeq ($(strip $(VIDEOABI)),)
-		XORG_PKG_ABI_ERROR = VIDEOABI is empty
-	endif
-endif
-ifeq ($(XORG_PKG_ABI),1)
-	SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-	VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-
-	SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-	VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-
-	ifeq ($(strip $(SERVERMINVERS)),)
-		XORG_PKG_ABI_ERROR = SERVERMINVERS is empty
-	endif
-	ifeq ($(strip $(VIDEOABI)),)
-		XORG_PKG_ABI_ERROR = VIDEOABI is empty
-	endif
-endif
-
 
+SERVER_DEPENDS = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
 
 %:
 	dh $@ --with python2,dkms
@@ -86,8 +33,8 @@ endif
 override_dh_auto_configure:
 	@echo Building for $(DIST_RELEASE)
 
-ifdef XORG_PKG_ABI_ERROR
-	@echo 'error: $(XORG_PKG_ABI_ERROR)'
+ifeq ($(strip $(SERVER_DEPENDS)),)
+	@echo 'error: SERVER_DEPENDS is empty'
 	@exit 1
 endif
 
@@ -139,8 +86,6 @@ override_dh_auto_install:
 	sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gdkms).install.in > debian/$(gdkms).install
 
 	echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(uxname).substvars
-	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(uxname).substvars
-	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(uxname).substvars
 
 ifeq ($(DIST_NAME),Ubuntu)
 	echo "modaliases=vboxguest(pci:v000080EEd0000CAFEsv00000000sd00000000bc*sc*i*)" >> debian/$(gdkms).substvars

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