[Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

[Robert Hooker]

Yes but our xserver is from a post-squeeze release, as you can see by
the FTBS it doesn't build.

Here's how I patched nvidia-current which was in the same situation
hardcoding the xsfbs variables in debian/rules for example

diff -Nru nvidia-graphics-drivers-256.44/debian/control nvidia-graphics-drivers-256.44/debian/control
--- nvidia-graphics-drivers-256.44/debian/control	2010-08-10 07:27:10.000000000 -0400
+++ nvidia-graphics-drivers-256.44/debian/control	2010-08-10 10:45:39.000000000 -0400
@@ -11,7 +11,7 @@
 Package: nvidia-current
 Architecture: i386 amd64 lpia
 Depends: x11-common (>= 1:7.0.0), make, sed (>> 3.0), dkms, linux-libc-dev, libc6-dev,
- linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}
+ linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, ${xinpdriver:Depends}
 Recommends: nvidia-settings
 Provides: ${xviddriver:Provides}
 Description: NVIDIA binary Xorg driver, kernel module and VDPAU library
diff -Nru nvidia-graphics-drivers-256.44/debian/control.in nvidia-graphics-drivers-256.44/debian/control.in
--- nvidia-graphics-drivers-256.44/debian/control.in	2010-07-31 17:25:07.000000000 -0400
+++ nvidia-graphics-drivers-256.44/debian/control.in	2010-08-10 10:44:28.000000000 -0400
@@ -11,7 +11,7 @@
 Package: #DRIVERNAME#
 Architecture: i386 amd64 lpia
 Depends: x11-common (>= 1:7.0.0), make, sed (>> 3.0), dkms, linux-libc-dev, libc6-dev,
- linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}
+ linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, ${xinpdriver:Depends}
 Recommends: nvidia-settings
 Provides: ${xviddriver:Provides}
 Description: NVIDIA binary Xorg driver, kernel module and VDPAU library
diff -Nru nvidia-graphics-drivers-256.44/debian/rules nvidia-graphics-drivers-256.44/debian/rules
--- nvidia-graphics-drivers-256.44/debian/rules	2010-07-31 17:25:07.000000000 -0400
+++ nvidia-graphics-drivers-256.44/debian/rules	2010-08-10 10:44:01.000000000 -0400
@@ -19,10 +19,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 
 
@@ -107,13 +107,15 @@
 # packages are built
 .PHONY: serverabi
 serverabi:
-ifeq ($(SERVERMINVERS),)
-	@echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+	@echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
 	@exit 1
 else
-	echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PKG_driver).substvars
+	echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PKG_driver).substvars
+	echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PKG_driver).substvars
 	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars
 	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars
+	echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
 endif
 #			 $(PKG_driver).shlibs              \

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu
Package Archive Administrators, which is a direct subscriber.