debian/changelog | 9 + debian/control | 2 debian/patches/125_option_rec_revert.patch | 252 ----------------------------- debian/patches/126_ubuntu_xi22.patch | 11 - debian/patches/series | 2 5 files changed, 10 insertions(+), 266 deletions(-)
New commits: commit aa5163461411f47955d7aa40a63ae41a71338c68 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Thu Jun 28 21:51:27 2012 +0200 Removed patches and bump to 1.12 * Removed patches: - 125_option_rec_revert.patch - 126_ubuntu_xi22.patch * Bump xserver to 1.12 minimum diff --git a/debian/changelog b/debian/changelog index deffdc6..2c6e010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-input-synaptics (1.6.2-1ubuntu2) UNRELEASED; urgency=low + + * Removed patches: + - 125_option_rec_revert.patch + - 126_ubuntu_xi22.patch + * Bump xserver to 1.12 minimum + + -- Maarten Lankhorst <maarten.lankho...@canonical.com> Thu, 28 Jun 2012 21:49:46 +0200 + xserver-xorg-input-synaptics (1.6.2-1ubuntu1) quantal; urgency=low * Merged from Debian unstable diff --git a/debian/control b/debian/control index c1123d0..086533c 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libxext-dev, libxi-dev (>= 2:1.2.0), x11proto-core-dev, - xserver-xorg-dev (>= 2:1.11.3-0ubuntu1), + xserver-xorg-dev (>= 2:1.12), pkg-config, quilt, xutils-dev (>= 1:7.5+4), diff --git a/debian/patches/125_option_rec_revert.patch b/debian/patches/125_option_rec_revert.patch deleted file mode 100644 index 3f38f89..0000000 --- a/debian/patches/125_option_rec_revert.patch +++ /dev/null @@ -1,252 +0,0 @@ ---- a/test/fake-symbols.c -+++ b/test/fake-symbols.c -@@ -26,7 +26,7 @@ - } - - _X_EXPORT int --xf86OpenSerial(OPTTYPE options) -+xf86OpenSerial(pointer options) - { - return 0; - } -@@ -37,44 +37,44 @@ - return 0; - } - --_X_EXPORT OPTTYPE --xf86ReplaceIntOption(OPTTYPE optlist, const char *name, const int val) -+_X_EXPORT pointer -+xf86ReplaceIntOption(pointer optlist, const char *name, const int val) - { - return NULL; - } - - _X_EXPORT char * --xf86SetStrOption(OPTTYPE optlist, const char *name, CONST char *deflt) -+xf86SetStrOption(pointer optlist, const char *name, char *deflt) - { - return NULL; - } - - _X_EXPORT int --xf86SetBoolOption(OPTTYPE optlist, const char *name, int deflt) -+xf86SetBoolOption(pointer optlist, const char *name, int deflt) - { - return 0; - } - --_X_EXPORT OPTTYPE --xf86AddNewOption(OPTTYPE head, const char *name, const char *val) -+_X_EXPORT pointer -+xf86AddNewOption(pointer head, const char *name, const char *val) - { - return NULL; - } - --_X_EXPORT CONST char * --xf86FindOptionValue(OPTTYPE options, const char *name) -+_X_EXPORT char * -+xf86FindOptionValue(pointer options, const char *name) - { - return NULL; - } - - _X_EXPORT char * --xf86OptionName(OPTTYPE opt) -+xf86OptionName(pointer opt) - { - return NULL; - } - - _X_EXPORT char * --xf86OptionValue(OPTTYPE opt) -+xf86OptionValue(pointer opt) - { - return NULL; - } -@@ -86,7 +86,7 @@ - } - - _X_EXPORT char * --xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt) -+xf86CheckStrOption(pointer optlist, const char *name, char *deflt) - { - return NULL; - } -@@ -185,8 +185,8 @@ - return; - } - --_X_EXPORT OPTTYPE --xf86OptionListDuplicate(OPTTYPE options) -+_X_EXPORT pointer -+xf86OptionListDuplicate(pointer options) - { - return NULL; - } -@@ -213,7 +213,7 @@ - } - - _X_EXPORT int --xf86SetIntOption(OPTTYPE optlist, const char *name, int deflt) -+xf86SetIntOption(pointer optlist, const char *name, int deflt) - { - return 0; - } -@@ -240,7 +240,7 @@ - _X_EXPORT int - XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, - int format, int mode, unsigned long len, -- OPTTYPE value, Bool sendevent) -+ pointer value, Bool sendevent) - { - return 0; - } -@@ -344,14 +344,14 @@ - return FALSE; - } - --_X_EXPORT OPTTYPE --xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char *val) -+_X_EXPORT pointer -+xf86ReplaceStrOption(pointer optlist, const char *name, const char *val) - { - return NULL; - } - --_X_EXPORT OPTTYPE --xf86NextOption(OPTTYPE list) -+_X_EXPORT pointer -+xf86NextOption(pointer list) - { - return NULL; - } -@@ -393,13 +393,13 @@ - - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - void --xf86ProcessCommonOptions(InputInfoPtr pInfo, OPTTYPE list) -+xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer list) - { - } - - void - xf86CollectInputOptions(InputInfoPtr pInfo, -- const char **defaultOpts, OPTTYPE extraOpts) -+ const char **defaultOpts, pointer extraOpts) - { - } - ---- a/test/fake-symbols.h -+++ b/test/fake-symbols.h -@@ -1,40 +1,32 @@ - #include <xorg-server.h> - #include <xf86Xinput.h> - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14 --#define OPTTYPE XF86OptionPtr --#define CONST const --#else --#define OPTTYPE pointer --#define CONST --#endif -- - extern int xf86ReadSerial(int fd, void *buf, int count); - extern int xf86WriteSerial(int fd, const void *buf, int count); - extern int xf86CloseSerial(int fd); - extern int xf86WaitForInput(int fd, int timeout); --extern int xf86OpenSerial(OPTTYPE options); -+extern int xf86OpenSerial(pointer options); - extern int xf86SetSerialSpeed(int fd, int speed); - --extern OPTTYPE xf86ReplaceIntOption(OPTTYPE optlist, const char *name, -+extern pointer xf86ReplaceIntOption(pointer optlist, const char *name, - const int val); --extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, -+extern pointer xf86AddNewOption(pointer head, const char *name, - const char *val); --extern char *xf86OptionName(OPTTYPE opt); --extern CONST char *xf86FindOptionValue(OPTTYPE options, const char *name); -+extern char *xf86OptionName(pointer opt); -+extern char *xf86FindOptionValue(pointer options, const char *name); - extern int xf86NameCmp(const char *s1, const char *s2); --extern char *xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); -+extern char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); - --extern char *xf86SetStrOption(OPTTYPE optlist, const char *name, -- CONST char *deflt); --extern int xf86SetBoolOption(OPTTYPE optlist, const char *name, int deflt); --extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, -+extern char *xf86SetStrOption(pointer optlist, const char *name, -+ char *deflt); -+extern int xf86SetBoolOption(pointer optlist, const char *name, int deflt); -+extern pointer xf86AddNewOption(pointer head, const char *name, - const char *val); --extern CONST char *xf86FindOptionValue(OPTTYPE options, const char *name); --extern char *xf86OptionName(OPTTYPE opt); --extern char *xf86OptionValue(OPTTYPE opt); -+extern char *xf86FindOptionValue(pointer options, const char *name); -+extern char *xf86OptionName(pointer opt); -+extern char *xf86OptionValue(pointer opt); - extern int xf86NameCmp(const char *s1, const char *s2); --extern char *xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); -+extern char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); - extern void xf86AddEnabledDevice(InputInfoPtr pInfo); - extern void xf86RemoveEnabledDevice(InputInfoPtr pInfo); - extern Atom XIGetKnownProperty(char *name); -@@ -60,7 +52,7 @@ - - extern InputInfoPtr xf86FirstLocalDevice(void); - extern void xf86DeleteInput(InputInfoPtr pInp, int flags); --extern OPTTYPE xf86OptionListDuplicate(OPTTYPE options); -+extern pointer xf86OptionListDuplicate(pointer options); - extern Bool - - InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom *labels, -@@ -73,7 +65,7 @@ - extern void - xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down); - extern int -- xf86SetIntOption(OPTTYPE optlist, const char *name, int deflt); -+ xf86SetIntOption(pointer optlist, const char *name, int deflt); - extern void - - xf86PostButtonEventP(DeviceIntPtr device, -@@ -91,7 +83,7 @@ - - XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, - int format, int mode, unsigned long len, -- OPTTYPE value, Bool sendevent); -+ pointer value, Bool sendevent); - extern CARD32 GetTimeInMillis(void); - - extern int -@@ -143,10 +135,10 @@ - InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels, - int numMotionEvents, int mode); - --extern OPTTYPE --xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char *val); -+extern pointer -+xf86ReplaceStrOption(pointer optlist, const char *name, const char *val); - --extern OPTTYPE xf86NextOption(OPTTYPE list); -+extern pointer xf86NextOption(pointer list); - - extern int - -@@ -169,12 +161,12 @@ - - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - extern void -- xf86ProcessCommonOptions(InputInfoPtr pInfo, OPTTYPE list); -+ xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer list); - - extern void - - xf86CollectInputOptions(InputInfoPtr pInfo, -- const char **defaultOpts, OPTTYPE extraOpts); -+ const char **defaultOpts, pointer extraOpts); - - extern InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags); - diff --git a/debian/patches/126_ubuntu_xi22.patch b/debian/patches/126_ubuntu_xi22.patch deleted file mode 100644 index 06e15b3..0000000 --- a/debian/patches/126_ubuntu_xi22.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ AC_SUBST([sdkdir]) - DRIVER_NAME=synaptics - AC_SUBST([DRIVER_NAME]) - --PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no") -+PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.3], HAVE_XI22="yes", HAVE_XI22="no") - if test "x$HAVE_XI22" = xyes; then - AC_DEFINE(HAVE_MULTITOUCH, 1, [XI2.2 available]) - fi diff --git a/debian/patches/series b/debian/patches/series index 063c319..61218c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,7 +15,5 @@ #121_semi-mt_num_fingers.patch #123_order_ProcessTouch_for_numFingers.patch 124_syndaemon_events.patch -125_option_rec_revert.patch -126_ubuntu_xi22.patch 128_disable_three_click_action.patch 129_disable_three_touch_tap.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1skkkx-0000bm...@vasks.debian.org