debian/changelog | 8 ++++++++ debian/control | 1 - debian/patches/01_gen_pci_ids.diff | 15 --------------- debian/patches/series | 1 - debian/rules | 4 ++-- debian/xserver-xorg-video-apm.install | 1 - 6 files changed, 10 insertions(+), 20 deletions(-)
New commits: commit d386d7dc40828617c2a833372bbd80b869644a82 Author: David Nusinow <[email protected]> Date: Wed Apr 29 22:05:55 2009 -0400 Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to choose drivers. Disable patch system and remove quilt from build-depends diff --git a/debian/changelog b/debian/changelog index 96c6c85..f797df0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-apm (1:1.2.1-3) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to + choose drivers. + + Disable patch system and remove quilt from build-depends + + -- David Nusinow <[email protected]> Wed, 29 Apr 2009 21:57:24 -0400 + xserver-xorg-video-apm (1:1.2.1-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/control b/debian/control index 0f99a74..557a3a0 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-xext-dev, x11proto-video-dev, diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index 43658e5..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- /dev/null -+++ xserver-xorg-video-apm/src/apm.ids -@@ -0,0 +1,3 @@ -+11426422 -+11426424 -+1142643D ---- xserver-xorg-video-apm.orig/src/Makefile.am -+++ xserver-xorg-video-apm/src/Makefile.am -@@ -46,3 +46,6 @@ - apm_funcs.c \ - apm_video.c \ - apm_rush.c -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = apm.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 b8acb4f..b130092 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 @@ -47,7 +47,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-apm.install b/debian/xserver-xorg-video-apm.install index a8fac35..daf7bfe 100644 --- a/debian/xserver-xorg-video-apm.install +++ b/debian/xserver-xorg-video-apm.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]
