From e85625e9e717afc2a3e401e57a0da026bc51cb40 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 10 Feb 2011 18:19:43 +0100 Subject: [PATCH] Refresh patches. --- debian/changelog | 1 + .../01_sessreg_implement_hostname_hashing.diff | 12 ++++++------ debian/patches/03_iceauth_manpage_commands.patch | 13 +++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0aa044..f22e632 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! * Bump Standards-Version to 3.9.1. + * Refresh patches. -- Cyril Brulebois Fri, 12 Nov 2010 19:28:04 +0100 diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff index 887a54c..5338fa5 100644 --- a/debian/patches/01_sessreg_implement_hostname_hashing.diff +++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff @@ -17,11 +17,11 @@ Not submitted to XFree86. sessreg/sessreg.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 152 insertions(+), 12 deletions(-) -Index: a/sessreg/sessreg.c +Index: x11-xserver-utils/sessreg/sessreg.c =================================================================== ---- a/sessreg/sessreg.c.orig 2009-12-06 13:02:16.000000000 +0100 -+++ b/sessreg/sessreg.c 2009-12-06 13:30:49.000000000 +0100 -@@ -97,6 +97,18 @@ +--- x11-xserver-utils.orig/sessreg/sessreg.c ++++ x11-xserver-utils/sessreg/sessreg.c +@@ -93,6 +93,18 @@ static void set_utmpx (struct utmpx *u, const char *host, Time_t date, int addp); #endif @@ -40,7 +40,7 @@ Index: a/sessreg/sessreg.c static int wflag, uflag, lflag; static char *wtmp_file, *utmp_file, *line; #ifdef USE_UTMPX -@@ -385,21 +397,23 @@ +@@ -404,21 +416,23 @@ set_utmp (struct utmp *u, char *line, ch bzero (u->ut_name, sizeof (u->ut_name)); #ifdef SYSV if (line) { @@ -76,7 +76,7 @@ Index: a/sessreg/sessreg.c bzero (u->ut_id, sizeof (u->ut_id)); if (addp) { u->ut_pid = getppid (); -@@ -638,3 +652,129 @@ +@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_na return freeslot; } #endif diff --git a/debian/patches/03_iceauth_manpage_commands.patch b/debian/patches/03_iceauth_manpage_commands.patch index a54509a..2b5ef6d 100644 --- a/debian/patches/03_iceauth_manpage_commands.patch +++ b/debian/patches/03_iceauth_manpage_commands.patch @@ -7,11 +7,11 @@ Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354) iceauth.man | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 1 deletions(-) -diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man -index 6a8d32f..c967eb4 100644 ---- a/iceauth/iceauth.man -+++ b/iceauth/iceauth.man -@@ -39,5 +39,89 @@ used to extract authorization records from one machine and merge them in on +Index: x11-xserver-utils/iceauth/iceauth.man +=================================================================== +--- x11-xserver-utils.orig/iceauth/iceauth.man ++++ x11-xserver-utils/iceauth/iceauth.man +@@ -36,5 +36,89 @@ used to extract authorization records fr another (as is the case when using remote logins or granting access to other users). Commands (described below) may be entered interactively, on the \fIiceauth\fP command line, or in scripts. @@ -101,6 +101,3 @@ index 6a8d32f..c967eb4 100644 +.PP .SH AUTHOR Ralph Mor, X Consortium --- -1.5.6.5 -