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 8884e2fc690811881c7043bd3f487e18f9ff63bb Author: David Nusinow <dnusi...@debian.org> Date: Mon May 4 22:05:29 2009 -0400 Remove 01_gen_pci_ids.diff. The server now uses an internal table to choose a driver during autoconfiguration. Disable the patch system and remove quilt from the build-deps diff --git a/debian/changelog b/debian/changelog index f52cdae..efe4d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-i740 (1:1.3.0-2) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The server now uses an internal table to + choose a driver during autoconfiguration. + + Disable the patch system and remove quilt from the build-deps + + -- David Nusinow <dnusi...@debian.org> Mon, 04 May 2009 22:04:28 -0400 + xserver-xorg-video-i740 (1:1.3.0-1) unstable; urgency=low * Run autoreconf on build. diff --git a/debian/control b/debian/control index 8d17fbe..c504b6d 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau <jcris...@debian. Build-Depends: debhelper (>= 5.0.0), pkg-config, - quilt, automake, libtool, xutils-dev, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index ff805b5..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- xserver-xorg-video-i740.orig/src/Makefile.am -+++ xserver-xorg-video-i740/src/Makefile.am -@@ -41,3 +41,6 @@ - i740_pcirename.h \ - i740_reg.h \ - i740_video.c -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = i740.ids ---- /dev/null -+++ xserver-xorg-video-i740/src/i740.ids -@@ -0,0 +1,2 @@ -+003D00D1 -+80867800 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 9e07675..34f3df2 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ endif confflags += --disable-static build: build-stamp -build-stamp: $(STAMP_DIR)/patch +build-stamp: dh_testdir autoreconf -vfi @@ -45,7 +45,7 @@ build-stamp: $(STAMP_DIR)/patch cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) >$@ -clean: xsfclean +clean: dh_testdir dh_testroot rm -f build-stamp -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org