debian/changelog | 8 ++++++++ debian/control | 1 - debian/patches/01_gen_pci_ids.diff | 19 ------------------- debian/patches/series | 1 - debian/rules | 4 ++-- debian/xserver-xorg-video-ark.install | 1 - 6 files changed, 10 insertions(+), 24 deletions(-)
New commits: commit 9757c789c85108add71cc735fbaa92db03e3ba02 Author: David Nusinow <[email protected]> Date: Wed Apr 29 22:40:19 2009 -0400 Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to autodetect devices. Disable patch system and remove quilt from build-depends diff --git a/debian/changelog b/debian/changelog index bc7b17f..6bbcab5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-ark (1:0.7.1-3) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to + autodetect devices. + + Disable patch system and remove quilt from build-depends + + -- David Nusinow <[email protected]> Wed, 29 Apr 2009 22:37:48 -0400 + xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 60580b8..2ecdd92 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-core-dev, x11proto-fonts-dev, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index f245b57..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: xserver-xorg-video-ark/src/ark.ids -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver-xorg-video-ark/src/ark.ids 2007-09-14 00:44:25.000000000 -0400 -@@ -0,0 +1,3 @@ -+EDD8A091 -+EDD8A099 -+EDD8A0A1 -Index: xserver-xorg-video-ark/src/Makefile.am -=================================================================== ---- xserver-xorg-video-ark.orig/src/Makefile.am 2007-09-14 00:44:31.000000000 -0400 -+++ xserver-xorg-video-ark/src/Makefile.am 2007-09-14 00:44:56.000000000 -0400 -@@ -33,3 +33,6 @@ - ark_driver.c \ - ark.h \ - ark_reg.h -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = ark.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 1099900..393cc91 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 diff --git a/debian/xserver-xorg-video-ark.install b/debian/xserver-xorg-video-ark.install index a8fac35..daf7bfe 100644 --- a/debian/xserver-xorg-video-ark.install +++ b/debian/xserver-xorg-video-ark.install @@ -1,2 +1 @@ usr/lib/xorg/modules/drivers/*.so -usr/share/xserver-xorg/pci/* -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
