diff -u nvidia-graphics-drivers-updates-304.64/debian/control nvidia-graphics-drivers-updates-304.64/debian/control
--- nvidia-graphics-drivers-updates-304.64/debian/control
+++ nvidia-graphics-drivers-updates-304.64/debian/control
@@ -12,8 +12,7 @@
 Package: nvidia-current-updates
 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},
- ${xviddriver:Depends}
+ patch, acpid, ${shlibs:Depends}, ${xviddriver:Depends}
 Recommends: nvidia-settings-updates
 Provides: ${xviddriver:Provides}
 Conflicts: nvidia-current-modaliases, nvidia-180-modaliases, nvidia-185-modaliases
diff -u nvidia-graphics-drivers-updates-304.64/debian/control.in nvidia-graphics-drivers-updates-304.64/debian/control.in
--- nvidia-graphics-drivers-updates-304.64/debian/control.in
+++ nvidia-graphics-drivers-updates-304.64/debian/control.in
@@ -12,8 +12,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},
- ${xviddriver:Depends}
+ patch, acpid, ${shlibs:Depends}, ${xviddriver:Depends}
 Recommends: nvidia-settings-updates
 Provides: ${xviddriver:Provides}
 Conflicts: nvidia-current-modaliases, nvidia-180-modaliases, nvidia-185-modaliases
diff -u nvidia-graphics-drivers-updates-304.64/debian/changelog nvidia-graphics-drivers-updates-304.64/debian/changelog
--- nvidia-graphics-drivers-updates-304.64/debian/changelog
+++ nvidia-graphics-drivers-updates-304.64/debian/changelog
@@ -1,3 +1,14 @@
+nvidia-graphics-drivers-updates (304.64-0ubuntu0.2) precise-proposed; urgency=low
+
+  * debian/control{.in}:
+    - Drop all the dependencies on the linux-headers (LP: #1080588).
+  * debian/substvars:
+    - Add an alternative dependency on xserver-xorg-core-lts-quantal
+      (LP: #1080588).
+    - Drop versioned dependency on the xserver.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Thu, 17 Jan 2013 12:01:32 +0100
+
 nvidia-graphics-drivers-updates (304.64-0ubuntu0.1) precise-proposed; urgency=low
 
   * debian/dkms.conf.in,
diff -u nvidia-graphics-drivers-updates-304.64/debian/rules nvidia-graphics-drivers-updates-304.64/debian/rules
--- nvidia-graphics-drivers-updates-304.64/debian/rules
+++ nvidia-graphics-drivers-updates-304.64/debian/rules
@@ -11,9 +11,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-VIDDRIVER_PROVIDES = xorg-driver-video
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 # If the host is i386 set OTHER_ARCH to x86_64 and vice versa
 OTHER_ARCH := $(shell (echo "$(DEB_HOST_MULTIARCH)" | grep i386 >/dev/null) && \
@@ -135,18 +132,10 @@
 DEB_SHLIBDEPS_INCLUDE_$(PKG_driver) := $(CURDIR)/debian/$(PKG_driver)$(PKG_libdir)/:$(libdir)/
 DEB_SHLIBDEPS_INCLUDE_$(PKG_driver_dev) := $(CURDIR)/debian/$(PKG_driver_dev)$(PKG_libdir)/:$(libdir)/
 
-# This makes sure that the xserver ABI is bumped to match the current one when the
-# packages are built
-.PHONY: serverabi
-serverabi:
-ifeq ($(VIDEODEP),)
-	@echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
-	@exit 1
-else
-	echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PKG_driver).substvars
-	# the following is there for compatibility...
-	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars
-endif
+.PHONY: gen-abi-substvars
+gen-abi-substvars:
+	# Generate the xserver ABI dependencies
+	cat debian/substvars >> debian/$(PKG_driver).substvars
 
 .PHONY: regen-from-templates
 regen-from-templates:
@@ -266,7 +255,7 @@
 
 #binary-install/$(PKG_driver_dev)::
 
-binary-install/$(PKG_driver):: serverabi
+binary-install/$(PKG_driver):: gen-abi-substvars
 ifeq ($(DEB_BUILD_ARCH),amd64)
 	#32 bit libraries on 64 bit
 	dh_installdirs -p$(PKG_driver) "$(PKG_libdir32)"
@@ -349,3 +338,3 @@
 	rm -fr debian/temp
-
+	rm -f debian/$(PKG_driver).substvars
 
only in patch2:
unchanged:
--- nvidia-graphics-drivers-updates-304.64.orig/debian/substvars
+++ nvidia-graphics-drivers-updates-304.64/debian/substvars
@@ -0,0 +1,2 @@
+xviddriver:Depends=xorg-video-abi-11|xorg-video-abi-12|xorg-video-abi-13, xserver-xorg-core | xserver-xorg-core-lts-quantal
+xviddriver:Provides=xorg-driver-video