debian/changelog | 8 ++++++++
debian/control | 1 -
debian/patches/01_gen_pci_ids.diff | 19 -------------------
debian/patches/series | 1 -
debian/rules | 4 ++--
5 files changed, 10 insertions(+), 23 deletions(-)
New commits:
commit f01f31c25d6d1ff99d3c8bbaf8d4e3c7e76c09db
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Jul 29 01:53:52 2009 +0200
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 1dd3c25..ae131b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-s3 (1:0.6.2-2) UNRELEASED; urgency=low
+
+ * 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.
+
+ -- Brice Goglin <bgog...@debian.org> Wed, 29 Jul 2009 01:53:17 +0200
+
xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
diff --git a/debian/control b/debian/control
index c054ce4..66dc692 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev,
x11proto-xext-dev,
- quilt,
dpkg-dev (>= 1.14.17),
automake,
libtool,
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index a0575c8..0000000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- /dev/null
-+++ xserver-xorg-video-s3/src/s3.ids
-@@ -0,0 +1,7 @@
-+533388D0
-+533388D1
-+533388F0
-+53338811
-+53338812
-+53338814
-+53338901
---- xserver-xorg-video-s3.orig/src/Makefile.am
-+++ xserver-xorg-video-s3/src/Makefile.am
-@@ -50,3 +50,6 @@
-
- libs3_accel_pio_la_SOURCES = s3_accel.c
- libs3_accel_pio_la_CFLAGS = $(AM_CFLAGS)
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = s3.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 070c6ec..dac14a1 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:
autoreconf -vfi
obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
@@ -48,7 +48,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
