X Strike Force XFree86 SVN commit: r1991 - in branches/ubuntu/debian: . patches
Author: fabbione
Date: 2004-10-30 00:41:27 -0500 (Sat, 30 Oct 2004)
New Revision: 1991
Added:
branches/ubuntu/debian/patches/990_ubuntu_noisy_xkb.diff
Modified:
branches/ubuntu/debian/changelog
branches/ubuntu/debian/xlibs.links
Log:
Import 4.3.0.dfsg.1-6ubuntu15 release.
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:39:22 UTC (rev 1990)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:41:27 UTC (rev 1991)
@@ -1,3 +1,12 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu15) warty; urgency=low
+
+ * Fix botched -6ubuntu13 change.
+ * debian/patches/990_ubuntu_noisy_xkb.diff:
+ + Add -DNOISY to compilation of the XKB section, so we can more easily
+ catch keyboard errors.
+
+ -- Daniel Stone <daniels@debian.org> Wed, 8 Sep 2004 11:23:02 +1000
+
xfree86 (4.3.0.dfsg.1-6ubuntu14) warty; urgency=low
* Resync last bits from svn trunk up to 1793.
Added: branches/ubuntu/debian/patches/990_ubuntu_noisy_xkb.diff
===================================================================
--- branches/ubuntu/debian/patches/990_ubuntu_noisy_xkb.diff 2004-10-30 05:39:22 UTC (rev 1990)
+++ branches/ubuntu/debian/patches/990_ubuntu_noisy_xkb.diff 2004-10-30 05:41:27 UTC (rev 1991)
@@ -0,0 +1,12 @@
+$Id$
+
+--- xc/config/cf/linux.cf.orig 2004-09-08 11:39:00.628560024 +1000
++++ xc/config/cf/linux.cf 2004-09-08 11:40:33.815393472 +1000
+@@ -152,6 +152,7 @@
+ # define ForceNormalLib YES
+ # define BuildRman NO
+ # define BuildHtmlManPages NO
++# define XkbServerDefines -DNOISY
+ /*
+ * Debian doesn't use certain parts of the tree when doing
+ * architecture-specific package builds.
Property changes on: branches/ubuntu/debian/patches/990_ubuntu_noisy_xkb.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/ubuntu/debian/xlibs.links
===================================================================
--- branches/ubuntu/debian/xlibs.links 2004-10-30 05:39:22 UTC (rev 1990)
+++ branches/ubuntu/debian/xlibs.links 2004-10-30 05:41:27 UTC (rev 1991)
@@ -1 +1 @@
-etc/X11/xkb/dvorak etc/X11/xkb/macintosh/dvorak
+etc/X11/xkb/symbols/dvorak etc/X11/xkb/symbols/macintosh/dvorak
Reply to: