debian/changelog | 8 ++++++++ debian/control | 1 - debian/patches/01_gen_pci_ids.diff | 14 -------------- debian/patches/series | 1 - debian/rules | 4 ++-- 5 files changed, 10 insertions(+), 18 deletions(-)
New commits: commit f064ca086d51ad8606ec8f9e2f0b4a01972438b5 Author: David Nusinow <[email protected]> Date: Mon May 4 22:28:49 2009 -0400 Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. Disable patch system and remove quilt from build-deps. diff --git a/debian/changelog b/debian/changelog index de1dfcf..ab55273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-nv (1:2.1.13-2) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + -- David Nusinow <[email protected]> Mon, 04 May 2009 22:27:31 -0400 + xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 79ba5a9..d41b547 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: David Nusinow <[email protected]>, Julien Cristau <jcris...@debian. Build-Depends: debhelper (>= 5.0.0), pkg-config, - quilt, xserver-xorg-dev (>= 2:1.5.99.901), x11proto-video-dev, x11proto-core-dev, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index 9abc542..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: xserver-xorg-video-nv/src/Makefile.am -=================================================================== ---- xserver-xorg-video-nv.orig/src/Makefile.am 2008-03-26 20:47:57.000000000 -0400 -+++ xserver-xorg-video-nv/src/Makefile.am 2008-03-26 20:53:20.000000000 -0400 -@@ -103,3 +103,9 @@ - EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h - nodist_nv_drv_la_SOURCES = $(xmode_sources) - endif -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = nv.ids -+ -+nv.ids : nv_driver.c -+ awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.ids diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b55d79f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_gen_pci_ids.diff diff --git a/debian/rules b/debian/rules index a6599da..db163fa 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ endif # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static -configure: $(STAMP_DIR)/patch +configure: dh_testdir autoreconf -vfi @@ -50,7 +50,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) >$@ -clean: xsfclean +clean: dh_testdir dh_testroot rm -f build-stamp -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
