This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 4acdc228439cacced4ad0dc8e334af86c49fc55e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 19 05:32:24 2019 +0200 X.Org upstream spells it KDrive, not Kdrive. --- patches.xorg/1.18.4/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.19.2/xorg-server-configure-ac.patch | 2 +- patches.xorg/1.19.6/xorg-server-configure-ac.patch | 2 +- x2gokdrive.c | 8 ++++---- x2gokdrive.h | 2 +- x2gokdrivecursor.c | 2 +- x2gokdriveinit.c | 2 +- x2gokdrivelog.h | 2 +- x2gokdriveremote.c | 2 +- x2gokdriveremote.h | 2 +- x2gokdriveselection.c | 2 +- x2gokdriveselection.h | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/patches.xorg/1.18.4/xorg-server-configure-ac.patch b/patches.xorg/1.18.4/xorg-server-configure-ac.patch index 0cae34d..83f0143 100644 --- a/patches.xorg/1.18.4/xorg-server-configure-ac.patch +++ b/patches.xorg/1.18.4/xorg-server-configure-ac.patch @@ -30,7 +30,7 @@ + + ### XEPHYR + - AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) + AC_DEFINE(KDRIVESERVER,1,[Build KDrive X server]) AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) @@ -2469,6 +2476,43 @@ diff --git a/patches.xorg/1.19.2/xorg-server-configure-ac.patch b/patches.xorg/1.19.2/xorg-server-configure-ac.patch index 421d936..efa39bb 100644 --- a/patches.xorg/1.19.2/xorg-server-configure-ac.patch +++ b/patches.xorg/1.19.2/xorg-server-configure-ac.patch @@ -30,7 +30,7 @@ + + ### XEPHYR + - AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) + AC_DEFINE(KDRIVESERVER,1,[Build KDrive X server]) AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) @@ -2483,6 +2490,43 @@ diff --git a/patches.xorg/1.19.6/xorg-server-configure-ac.patch b/patches.xorg/1.19.6/xorg-server-configure-ac.patch index fa5cd79..2bc6854 100644 --- a/patches.xorg/1.19.6/xorg-server-configure-ac.patch +++ b/patches.xorg/1.19.6/xorg-server-configure-ac.patch @@ -30,7 +30,7 @@ + + ### XEPHYR + - AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) + AC_DEFINE(KDRIVESERVER,1,[Build KDrive X server]) AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) @@ -2483,6 +2490,43 @@ diff --git a/x2gokdrive.c b/x2gokdrive.c index 306b828..91d0dd3 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Authored by Matthew Allum <mallum@openedhand.com> * * Copyright © 2007 OpenedHand Ltd @@ -617,8 +617,8 @@ ephyrRandRSetConfig(ScreenPtr pScreen, } else { - char name[]="X2GoKdrive-x"; - sprintf(name, "X2GoKdrive-%d",i); + char name[]="X2GoKDrive-x"; + sprintf(name, "X2GoKDrive-%d",i); addOutput(pScreen, name,virtualScreens[i].width, virtualScreens[i].height, virtualScreens[i].x, virtualScreens[i].y, virtualScreens[i].isPrimary, TRUE); @@ -800,7 +800,7 @@ ephyrRandRInit(ScreenPtr pScreen) KdScreenInfo *screen = pScreenPriv->screen; Rotation randr; EphyrScrPriv *scrpriv = screen->driver; - char output_name[]="X2GoKdrive-0"; + char output_name[]="X2GoKDrive-0"; scrpriv->virtualScreens=NULL; scrpriv->localRandrCall=FALSE; diff --git a/x2gokdrive.h b/x2gokdrive.h index 020a78c..23e5914 100644 --- a/x2gokdrive.h +++ b/x2gokdrive.h @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c index b8c2d5b..2ef9890 100644 --- a/x2gokdrivecursor.c +++ b/x2gokdrivecursor.c @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 39d7693..89fabb6 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdrivelog.h b/x2gokdrivelog.h index 5fcede4..ead72bc 100644 --- a/x2gokdrivelog.h +++ b/x2gokdrivelog.h @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Authored by Matthew Allum <mallum@openedhand.com> * * Copyright © 2007 OpenedHand Ltd diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index c60ef7c..36c768d 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index 221e4ac..9a23b69 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index 6111ad9..11b22a6 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH diff --git a/x2gokdriveselection.h b/x2gokdriveselection.h index 7ef53e2..3827ffa 100644 --- a/x2gokdriveselection.h +++ b/x2gokdriveselection.h @@ -1,5 +1,5 @@ /* - * X2GoKdrive - A kdrive X server for X2Go (based on Xephyr) + * X2GoKDrive - A kdrive X server for X2Go (based on Xephyr) * Author Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> * * Copyright © 2018 phoca-GmbH -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git