debian/changelog | 9 +++++++--
debian/control | 1 +
debian/patches/001_no_ansiheader.diff | 12 ++++++++++++
debian/patches/series | 1 +
debian/rules | 4 ++--
5 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 1d568d48a213ea49ea4657651471de71c3326d2d
Author: David Nusinow <dnusi...@debian.org>
Date: Sun Apr 12 11:31:45 2009 -0400
Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
Also add quilt to build-depends.
diff --git a/debian/changelog b/debian/changelog
index 25533c9..e815408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
* Build against xserver 1.6.
* Allow parallel builds.
- -- David Nusinow <dnusi...@debian.org> Sun, 12 Apr 2009 10:36:12 -0400
+ [ David Nusinow ]
+ * Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
+ Also add quilt to build-depends.
+
+ -- David Nusinow <dnusi...@debian.org> Sun, 12 Apr 2009 11:16:04 -0400
xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ed274be..90b7245 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Brice Goglin <bgog...@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
+ quilt,
xserver-xorg-dev (>= 2:1.6),
x11proto-core-dev,
x11proto-fonts-dev,
diff --git a/debian/patches/001_no_ansiheader.diff
b/debian/patches/001_no_ansiheader.diff
new file mode 100644
index 0000000..4bc1369
--- /dev/null
+++ b/debian/patches/001_no_ansiheader.diff
@@ -0,0 +1,12 @@
+diff --git a/src/glide_driver.c b/src/glide_driver.c
+index fac93b2..6d6aac4 100644
+--- a/src/glide_driver.c
++++ b/src/glide_driver.c
+@@ -54,7 +54,6 @@
+ #include "colormapst.h"
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86_ansic.h"
+ #include "mipointer.h"
+ #include "mibstore.h"
+ #include "micmap.h"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8e80199
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_no_ansiheader.diff
diff --git a/debian/rules b/debian/rules
index cc98542..27cc179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
confflags += --disable-static
build: build-stamp
-build-stamp:
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
@@ -48,7 +48,7 @@ build-stamp:
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
commit a8d363fb1e297ef94f612549a6390adcfd186d00
Author: David Nusinow <dnusi...@debian.org>
Date: Sun Apr 12 10:36:31 2009 -0400
Prepare for upload to unstable
diff --git a/debian/changelog b/debian/changelog
index be241a0..25533c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
+ [ Julien Cristau ]
* New upstream release.
* Bump build-dep on xutils-dev to >= 1:7.4+4.
* Build against xserver 1.6.
* Allow parallel builds.
- -- Julien Cristau <jcris...@debian.org> Sun, 12 Apr 2009 12:12:29 +0100
+ -- David Nusinow <dnusi...@debian.org> Sun, 12 Apr 2009 10:36:12 -0400
xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
