debian/changelog | 8 +++++++-
debian/control | 1 -
debian/patches/01_gen_pci_ids.diff | 14 --------------
debian/patches/series | 1 -
debian/rules | 4 ++--
5 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit 35ad3f37cf6b787bcd9e24bbb008fdb226cea2c4
Author: David Nusinow <dnusi...@debian.org>
Date: Mon May 4 22:08:47 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 ecc78d3..34f0ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
xserver-xorg-video-intel (2:2.7.0-2) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Install the upstream NEWS file, closes: #524334, #524336.
* Move the -dbg package to section debug.
- -- Brice Goglin <bgog...@debian.org> Thu, 16 Apr 2009 13:52:00 +0200
+ [ David Nusinow ]
+ * 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 <dnusi...@debian.org> Mon, 04 May 2009 22:07:53 -0400
xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 77db2b1..1cb46bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin
<bgog...@debian.org>
Build-Depends:
debhelper (>= 5),
- quilt,
pkg-config,
xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-gl-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index e4d3fc5..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-intel/src/Makefile.am
-===================================================================
---- xserver-xorg-video-intel.orig/src/Makefile.am
-+++ xserver-xorg-video-intel/src/Makefile.am
-@@ -220,3 +220,9 @@
- intel_drv_la_SOURCES += \
- $(INTEL_XVMC_SRCS)
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = intel.ids
-+
-+intel.ids : common.h
-+ awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | sed
's/^0x/8086/' > intel.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 f693995..83f6c84 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
@@ -51,7 +51,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 debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
