gpm/gpm-conf.patch

Index: README
===================================================================
--- README.orig	2009-02-09 10:58:53.000000000 +0100
+++ README	2010-09-08 13:26:14.060039119 +0200
@@ -128,7 +128,7 @@ Configuration is optional...
 	             (string-match "con.*" (getenv "TERM"))))
 	    (load-library "t-mouse"))
 
-* If you want to use gpm-root, copy gpm-root.conf to your /usr/etc
+* If you want to use gpm-root, copy gpm-root.conf to your /etc/gpm/root.conf
 	directory, test it out and then edit it to suit your feels.
 
 * You'd like to name the gpm info file inside /usr/info/dir. Just insert

Index: doc/README.synaptics
===================================================================
--- doc/README.synaptics.orig	2009-02-09 10:58:53.000000000 +0100
+++ doc/README.synaptics	2010-09-08 13:26:14.108033711 +0200
@@ -25,8 +25,8 @@ the buttons, this support currently has
 
 These features can be enabled/disabled and many of them have time and speed
 parameters which can be adjusted to the taste of the user.  These parameters
-can be provided in the "/usr/etc/gpm-syn.conf" file (or
-/usr/local/etc/gpm-syn.conf, or /etc/gpm-syn.conf, according to how you ran
+can be provided in the "/etc/gpm/syn.conf" file (or /usr/etc/syn.conf
+/usr/local/etc/syn.conf, or /etc/syn.conf, according to how you ran
 configure).  Each line in this file has the following syntax: [param-name]
 <value>
 
Index: doc/README.twiddler
===================================================================
--- doc/README.twiddler.orig	2009-02-09 10:58:53.000000000 +0100
+++ doc/README.twiddler	2010-09-08 13:26:14.128031459 +0200
@@ -101,23 +101,23 @@ precompile values because that would mea
 file, and provide documentation as well. Using a compulsory
 configuration file reliefs my workload :-)
 
-The file "gpm-twiddler.conf" that appears in the gpm configuration
+The file "twiddler.conf" that appears in the gpm configuration
 includes the default keyboard map, and can be used right away. If the
 file is not in place, gpm will complain about its absence. By default
-the file must live in /usr/etc (or /usr/local/etc, or whatever you
+the file must live in /etc/gpm (or /usr/local/etc, or whatever you
 gave as a prefix to ./configure). The behaviour is similar for
 different installation prefixes. The file is not installed by "make
 install".  If the file is missing, gpm will exit producing a message
 like this:
 
-	./gpm: /usr/etc/gpm-twiddler.conf: No such file or directory
+	./gpm: /etc/gpm/twiddler.conf: No such file or directory
 
 The distributed configuration file includes its own documentation.
 
 If you want to add keys to the default file, you can avoid editing it
-by writing a "gpm-twiddler.user" file and putting it in the same
-directory as gpm-twiddler.conf. Gpm will read both files, in sequence,
-but won't complain if gpm-twiddler.user doesn't exist.
+by writing a "twiddler.user" file and putting it in the same
+directory as twiddler.conf. Gpm will read both files, in sequence,
+but won't complain if twiddler.user doesn't exist.
 
 Gpm will print an error message for any incorrect line in any of the
 configuration files: error messages include the file name and the
Index: doc/doc.gpm.in
===================================================================
--- doc/doc.gpm.in.orig	2008-06-16 22:44:05.000000000 +0200
+++ doc/doc.gpm.in	2010-09-08 13:26:14.128031459 +0200
@@ -1971,7 +1971,7 @@ Available command line options are the f
 
 @item -u
         Deny using user-specific configuration files. With this
-        option on, only @file{/etc/gpm-root.conf} will be used as a source
+        option on, only @file{/etc/gpm/root.conf} will be used as a source
         of configuration information. This option
         is intended for those system administrators who fear security could
         be broken by this daemon. Things should be sufficiently secure, but
@@ -1999,7 +1999,7 @@ changed. This allows modification of per
 the daemon.
 
 %M The actual configuration file is better introduced by looking at your
-%M @file{/etc/gpm-root.conf}.
+%M @file{/etc/gpm/root.conf}.
 %M
 %MSKIP
 
@@ -2186,7 +2186,7 @@ Alessandro Rubini <rubini@linux.it>
 .SH FILES
 .nf
 /dev/gpmctl     The socket used to connect to gpm.
-/etc/gpm-root.conf  The default configuration file.
+/etc/gpm/root.conf  The default configuration file.
 $(HOME)/.gpm-root   The user configuration file.
 /dev/vcs*           Virtual Console Screens
 .fi

Index: doc/gpm.info
===================================================================
--- doc/gpm.info.orig	2009-02-09 10:59:44.000000000 +0100
+++ doc/gpm.info	2010-09-08 13:26:14.168026952 +0200
@@ -1594,7 +1594,7 @@ distribution directory. The tool won't r
 
 `-u'
      Deny using user-specific configuration files. With this option on,
-     only `/etc/gpm-root.conf' will be used as a source of
+     only `/etc/gpm/root.conf' will be used as a source of
      configuration information. This option is intended for those
      system administrators who fear security could be broken by this
      daemon. Things should be sufficiently secure, but if you find a

Index: src/headers/twiddler.h
===================================================================
--- src/headers/twiddler.h.orig	2009-02-09 10:58:53.000000000 +0100
+++ src/headers/twiddler.h	2010-09-08 13:26:14.284013884 +0200
@@ -46,7 +46,7 @@
 #define TW_M_MASK 0x1FF /* mask of movement bits, after shifting */
 #define TW_M_BIT  0x100
 
-#define TW_SYSTEM_FILE SYSCONFDIR "/gpm-twiddler.conf"
-#define TW_CUSTOM_FILE SYSCONFDIR "/gpm-twiddler.user"
+#define TW_SYSTEM_FILE SYSCONFDIR "/twiddler.conf"
+#define TW_CUSTOM_FILE SYSCONFDIR "/twiddler.user"
 
 
Index: src/prog/gpm-root.y
===================================================================
--- src/prog/gpm-root.y.orig	2009-02-09 10:58:53.000000000 +0100
+++ src/prog/gpm-root.y	2010-09-08 13:26:14.304011630 +0200
@@ -77,7 +77,7 @@
 #endif
 
 #define USER_CFG   ".gpm-root"
-#define SYSTEM_CFG SYSCONFDIR "/gpm-root.conf"
+#define SYSTEM_CFG SYSCONFDIR "/root.conf"
 
 #define DEFAULT_FORE 7
 #define DEFAULT_BACK 0

Index: src/synaptics.c
===================================================================
--- src/synaptics.c.orig	2009-02-09 10:58:53.000000000 +0100
+++ src/synaptics.c	2010-09-08 13:26:14.308011179 +0200
@@ -2064,7 +2064,7 @@ static void tp_process_report (Gpm_Event
 ** syn_read_config_file
 **
 ** Read the configuration data from the global config file
-** SYSCONFDIR "/gpm-syn.conf".
+** SYSCONFDIR "/syn.conf".
 */
 void tp_read_config_file (char* config_filename) 
 {
@@ -2188,7 +2188,7 @@ static void syn_process_config (info_typ
   gpm_report (GPM_PR_INFO, "     Firmware version %d.%d\n",
 	      ident.info_major, ident.info_minor);
 
-  tp_read_config_file ("gpm-syn.conf");
+  tp_read_config_file ("syn.conf");
 
   
   /* Limit the options depending on the touchpad capabilities. This should be