debian/changelog | 3 + debian/patches/13_debian_add_xkbpath_env_variable.diff | 27 ----------------- 2 files changed, 3 insertions(+), 27 deletions(-)
New commits: commit a2beac4df0a11ae50acd5d31ef0a7bc9e157d46e Author: Julien Cristau <jcris...@debian.org> Date: Mon Oct 21 22:11:44 2013 +0200 Delete old patch 13_debian_add_xkbpath_env_variable.diff. It's not been applied since 1.6, and nobody seems to have noticed, so clearly it's not needed. diff --git a/debian/changelog b/debian/changelog index 2f6dc10..bdbf088 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low * Stop building Xfbdev. * Reduce noise from dh_install --list-missing by deleting some files from the udeb build after make install. + * Delete old patch 13_debian_add_xkbpath_env_variable.diff. It's not been + applied since 1.6, and nobody seems to have noticed, so clearly it's not + needed. -- Julien Cristau <jcris...@debian.org> Mon, 21 Oct 2013 20:25:02 +0200 diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff b/debian/patches/13_debian_add_xkbpath_env_variable.diff deleted file mode 100644 index bd6ca5b..0000000 --- a/debian/patches/13_debian_add_xkbpath_env_variable.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- xorg-server.orig/xkb/xkbInit.c -+++ xorg-server/xkb/xkbInit.c -@@ -805,6 +805,14 @@ - extern unsigned char XkbDfltAccessXOptions; - - int -+xkbInitGlobals() -+{ -+ char * xkbpath= getenv("XKBPATH"); -+ if (xkbpath!=NULL) -+ XkbBaseDirectory= xkbpath; -+} -+ -+int - XkbProcessArguments(int argc,char *argv[],int i) - { - if (strcmp(argv[i],"-kb")==0) { ---- xorg-server.orig/os/utils.c -+++ xorg-server/os/utils.c -@@ -685,6 +685,7 @@ - */ - void InitGlobals(void) - { -+ xkbInitGlobals(); - ddxInitGlobals(); - } - -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vylpz-0001wa...@vasks.debian.org