diff --git a/debian/patches/04_xev_flush_standard_output.diff b/debian/patches/04_xev_flush_standard_output.diff index b75c819..f336ef6 100644 --- a/debian/patches/04_xev_flush_standard_output.diff +++ b/debian/patches/04_xev_flush_standard_output.diff @@ -6,10 +6,10 @@ unreachable code. This patch by Branden Robinson. Thanks to Bill Currie for identifying the problem and the solution. See Debian bug #238638. -Index: xbase-clients/xev-X11R7.0-1.0.1/xev.c +Index: xbase-clients/xev/xev.c =================================================================== ---- xbase-clients.orig/xev-X11R7.0-1.0.1/xev.c 2006-02-18 14:56:32.000000000 -0500 -+++ xbase-clients/xev-X11R7.0-1.0.1/xev.c 2006-02-26 19:50:37.000000000 -0500 +--- xbase-clients.orig/xev/xev.c 2006-02-18 14:56:32.000000000 -0500 ++++ xbase-clients/xev/xev.c 2006-02-26 19:50:37.000000000 -0500 @@ -1045,6 +1045,7 @@ printf ("Unknown event type %d\n", event.type); break; diff --git a/debian/patches/06_xedit_manpage_typos.diff b/debian/patches/06_xedit_manpage_typos.diff index 83d2c74..f20b400 100644 --- a/debian/patches/06_xedit_manpage_typos.diff +++ b/debian/patches/06_xedit_manpage_typos.diff @@ -1,7 +1,7 @@ -Index: xbase-clients/xedit-X11R7.0-1.0.1/xedit.man +Index: xbase-clients/xedit/xedit.man =================================================================== ---- xbase-clients.orig/xedit-X11R7.0-1.0.1/xedit.man 2006-02-18 14:56:14.000000000 -0500 -+++ xbase-clients/xedit-X11R7.0-1.0.1/xedit.man 2006-02-26 20:37:32.000000000 -0500 +--- xbase-clients.orig/xedit/xedit.man 2006-02-18 14:56:14.000000000 -0500 ++++ xbase-clients/xedit/xedit.man 2006-02-26 20:37:32.000000000 -0500 @@ -291,7 +291,7 @@ .B autoReplace (\fPClass \fBReplace) This resource is useful to automatically correct common misspelling errors, but diff --git a/debian/patches/07_xvinfo_manpage_typo.diff b/debian/patches/07_xvinfo_manpage_typo.diff index e53b46d..6b3dac4 100644 --- a/debian/patches/07_xvinfo_manpage_typo.diff +++ b/debian/patches/07_xvinfo_manpage_typo.diff @@ -1,7 +1,7 @@ -Index: xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man +Index: xbase-clients/xvinfo/xvinfo.man =================================================================== ---- xbase-clients.orig/xvinfo-X11R7.0-1.0.1/xvinfo.man 2006-02-18 14:55:11.000000000 -0500 -+++ xbase-clients/xvinfo-X11R7.0-1.0.1/xvinfo.man 2006-02-26 20:38:32.000000000 -0500 +--- xbase-clients.orig/xvinfo/xvinfo.man 2006-02-18 14:55:11.000000000 -0500 ++++ xbase-clients/xvinfo/xvinfo.man 2006-02-26 20:38:32.000000000 -0500 @@ -11,7 +11,7 @@ .PP .B xvinfo diff --git a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff index 1b49a53..9e77d51 100644 --- a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff +++ b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff @@ -13,10 +13,10 @@ xwininfo, this patch also corrects this behavior for those programs. Not submitted upstream to XFree86 or X.Org. -Index: xlsfonts-X11R7.0-1.0.1/dsimple.c +Index: xlsfonts/dsimple.c =================================================================== ---- xlsfonts-X11R7.0-1.0.1/dsimple.c.orig 2006-02-18 14:55:15.000000000 -0500 -+++ xlsfonts-X11R7.0-1.0.1/dsimple.c 2006-02-26 22:36:04.000000000 -0500 +--- xlsfonts/dsimple.c.orig 2006-02-18 14:55:15.000000000 -0500 ++++ xlsfonts/dsimple.c 2006-02-26 22:36:04.000000000 -0500 @@ -188,8 +188,7 @@ if (d == NULL) { fprintf (stderr, "%s: unable to open display '%s'\n", diff --git a/debian/patches/10_debian_add_xkbpath_env_variable.diff b/debian/patches/10_debian_add_xkbpath_env_variable.diff index 40f5b88..fa857ae 100644 --- a/debian/patches/10_debian_add_xkbpath_env_variable.diff +++ b/debian/patches/10_debian_add_xkbpath_env_variable.diff @@ -9,10 +9,10 @@ on xlibs are fixed. This patch by Denis Barbier. This patch will not be submitted upstream. -Index: setxkbmap-1.0.2/setxkbmap.c +Index: setxkbmap/setxkbmap.c =================================================================== ---- setxkbmap-1.0.2/setxkbmap.c -+++ setxkbmap-1.0.2/setxkbmap.c +--- setxkbmap/setxkbmap.c ++++ setxkbmap/setxkbmap.c @@ -318,9 +318,13 @@ int i; Bool ok; diff --git a/debian/patches/11_xkb_documentation_updates.diff b/debian/patches/11_xkb_documentation_updates.diff index 959ea3a..656f26b 100644 --- a/debian/patches/11_xkb_documentation_updates.diff +++ b/debian/patches/11_xkb_documentation_updates.diff @@ -5,10 +5,10 @@ xkbcomp's README.config file. This patch by Branden Robinson. -Index: setxkbmap-1.0.2/setxkbmap.man +Index: setxkbmap/setxkbmap.man =================================================================== ---- setxkbmap-1.0.2/setxkbmap.man.orig 2006-06-11 21:04:12.000000000 -0400 -+++ setxkbmap-1.0.2/setxkbmap.man 2006-06-11 21:08:20.000000000 -0400 +--- setxkbmap/setxkbmap.man.orig 2006-06-11 21:04:12.000000000 -0400 ++++ setxkbmap/setxkbmap.man 2006-06-11 21:08:20.000000000 -0400 @@ -1,120 +1,167 @@ .\" .\" $XFree86: xc/programs/setxkbmap/setxkbmap.man,v 3.6 2003/01/20 04:15:08 dawes Exp $ @@ -819,10 +819,10 @@ Index: xkbevd/xkbevd.man +for a full statement of rights and permissions. .SH AUTHOR Erik Fortune, Silicon Graphics -Index: xkbprint-X11R7.0-1.0.1/xkbprint.man +Index: xkbprint/xkbprint.man =================================================================== ---- xkbprint-X11R7.0-1.0.1/xkbprint.man.orig 2006-06-11 21:04:12.000000000 -0400 -+++ xkbprint-X11R7.0-1.0.1/xkbprint.man 2006-06-11 21:11:14.000000000 -0400 +--- xkbprint/xkbprint.man.orig 2006-06-11 21:04:12.000000000 -0400 ++++ xkbprint/xkbprint.man 2006-06-11 21:11:14.000000000 -0400 @@ -2,112 +2,198 @@ .\" .\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $ diff --git a/debian/patches/14_SECURITY_setuid.diff b/debian/patches/14_SECURITY_setuid.diff index c6483f8..c4eeb67 100644 --- a/debian/patches/14_SECURITY_setuid.diff +++ b/debian/patches/14_SECURITY_setuid.diff @@ -1,7 +1,7 @@ -Index: xbase-clients/xf86dga-X11R7.0-1.0.1/dga.c +Index: xbase-clients/xf86dga/dga.c =================================================================== ---- xbase-clients.orig/xf86dga-X11R7.0-1.0.1/dga.c 2006-06-30 01:06:00.000000000 -0400 -+++ xbase-clients/xf86dga-X11R7.0-1.0.1/dga.c 2006-06-30 01:06:50.000000000 -0400 +--- xbase-clients.orig/xf86dga/dga.c 2006-06-30 01:06:00.000000000 -0400 ++++ xbase-clients/xf86dga/dga.c 2006-06-30 01:06:50.000000000 -0400 @@ -16,6 +16,7 @@ #include #include @@ -38,10 +38,10 @@ Index: xbase-clients/xinit/xinit.c setpgrp(0, getpid()); environ = newenviron; #ifdef __UNIXOS2__ -Index: xbase-clients/xload-X11R7.0-1.0.1/xload.c +Index: xbase-clients/xload/xload.c =================================================================== ---- xbase-clients.orig/xload-X11R7.0-1.0.1/xload.c 2006-06-30 01:08:01.000000000 -0400 -+++ xbase-clients/xload-X11R7.0-1.0.1/xload.c 2006-06-30 01:08:51.000000000 -0400 +--- xbase-clients.orig/xload/xload.c 2006-06-30 01:08:01.000000000 -0400 ++++ xbase-clients/xload/xload.c 2006-06-30 01:08:51.000000000 -0400 @@ -35,6 +35,7 @@ */ diff --git a/debian/patches/pkgconfig_naughtiness b/debian/patches/pkgconfig_naughtiness index 620ec3f..fd18abe 100644 --- a/debian/patches/pkgconfig_naughtiness +++ b/debian/patches/pkgconfig_naughtiness @@ -1,7 +1,7 @@ -Index: xdbedizzy-X11R7.0-1.0.1/configure.ac +Index: xdbedizzy/configure.ac =================================================================== ---- xdbedizzy-X11R7.0-1.0.1/configure.ac (revision 2182) -+++ xdbedizzy-X11R7.0-1.0.1/configure.ac (working copy) +--- xdbedizzy/configure.ac (revision 2182) ++++ xdbedizzy/configure.ac (working copy) @@ -35,6 +35,10 @@ AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),