X Strike Force X.Org X11 SVN commit: r3756 - in trunk/driver/xserver-xorg-video-sis/debian: . patches
Author: dnusinow
Date: 2006-10-13 16:22:45 -0400 (Fri, 13 Oct 2006)
New Revision: 3756
Added:
trunk/driver/xserver-xorg-video-sis/debian/patches/
trunk/driver/xserver-xorg-video-sis/debian/patches/01_missing_assert.diff
trunk/driver/xserver-xorg-video-sis/debian/patches/series
Modified:
trunk/driver/xserver-xorg-video-sis/debian/changelog
trunk/driver/xserver-xorg-video-sis/debian/control
trunk/driver/xserver-xorg-video-sis/debian/rules
Log:
* Add 01_missing_assert.diff to include assert.h because the driver now uses
the assert macro. Thanks Nate Eldredge. Closes: #392546
Modified: trunk/driver/xserver-xorg-video-sis/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/changelog 2006-10-13 20:19:42 UTC (rev 3755)
+++ trunk/driver/xserver-xorg-video-sis/debian/changelog 2006-10-13 20:22:45 UTC (rev 3756)
@@ -1,3 +1,10 @@
+xserver-xorg-video-sis (1:0.9.1-4) UNRELEASED; urgency=low
+
+ * Add 01_missing_assert.diff to include assert.h because the driver now uses
+ the assert macro. Thanks Nate Eldredge. Closes: #392546
+
+ -- David Nusinow <dnusinow@debian.org> Fri, 13 Oct 2006 16:14:58 -0400
+
xserver-xorg-video-sis (1:0.9.1-3) unstable; urgency=low
[ Steve Langasek ]
Modified: trunk/driver/xserver-xorg-video-sis/debian/control
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/control 2006-10-13 20:19:42 UTC (rev 3755)
+++ trunk/driver/xserver-xorg-video-sis/debian/control 2006-10-13 20:22:45 UTC (rev 3756)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, x11proto-xinerama-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0), x11proto-xf86dri-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, x11proto-xinerama-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0), x11proto-xf86dri-dev, quilt
Standards-Version: 3.6.1
Package: xserver-xorg-video-sis
Added: trunk/driver/xserver-xorg-video-sis/debian/patches/01_missing_assert.diff
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/patches/01_missing_assert.diff (rev 0)
+++ trunk/driver/xserver-xorg-video-sis/debian/patches/01_missing_assert.diff 2006-10-13 20:22:45 UTC (rev 3756)
@@ -0,0 +1,12 @@
+Index: xserver-xorg-video-sis/src/sis.h
+===================================================================
+--- xserver-xorg-video-sis.orig/src/sis.h 2006-10-13 16:14:34.000000000 -0400
++++ xserver-xorg-video-sis/src/sis.h 2006-10-13 16:14:43.000000000 -0400
+@@ -39,6 +39,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <setjmp.h>
++#include <assert.h>
+
+ #define SISDRIVERVERSIONYEAR 5
+ #define SISDRIVERVERSIONMONTH 9
Added: trunk/driver/xserver-xorg-video-sis/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/patches/series (rev 0)
+++ trunk/driver/xserver-xorg-video-sis/debian/patches/series 2006-10-13 20:22:45 UTC (rev 3756)
@@ -0,0 +1 @@
+01_missing_assert.diff
Modified: trunk/driver/xserver-xorg-video-sis/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-video-sis/debian/rules 2006-10-13 20:19:42 UTC (rev 3755)
+++ trunk/driver/xserver-xorg-video-sis/debian/rules 2006-10-13 20:22:45 UTC (rev 3756)
@@ -36,7 +36,7 @@
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -49,7 +49,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: