X Strike Force X.Org X11 SVN commit: r1385 - in branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian: . patches
Author: dnusinow
Date: 2006-03-05 20:29:22 -0500 (Sun, 05 Mar 2006)
New Revision: 1385
Added:
branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/
branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/01_dac_include_xdefs.diff
branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/series
Modified:
branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/changelog
branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/rules
Log:
* Port patches from trunk
+ sparc/105_ffb_dac_typedef_bool.diff
Modified: branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/changelog
===================================================================
--- branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/changelog 2006-03-06 01:25:57 UTC (rev 1384)
+++ branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/changelog 2006-03-06 01:29:22 UTC (rev 1385)
@@ -3,8 +3,10 @@
* First upload to Debian
* Change source package, package, and provides names to denote the
type of driver and that they are for xserver-xorg
+ * Port patches from trunk
+ + sparc/105_ffb_dac_typedef_bool.diff
- -- David Nusinow <dnusinow@debian.org> Fri, 13 Jan 2006 00:41:19 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Mar 2006 20:28:40 -0500
xserver-xorg-driver-sunffb (1:1.0.1.3-0ubuntu1) dapper; urgency=low
Added: branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/01_dac_include_xdefs.diff
===================================================================
--- branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/01_dac_include_xdefs.diff 2006-03-06 01:25:57 UTC (rev 1384)
+++ branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/01_dac_include_xdefs.diff 2006-03-06 01:29:22 UTC (rev 1385)
@@ -0,0 +1,13 @@
+Index: src/ffb_dac.h
+===================================================================
+--- src/ffb_dac.h 2005-08-02 22:04:51.000000000 -0400
++++ src/ffb_dac.h 2005-10-06 21:02:47.000000000 -0400
+@@ -26,6 +26,8 @@
+ #ifndef _FFB_DAC_H
+ #define _FFB_DAC_H
+
++#include <X11/Xdefs.h>
++
+ /* FFB utilizes two different ramdac chips:
+ *
+ * 1) BT9068 "Pacifica1", used in all FFB1 and
Added: branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/series
===================================================================
--- branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/series 2006-03-06 01:25:57 UTC (rev 1384)
+++ branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/patches/series 2006-03-06 01:29:22 UTC (rev 1385)
@@ -0,0 +1 @@
+01_dac_include_xdefs.diff -p0
Modified: branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/rules
===================================================================
--- branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/rules 2006-03-06 01:25:57 UTC (rev 1384)
+++ branches/modular/driver/xf86-video-sunffb-X11R7.0-1.0.1.3/debian/rules 2006-03-06 01:29:22 UTC (rev 1385)
@@ -31,7 +31,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
@@ -44,7 +44,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: