Ubuntu Pastebin

Paste from Chipaca at Wed, 15 Jul 2015 13:32:15 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
diff -u libxkbcommon-0.5.0/debian/changelog libxkbcommon-0.5.0/debian/changelog
--- libxkbcommon-0.5.0/debian/changelog
+++ libxkbcommon-0.5.0/debian/changelog
@@ -1,3 +1,9 @@
+libxkbcommon (0.5.0-2) unstable; urgency=medium
+
+  * meep
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 13 Jul 2015 17:16:34 +0200
+
 libxkbcommon (0.5.0-1) unstable; urgency=medium
 
   * New upstream release.
only in patch2:
unchanged:
--- libxkbcommon-0.5.0.orig/src/context.c
+++ libxkbcommon-0.5.0/src/context.c
@@ -80,7 +80,11 @@
     int err;
     int ret = 0;
 
-    ret |= xkb_context_include_path_append(ctx, DFLT_XKB_CONFIG_ROOT);
+    char *root = getenv("XKB_CONFIG_ROOT");
+    if (root != NULL)
+       ret |= xkb_context_include_path_append(ctx, root);
+    else
+       ret |= xkb_context_include_path_append(ctx, DFLT_XKB_CONFIG_ROOT);
 
     home = secure_getenv("HOME");
     if (!home)
Download as text