jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refresh patches

This commit is contained in:
Brice Goglin 2009-12-06 13:33:32 +01:00
parent cb46c41f61
commit 05b429afe2
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -20,8 +20,9 @@ x11-xserver-utils (7.5+1) UNRELEASED; urgency=low
* xsetroot 1.0.3.
* Suggests: xorg-docs-core since some manpages reference it in their
SEE ALSO section. Thanks Vincent Lefevre. Closes: #541220.
* Refresh patches.
-- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 13:28:20 +0100
-- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 13:32:48 +0100
x11-xserver-utils (7.4+2) unstable; urgency=low

18
debian/patches/01_sessreg_implement_hostname_hashing.diff vendored
View File

@ -13,11 +13,15 @@ hash algorithm by Bob Jenkins.
Not submitted to XFree86.
---
sessreg/sessreg.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 152 insertions(+), 12 deletions(-)
Index: sessreg/sessreg.c
===================================================================
--- sessreg/sessreg.c.orig
+++ sessreg/sessreg.c
@@ -96,6 +96,18 @@
--- sessreg/sessreg.c.orig 2009-12-06 13:02:16.000000000 +0100
+++ sessreg/sessreg.c 2009-12-06 13:30:49.000000000 +0100
@@ -97,6 +97,18 @@
const char *host, Time_t date, int addp);
#endif
@ -33,10 +37,10 @@ Index: sessreg/sessreg.c
+
+#endif
+
int wflag, uflag, lflag;
char *wtmp_file, *utmp_file, *line;
static int wflag, uflag, lflag;
static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
@@ -384,21 +396,23 @@
@@ -385,21 +397,23 @@
bzero (u->ut_name, sizeof (u->ut_name));
#ifdef SYSV
if (line) {
@ -72,7 +76,7 @@ Index: sessreg/sessreg.c
bzero (u->ut_id, sizeof (u->ut_id));
if (addp) {
u->ut_pid = getppid ();
@@ -637,3 +651,129 @@
@@ -638,3 +652,129 @@
return freeslot;
}
#endif

10
debian/patches/02_xmodmap_manpage.diff vendored
View File

@ -1,12 +1,16 @@
---
xmodmap/xmodmap.man | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x11-xserver-utils/xmodmap/xmodmap.man
===================================================================
--- x11-xserver-utils.orig/xmodmap/xmodmap.man 2007-04-12 00:19:34.000000000 +0200
+++ x11-xserver-utils/xmodmap/xmodmap.man 2007-08-13 15:13:53.000000000 +0200
--- x11-xserver-utils.orig/xmodmap/xmodmap.man 2009-05-11 19:11:44.000000000 +0200
+++ x11-xserver-utils/xmodmap/xmodmap.man 2009-12-06 13:32:33.000000000 +0100
@@ -141,7 +141,7 @@
used to perform the corresponding set of \fBkeycode\fP expressions.
The list of keysym names may be
found in the header file \fI<X11/keysymdef.h>\fP (without the \fIXK_\fP prefix)
-or the keysym database \fI __projectroot__/lib/X11/XKeysymDB\fP. Note that
-or the keysym database \fI __X11datadir__/XKeysymDB\fP. Note that
+or the keysym database \fI __projectroot__/share/X11/XKeysymDB\fP. Note that
if the same keysym is bound to multiple keys, the expression is executed
for each matching keycode.