Commit: 5556d52cf003ce9603ad2e84c967fe1ca2a8022d - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: 5556d52cf003ce9603ad2e84c967fe1ca2a8022d (tree)
• Time: 2010-09-13 05:30:53
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

debian: merge of master makes patches no longer needed

Change Summary

• delete: debian/patches/link_as_needed.patch
• delete: debian/patches/remove_readme.patch
• delete: debian/patches/series
• delete: debian/patches/spelling_fixes.patch
• delete: debian/patches/typo_traditional.patch

Incremental Difference

--- a/debian/patches/link_as_needed.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Make: add --as-needed ld flag
-  Avoids unnecessary linking, as suggested by Eugene Paskevich
-Author: Tias Guns <[e-mail]>
-Applied-Upstream: commit:fb22ed1a877444e2c970, http://github.com/tias/xinput_calibrator/commit/fb22ed1a877444e2c97031a00066d411e2d228ee
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,6 +43,10 @@
- xinput_calibrator_SOURCES = main_gtkmm.cpp
- xinput_calibrator_LDADD = $(XINPUT_LIBS) $(GTKMM_LIBS)
- xinput_calibrator_CXXFLAGS = $(XINPUT_CFLAGS) $(GTKMM_CFLAGS) $(AM_CXXFLAGS)
-+
-+# only include the needed gtkmm stuff
-+# lets hope this has no side-effects
-+xinput_calibrator_LDFLAGS = -Wl,--as-needed
- endif
- 
- EXTRA_DIST = \

--- a/debian/patches/remove_readme.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: remove README file
-  The README file contains build, usage and news information
-  This is relevant on the upstream github page, but not in
-  a binary package, so it is removed.
-Author: Tias Guns <[e-mail]>
-
---- a/README
-+++ /dev/null
-@@ -1,44 +0,0 @@
--xinput calibrator: A generic touchscreen calibration program for X.Org
--
--Version: 0.7.0
--Website: http://www.freedesktop.org/wiki/Software/xinput_calibrator
--Source:  http://github.com/tias/xinput_calibrator
--Bugs:    http://github.com/tias/xinput_calibrator/issues
--
--
--Build instructions:
---------------------
--./autogen.sh
--    Sets up build environment, run ./autogen.sh --help to see the build options
--    Notable build options:
--    --with-gui=gtkmm        Use gtkmm GUI
--    --with-gui=x11          Use native x11 GUI
--make
--    Builds the software with the configured GUI
--
--Usage:
--------
--Simply run:
--    xinput_calibrator
--
--For more information, run with --help or check the manpage.
--The scripts/ directory constains scripts to get calibration from hal or use a pointercal file to reapply xinput commands across reboots
--
--
--More about the project:
-------------------------
--Because all existing calibrators were driver dependent and hard to use, xinput_calibrator was created. The goal of xinput_calibrator is to: 
--* work for any Xorg driver (use Xinput to get axis valuators), 
--* output the calibration as Xorg.conf, HAL policy and udev rule, 
--* support advanced driver options, such as Evdev's dynamic calibration, 
--* have a very intuitive GUI (normal X client). 
--
--Xinput_calibrator is based on a simple calibrator that was proposed on the Xorg mailinglist. The first release(v0.2.0) improved upon it by reading axis valuators from Xinput, hence making it generic for all touchscreen drivers. The announcement was done on the Xorg mailinglist, and the code is on Tias' webpage. 
--
--Starting from v0.4.0, it writes Xorg.conf and (HAL) FDI policy file values, and contains a wrapper script to get axis valuator information for the evtouch driver (evtouch does not export the current calibration through its axis valuators). It is also the first program to support dynamic evdev calibration, by using its advanced Xinput functionality.
--
--The v0.5.0 version is written entirely in the X window system, needing no external dependencies. Because of its modular structure, other frontends can be easily created too.
--
--Version v0.6.0 has a proper build system and gained a lot of features thanks to the feedback of different users.
--
--Version 0.7.0 has mis-click detection and proper packaging support: proper make dist, one binary, has manpage, menu entry and icon. DEB and RPM package meta-data in their respective VCS branches.

--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-link_as_needed.patch
-remove_readme.patch
-typo_traditional.patch
-spelling_fixes.patch

--- a/debian/patches/spelling_fixes.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: Spelling fixes (thanks Paul Wise)
-Author: Tias Guns <[e-mail]>
-Forwarded: yes (I am upstream)
-
---- a/man/xinput_calibrator.1
-+++ b/man/xinput_calibrator.1
-@@ -46,7 +46,7 @@
- .B \-\-precalib \fImin_x\fP \fImax_x\fP \fImin_y\fP \fImax_y\fP
- Manually provide the current calibration setting.
- .br 
--This is usefull if the calibration values are stored in your xorg.conf, but the driver does not export them through XInput (eg. the calibrator can not know these values)
-+This is useful if the calibration values are stored in your xorg.conf, but the driver does not export them through XInput (eg. the calibrator can not know these values)
- .PP 
- .TP 8
- .B \-\-misclick \fInr_of_pixels\fP
-@@ -56,7 +56,7 @@
- .B \-\-fake
- Emulate a fake driver (for testing purposes)
- .br 
--Usefull to test the calibrator without applying the values, and possibly even without having a touchscreen.
-+Useful to test the calibrator without applying the values, and possibly even without having a touchscreen.
- .SH "USAGE"
- Run xinput_calibrator in a terminal, as it prints out the calibration values and instructions on standard output.
- .PP 
---- a/src/calibrator/calibratorEvdev.cpp
-+++ b/src/calibrator/calibratorEvdev.cpp
-@@ -133,7 +133,7 @@
- 
-             if (verbose) {
-                 if (ok)
--                    printf("DEBUG: Succesfully applied axis calibration.\n");
-+                    printf("DEBUG: Successfully applied axis calibration.\n");
-                 else
-                     printf("DEBUG: Failed to apply axis calibration.\n");
-             }
-@@ -197,7 +197,7 @@
- 
-         if (verbose) {
-             if (ok)
--                printf("DEBUG: Succesfully swapped X and Y axis.\n");
-+                printf("DEBUG: Successfully swapped X and Y axis.\n");
-             else
-                 printf("DEBUG: Failed to swap X and Y axis.\n");
-         }
-@@ -210,7 +210,7 @@
- 
-     if (verbose) {
-         if (ok)
--            printf("DEBUG: Succesfully applied axis calibration.\n");
-+            printf("DEBUG: Successfully applied axis calibration.\n");
-         else
-             printf("DEBUG: Failed to apply axis calibration.\n");
-     }
---- a/src/calibrator/calibratorUsbtouchscreen.cpp
-+++ b/src/calibrator/calibratorUsbtouchscreen.cpp
-@@ -187,7 +187,7 @@
-     // to keep the for the next boot
-     FILE *fid = fopen(modprobe_conf_local, "r");
-     if (fid == NULL) {
--        fprintf(stderr, "Error: Can't open '%s' for reading. Make sure you have the necesary rights\n", modprobe_conf_local);
-+        fprintf(stderr, "Error: Can't open '%s' for reading. Make sure you have the necessary rights\n", modprobe_conf_local);
-         fprintf(stderr, "New calibration data NOT saved\n");
-         return false;
-     }
-@@ -217,7 +217,7 @@
- 
-     fid = fopen(modprobe_conf_local, "w");
-     if (fid == NULL) {
--        fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necesary rights\n", modprobe_conf_local);
-+        fprintf(stderr, "Error: Can't open '%s' for writing. Make sure you have the necessary rights\n", modprobe_conf_local);
-         fprintf(stderr, "New calibration data NOT saved\n");
-         return false;
-     }

--- a/debian/patches/typo_traditional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: typo, tranditional instead of traditional (thanks Paul Wise)
-Author: Tias Guns <[e-mail]>
-Forwarded: yes (I am upstream)
-
---- a/src/calibrator/calibratorEvdev.cpp
-+++ b/src/calibrator/calibratorEvdev.cpp
-@@ -230,7 +230,7 @@
- 
-     // TODO detect EVDEV version at runtime ?
-     // deliberately not mention HAL way, by the time users run evdev 2.3.0, there will be no more HAL (on linux)
--    printf("\nIf you have evdev version 2.3.0 or higher, there are 2 more ways: the tranditional way (xorg.conf) and the new way (udev rule):\n");
-+    printf("\nIf you have evdev version 2.3.0 or higher, there are 2 more ways: the traditional way (xorg.conf) and the new way (udev rule):\n");
- 
-     // Xorg.conf output
-     printf("xorg.conf: edit /etc/X11/xorg.conf and add in the 'Section \"InputDevice\"' of your device:\n");
---- a/src/calibrator/calibratorXorgPrint.cpp
-+++ b/src/calibrator/calibratorXorgPrint.cpp
-@@ -46,7 +46,7 @@
- {
-     // TODO: detect which are applicable at runtime/in the makefile ?
-     printf("\n\n== Applying the calibration ==\n");
--    printf("There are multiple ways to do this: the tranditional way (xorg.conf), the new way (udev rule) and the soon deprecated way (HAL policy):\n");
-+    printf("There are multiple ways to do this: the traditional way (xorg.conf), the new way (udev rule) and the soon deprecated way (HAL policy):\n");
- 
-     // Xorg.conf output
-     printf("\nxorg.conf: edit /etc/X11/xorg.conf and add in the 'Section \"InputDevice\"' of your device:\n");