X Strike Force X.Org X11 SVN commit: r4141 - in trunk/xserver/xorg-server/debian: . patches
Author: dnusinow
Date: 2006-12-12 18:58:44 -0500 (Tue, 12 Dec 2006)
New Revision: 4141
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff
Log:
* Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my
part. Thanks Michel D?\195?\164nzer.
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-12-12 01:55:04 UTC (rev 4140)
+++ trunk/xserver/xorg-server/debian/changelog 2006-12-12 23:58:44 UTC (rev 4141)
@@ -1,10 +1,15 @@
xorg-server (2:1.1.1-12) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Delete hw/xfree86/common/xf86Build.h in debian/rules clean, since it's
wrongly included in the upstream tarball.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Thu, 7 Dec 2006 16:31:52 +0100
+ [ David Nusinow ]
+ * Pull fix for the ignore_abi.diff patch. This one's a major brown bag on my
+ part. Thanks Michel Dänzer.
+ -- David Nusinow <dnusinow@debian.org> Tue, 12 Dec 2006 18:58:06 -0500
+
xorg-server (2:1.1.1-11) unstable; urgency=low
[ Drew Parsons ]
Modified: trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-12-12 01:55:04 UTC (rev 4140)
+++ trunk/xserver/xorg-server/debian/patches/17_ignoreabi.diff 2006-12-12 23:58:44 UTC (rev 4141)
@@ -26,7 +26,7 @@
xf86GetOptValBool(FlagOptions, FLAG_ALLOW_CLOSEDOWN_GRABS,
&(xf86Info.grabInfo.allowClosedown));
+ xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
-+ if (&xf86Info.ignoreABI) {
++ if (xf86Info.ignoreABI) {
+ xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
+ }
Reply to: