File gpm-1.20.1-conf.patch of Package gpm

Overview Repositories Revisions Requests Users Attributes Meta

File gpm-1.20.1-conf.patch of Package gpm (Revision 1699df510578a15ba6c03f8f647161a8)

Currently displaying revision 1699df510578a15ba6c03f8f647161a8 , Show latest

--- README
+++ README
@@ -102,7 +102,7 @@
 	             (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
--- doc/README.silitek
+++ doc/README.silitek
@@ -14,11 +14,11 @@
 
 Both types of mouse driver uses the system wide configuration file
 
-      /etc/gpm-silitek.conf
+      /etc/gpm/silitek.conf
 
 which defines the return values of any key not being mouse button
 or mouse stick.  For this keys the drag mouse button works as a
-modifier: pressed once, the last column in /etc/gpm-silitek.conf
+modifier: pressed once, the last column in /etc/gpm/silitek.conf
 is used. To switch back to the normal return values, the drag mouse
 button has to be pressed again.  It is allowed to use escaped
 sequences as return values.  Characters other than printable can
@@ -169,7 +169,7 @@
 --------------------------------------------------------------------
 
 the Multimedia keys on IR Keyboard SK-7100 are usable (for ncurses
-based programs see below).  After editing /etc/gpm-silitek.conf
+based programs see below).  After editing /etc/gpm/silitek.conf
 to get the similar named keys to work similar, both the IR Keyboard
 SK-7100 and the IR commander SM-1000 are usable in parallel.
 
--- doc/README.synaptics
+++ doc/README.synaptics
@@ -25,8 +25,8 @@
 
 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>
 
--- doc/README.twiddler
+++ doc/README.twiddler
@@ -101,23 +101,23 @@
 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
--- doc/doc.gpm.in
+++ doc/doc.gpm.in
@@ -1981,7 +1981,7 @@
 
 @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
@@ -2009,7 +2009,7 @@
 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
 
@@ -2196,7 +2196,7 @@
 .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
--- doc/gpm.info
+++ doc/gpm.info
@@ -1604,7 +1604,7 @@
 
 `-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
--- src/headers/silitek.h
+++ src/headers/silitek.h
@@ -27,7 +27,7 @@
 extern void silitek_keys_ps2(unsigned char *data, int *drag);
 extern int silitek_ghost_ps2(unsigned char *data);
 extern int fd_silitek;
-#define SILI_SYSTEM_FILE SYSCONFDIR "/gpm-silitek.conf"
+#define SILI_SYSTEM_FILE SYSCONFDIR "/silitek.conf"
 #define SILISTRLEN      32
 #define SILISTRSCN      "key %32s %32s %32s"
 extern void silitek_mapping(void);
--- src/headers/twiddler.h
+++ src/headers/twiddler.h
@@ -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"
 
 
--- src/prog/gpm-root.y
+++ src/prog/gpm-root.y
@@ -78,7 +78,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
--- src/synaptics.c
+++ src/synaptics.c
@@ -2047,7 +2047,7 @@
 ** 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) 
 {
@@ -2171,7 +2171,7 @@
   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

Places

File gpm-1.20.1-conf.patch of Package gpm (Revision 1699df510578a15ba6c03f8f647161a8)

Places