X Strike Force X.Org X11 SVN commit: r941 - in branches/6.9/debian: . patches/debian patches/general patches/netbsd
Author: dnusinow
Date: 2005-12-12 19:59:18 -0500 (Mon, 12 Dec 2005)
New Revision: 941
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/debian/904_debian_xinitrc.diff
branches/6.9/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff
branches/6.9/debian/patches/netbsd/842_netbsd_NetBSD.cf_fixes.diff
Log:
* Update to 6.9 RC3
+ all updated patches are basically simple refreshes
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-12-13 00:43:37 UTC (rev 940)
+++ branches/6.9/debian/changelog 2005-12-13 00:59:18 UTC (rev 941)
@@ -1,12 +1,13 @@
-xorg-x11 (6.8.99.902.dfsg.1-1+SVN) UNRELEASED; urgency=low
+xorg-x11 (6.8.99.903.dfsg.1-0+SVN) UNRELEASED; urgency=low
+ * Update to 6.9 RC3
* Remove obsolete patch alpha/202_alpha_typedef_card32.diff
* Remove xdpr from xbase-clients to allow xprint to install. Thanks Martin
Michlmayer.
* Move various libxvmc shlibs from the -dev package to the normal lib
package where they belong.
- -- David Nusinow <dnusinow@debian.org> Sun, 27 Nov 2005 00:44:59 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 12 Dec 2005 19:57:17 -0500
xorg-x11 (6.8.99.902.dfsg.1-1) experimental; urgency=low
Modified: branches/6.9/debian/patches/debian/904_debian_xinitrc.diff
===================================================================
--- branches/6.9/debian/patches/debian/904_debian_xinitrc.diff 2005-12-13 00:43:37 UTC (rev 940)
+++ branches/6.9/debian/patches/debian/904_debian_xinitrc.diff 2005-12-13 00:59:18 UTC (rev 941)
@@ -5,36 +5,36 @@
Index: xc/programs/xinit/xinitrc.cpp
===================================================================
---- xc/programs/xinit/xinitrc.cpp.orig 2005-11-12 16:31:16.000000000 -0500
-+++ xc/programs/xinit/xinitrc.cpp 2005-11-13 11:08:07.000000000 -0500
-@@ -1,75 +1,9 @@
+--- xc/programs/xinit/xinitrc.cpp.orig 2005-12-12 19:52:58.000000000 -0500
++++ xc/programs/xinit/xinitrc.cpp 2005-12-12 19:54:02.000000000 -0500
+@@ -1,75 +1,8 @@
XCOMM!SHELL_CMD
XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
++XCOMM /etc/X11/xinit/xinitrc
++XCOMM
++XCOMM global xinitrc file, used by all X sessions started by xinit (startx)
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=XINITDIR/.Xresources
-sysmodmap=XINITDIR/.Xmodmap
-+XCOMM /etc/X11/xinit/xinitrc
-+XCOMM
-+XCOMM global xinitrc file, used by all X sessions started by xinit (startx)
-
+-
-XCOMM merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-- BINDIR/xrdb -merge $sysresources
+- XRDB -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-- BINDIR/xmodmap $sysmodmap
+- XMODMAP $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-- BINDIR/xrdb -merge $userresources
+- XRDB -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-- BINDIR/xmodmap $usermodmap
+- XMODMAP $usermodmap
-fi
-
-XCOMM start some nice programs
@@ -81,10 +81,10 @@
-
-XCOMM This is the fallback case if nothing else is executed above
-#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
--BINDIR/twm &
--BINDIR/xclock -geometry 50x50-1+1 &
--BINDIR/xterm -geometry 80x50+494+51 &
--BINDIR/xterm -geometry 80x20+494-0 &
--exec BINDIR/xterm -geometry 80x66+0+0 -name login
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
+XCOMM invoke global X session script
+. /etc/X11/Xsession
Modified: branches/6.9/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff
===================================================================
--- branches/6.9/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff 2005-12-13 00:43:37 UTC (rev 940)
+++ branches/6.9/debian/patches/general/097_mouse_zaxis_mapping_pushes_up_buttons.diff 2005-12-13 00:59:18 UTC (rev 941)
@@ -7,8 +7,8 @@
Index: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c
===================================================================
---- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig 2005-11-12 16:31:59.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2005-11-13 10:57:42.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig 2005-12-12 19:44:57.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c 2005-12-12 19:46:47.000000000 -0500
@@ -378,6 +378,45 @@
}
#endif
@@ -66,7 +66,7 @@
pMse->doubleClickSourceButtonMask = 0;
pMse->doubleClickTargetButtonMask = 0;
pMse->doubleClickTargetButton = 0;
-@@ -2317,6 +2360,23 @@
+@@ -2313,6 +2356,23 @@
}
}
@@ -90,7 +90,7 @@
static void
MousePostEvent(InputInfoPtr pInfo, int truebuttons,
int dx, int dy, int dz, int dw)
-@@ -2357,6 +2417,7 @@
+@@ -2353,6 +2413,7 @@
}
break;
default: /* buttons */
@@ -100,8 +100,8 @@
if (dw < 0 || dz < -1)
Index: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h
===================================================================
---- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h.orig 2005-11-12 16:31:57.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2005-11-13 10:57:42.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h.orig 2005-11-16 18:42:01.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h 2005-12-12 19:46:48.000000000 -0500
@@ -282,6 +282,7 @@
int angleOffset;
pointer pDragLock; /* drag lock area */
Modified: branches/6.9/debian/patches/netbsd/842_netbsd_NetBSD.cf_fixes.diff
===================================================================
--- branches/6.9/debian/patches/netbsd/842_netbsd_NetBSD.cf_fixes.diff 2005-12-13 00:43:37 UTC (rev 940)
+++ branches/6.9/debian/patches/netbsd/842_netbsd_NetBSD.cf_fixes.diff 2005-12-13 00:59:18 UTC (rev 941)
@@ -9,8 +9,8 @@
Index: xc/config/cf/NetBSD.cf
===================================================================
---- xc/config/cf/NetBSD.cf.orig 2005-11-12 16:36:32.000000000 -0500
-+++ xc/config/cf/NetBSD.cf 2005-11-13 11:00:05.000000000 -0500
+--- xc/config/cf/NetBSD.cf.orig 2005-12-12 19:45:03.000000000 -0500
++++ xc/config/cf/NetBSD.cf 2005-12-12 19:47:15.000000000 -0500
@@ -18,12 +18,185 @@
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -212,7 +212,7 @@
#define HasShadowPasswd NO
-@@ -205,6 +382,8 @@
+@@ -207,6 +384,8 @@
#if UseElfFormat
#define DlLibrary -rdynamic /* no -ldl yet */
@@ -221,7 +221,7 @@
#else
#define DlLibrary /**/
#endif
-@@ -332,7 +511,11 @@
+@@ -334,7 +513,11 @@
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
@@ -234,7 +234,7 @@
* NetBSD doesn't have perl in default system
* you may override this in host.def if you installed perl from the packages
*/
-@@ -351,7 +534,13 @@
+@@ -353,7 +536,13 @@
/*
* Make & install Features
*/
@@ -248,7 +248,7 @@
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-@@ -455,6 +644,8 @@
+@@ -457,6 +646,8 @@
@@\
.EXEC:
@@ -257,7 +257,7 @@
/*
* Man pages need to be formatted when installed, so override the default
* imake rules.
-@@ -544,6 +735,8 @@
+@@ -546,6 +737,8 @@
@@\
InstallManPageAliasesBase(file,destdir,aliases)
Reply to: