debian/changelog | 8 ++++++++ debian/control | 1 - debian/patches/01_gen_pci_ids.diff | 27 --------------------------- debian/patches/series | 1 - debian/rules | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-)
New commits: commit 5758ae416b4504d892e17b1f071a8c10d58ee5c5 Author: David Nusinow <[email protected]> Date: Mon May 4 21:51:42 2009 -0400 Remove 01_gen_pci_ids.diff. The X server now uses an internal table to pick a driver during autoconfig. Disable patch system and remove quilt from build-dep diff --git a/debian/changelog b/debian/changelog index 120f5f4..43ce2e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + pick a driver during autoconfig. + + Disable patch system and remove quilt from build-dep + + -- David Nusinow <[email protected]> Mon, 04 May 2009 21:50:40 -0400 + xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 130c387..5d3b8a6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5), 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 707426b..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,27 +0,0 @@ -Index: xserver-xorg-video-cirrus/src/cirrus.ids -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver-xorg-video-cirrus/src/cirrus.ids 2008-05-22 08:21:10.000000000 +0200 -@@ -0,0 +1,11 @@ -+101300A0 -+101300A4 -+101300A8 -+101300AC -+101300B8 -+101300BC -+101300D0 -+101300D4 -+101300D5 -+101300D6 -+10130038 -Index: xserver-xorg-video-cirrus/src/Makefile.am -=================================================================== ---- xserver-xorg-video-cirrus.orig/src/Makefile.am 2008-05-22 08:20:51.000000000 +0200 -+++ xserver-xorg-video-cirrus/src/Makefile.am 2008-05-22 08:21:10.000000000 +0200 -@@ -57,3 +57,6 @@ - lg_i2c.c \ - lg_xaa.c \ - lg_xaa.h -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = cirrus.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 1aad3af..8476ace 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 @@ -48,7 +48,7 @@ build-stamp: configure 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]
