x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 5 +++--
debian/patches/10_debian_add_xkbpath_env_variable.diff | 17 ++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 168ac6ea664fca7c1adfaa9bf4972c04c7768f89
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 9 17:13:12 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 4e65fae..4bf6ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
+x11-xkb-utils (7.4+1) unstable; urgency=low
* xkbcomp 1.0.5.
+ update/refresh patch 10_debian_add_xkbpath_env_variable.diff
@@ -8,7 +8,7 @@ x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.7.3 (no changes).
* Drop the XS- prefix from Vcs-* debian/control fields.
- -- Julien Cristau <jcristau@debian.org> Fri, 07 Mar 2008 20:10:33 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 09 May 2008 17:09:54 +0200
x11-xkb-utils (7.3+1) unstable; urgency=low
commit e37d9259693e353ecf1ff6a00df8a3d767b78f0d
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 9 17:08:11 2008 +0200
update/refresh patch 10_debian_add_xkbpath_env_variable.diff
diff --git a/debian/changelog b/debian/changelog
index 6e1de20..4e65fae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11-xkb-utils (7.4+1) UNRELEASED; urgency=low
* xkbcomp 1.0.5.
+ + update/refresh patch 10_debian_add_xkbpath_env_variable.diff
* Complete debian/copyright's information about xkbcomp from upstream's
COPYING file.
* Drop debian revisions from build-deps.
diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff b/debian/patches/10_debian_add_xkbpath_env_variable.diff
index 4e39a9d..bce8372 100644
--- a/debian/patches/10_debian_add_xkbpath_env_variable.diff
+++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff
@@ -11,9 +11,9 @@ This patch will not be submitted upstream.
Index: setxkbmap/setxkbmap.c
===================================================================
---- setxkbmap/setxkbmap.c.orig 2007-02-11 08:37:45.000000000 +0100
-+++ setxkbmap/setxkbmap.c 2007-02-11 08:38:02.000000000 +0100
-@@ -321,9 +321,13 @@
+--- setxkbmap/setxkbmap.c.orig
++++ setxkbmap/setxkbmap.c
+@@ -320,9 +320,13 @@
int i;
Bool ok;
unsigned present;
@@ -29,9 +29,9 @@ Index: setxkbmap/setxkbmap.c
if (argv[i][0]!='-') {
Index: xkbcomp/xkbpath.c
===================================================================
---- xkbcomp/xkbpath.c.orig 2007-02-11 08:37:45.000000000 +0100
-+++ xkbcomp/xkbpath.c 2007-02-11 08:38:02.000000000 +0100
-@@ -131,9 +131,14 @@
+--- xkbcomp/xkbpath.c.orig
++++ xkbcomp/xkbpath.c
+@@ -131,8 +131,13 @@
void
XkbAddDefaultDirectoriesToPath(void)
{
@@ -39,7 +39,6 @@ Index: xkbcomp/xkbpath.c
+
if (noDefaultPath)
return;
- XkbAddDirectoryToPath(".");
+ xkbpath= (char *)getenv("XKBPATH");
+ if (xkbpath!=NULL)
+ XkbAddDirectoryToPath(xkbpath);
@@ -48,8 +47,8 @@ Index: xkbcomp/xkbpath.c
Index: xkbevd/xkbevd.c
===================================================================
---- xkbevd/xkbevd.c.orig 2007-02-11 08:37:45.000000000 +0100
-+++ xkbevd/xkbevd.c 2007-02-11 08:38:02.000000000 +0100
+--- xkbevd/xkbevd.c.orig
++++ xkbevd/xkbevd.c
@@ -471,20 +471,28 @@
else {
file= fopen(cfgFileName,"r");
Reply to: