ChangeLog | 130 + config/50-x11-input-joystick.fdi | 8 configure.ac | 11 debian/README.source | 73 + debian/changelog | 7 debian/control | 2 debian/xsfbs/xsfbs.mk | 21 debian/xsfbs/xsfbs.sh | 245 --- include/joystick-properties.h | 12 man/joystick.man | 44 src/Makefile.am | 3 src/StrKeysym.c | 82 - src/StrKeysym.h | 28 src/jstk.c | 52 src/jstk.h | 19 src/jstk_key.c | 344 ++++ src/jstk_options.c | 56 src/jstk_properties.c | 91 + src/ks_tables.h | 2694 --------------------------------------- 19 files changed, 689 insertions(+), 3233 deletions(-)
New commits: commit b4f50dca511571c2d07f6f510d1ccf0fb1311576 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 15:19:31 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 302dc46..ce46b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:16:20 +0200 diff --git a/debian/control b/debian/control index f3222d5..2e07a71 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git commit 65ddd2c91c4533a33946ffff419d4ab111891d02 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 15:17:01 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 8a25d7b..b238968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,132 @@ -commit 88a084952f547ebc2f30a257e441930024a69be9 +commit eaf8d1a1d87af9f67ca3e3d0436bb9d9a7cfc17a Author: Sascha Hlusiak <[email protected]> -Date: Tue Apr 14 22:33:01 2009 +0200 +Date: Sat Oct 31 12:41:15 2009 +0100 - Fail configure on xorg-server >= 1.6.99 + Bump to 1.5.0 - The 1.4 branch is broken on xorg-server >= 1.6.99. Use master instead. + Signed-off-by: Sascha Hlusiak <[email protected]> + +commit 657c01c8ebb9e0571d498356e6d3d03917199328 +Author: Sascha Hlusiak <[email protected]> +Date: Wed Oct 7 09:24:39 2009 +0200 + + Revert "add shave support" + + This reverts commit 1fa414dd6f32d68378bc9d571c439a603c2e7888. + +commit 565de79d42350106c9d62f8f0939a0c35138989d +Merge: 729b5bc 1fa414d +Author: Sascha Hlusiak <[email protected]> +Date: Fri Oct 2 11:32:40 2009 +0200 + + Merge branch 'scancodes' + + Conflicts: + configure.ac + +commit 1fa414dd6f32d68378bc9d571c439a603c2e7888 +Author: Sascha Hlusiak <[email protected]> +Date: Fri Oct 2 11:31:14 2009 +0200 + + add shave support + + clean up compile output + +commit 5fdab9ca49474d78f2ebfb27aa931565ce985e08 +Author: Sascha Hlusiak <[email protected]> +Date: Fri Sep 11 18:23:26 2009 +0200 + + Fix NULL pointers in rmlvo + +commit 462aae4db1302bc5a89ccf4a1db25e1c09a04132 +Merge: b2de71f 5e2b2a6 +Author: Sascha Hlusiak <[email protected]> +Date: Fri Sep 11 17:54:13 2009 +0200 + + Merge branch 'scancodes' of ssh://deepthought/home/sascha/develop/xorg/xf86-input-joystick into scancodes + +commit 729b5bc6e3dba76ff763de27ec4c6e4c0933a9cd +Author: Peter Hutterer <[email protected]> +Date: Fri Sep 11 13:53:55 2009 +1000 + + joystick 1.4.99.1 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit e8f22493833e33683e659ae348d9f58a43838252 +Author: Peter Hutterer <[email protected]> +Date: Fri Sep 11 13:55:50 2009 +1000 + + Fix typo in configure. + +commit b2de71f4366c61a165562a573b30e1edd336ba5f +Author: Sascha Hlusiak <[email protected]> +Date: Tue Jun 23 23:51:32 2009 +0200 + + Support for axis labels; fix build on master + + The first two axes are always REL_X and REL_Y. All other axes and buttons + are set to 'None', proper labeling will follow. + + Thanks to Peter for the heads up. + + Signed-off-by: Sascha Hlusiak <[email protected]> + +commit 5e2b2a631063974ea6de7796f39106b85b2db31d +Author: Sascha Hlusiak <[email protected]> +Date: Wed Apr 15 00:29:44 2009 +0200 + + fix manpage and examples to reflect recent key changes + +commit bf8626967263ee92d45759c58dc5bcc42a57176b +Author: Sascha Hlusiak <[email protected]> +Date: Tue Apr 14 23:25:44 2009 +0200 + + Property support for scancodes + + Allows setting scancodes for keys using input-properties + +commit 57bf11bc03a04fd68bb3ee2cd5375f04326e5c28 +Author: Sascha Hlusiak <[email protected]> +Date: Sat Apr 11 14:25:07 2009 +0200 + + configure.ac: this is 1.4.99 + + Major changes in configuration call for a major release. + +commit 7f6e390fb1f8ca006b2a995877128f3de0a445ba +Author: Sascha Hlusiak <[email protected]> +Date: Sat Apr 11 14:19:58 2009 +0200 + + Use preset keyboard layout instead of custom generated keymap. + + Restored compatibility with recent xkb changes and xorg-server-1.7. + Keys are configured now using scancodes instead of keysyms. Depends on + set keymap; people could write custom layouts. + +commit 4fbfcb17d6f6e7e44633f97e48b3ece8769758f0 +Author: Sascha Hlusiak <[email protected]> +Date: Sat Apr 11 13:13:16 2009 +0200 -commit 7d6a068c29e372747fc621020976797df9f61bac + Remove parsing of keysyms. + + Key options are expected to be scancodes/plain numbers now. + +commit 7c677b3d26a1a21f15e8acc96f57f05659265204 Author: Sascha Hlusiak <[email protected]> -Date: Tue Apr 14 22:25:49 2009 +0200 +Date: Sat Apr 11 13:12:17 2009 +0200 + + Remove ks_tables.h + + No more keysym parsing - Bump 1.4.1 +commit 8075ee4808a9c9eab25fb8716498208b895e6287 +Author: Sascha Hlusiak <[email protected]> +Date: Sat Apr 11 13:11:24 2009 +0200 + + Remove parsing of keysyms + + Change of configuration semantics again. Keys are specified in scancodes instead of keysyms. commit e1710072396a97369ef71b1fd1738ad092a5e902 Author: Sascha Hlusiak <[email protected]> diff --git a/debian/changelog b/debian/changelog index b6903ac..302dc46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 15:16:20 +0200 + xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low * New upstream release. commit eaf8d1a1d87af9f67ca3e3d0436bb9d9a7cfc17a Author: Sascha Hlusiak <[email protected]> Date: Sat Oct 31 12:41:15 2009 +0100 Bump to 1.5.0 Signed-off-by: Sascha Hlusiak <[email protected]> diff --git a/configure.ac b/configure.ac index 3402d02..e0be568 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-joystick], - 1.4.99.2, + 1.5.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-joystick) commit 657c01c8ebb9e0571d498356e6d3d03917199328 Author: Sascha Hlusiak <[email protected]> Date: Wed Oct 7 09:24:39 2009 +0200 Revert "add shave support" This reverts commit 1fa414dd6f32d68378bc9d571c439a603c2e7888. diff --git a/.gitignore b/.gitignore index 443e330..e5a79a1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ xf86-input-joystick-*.tar.gz ChangeLog *.pc tags -shave -shave-libtool diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 0a3509e..0000000 --- a/acinclude.m4 +++ /dev/null @@ -1,77 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl Damien Lespiau <[email protected]> -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - SHAVE_SAVED_OBJC=$OBJC - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - AC_SUBST(OBJC) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - diff --git a/configure.ac b/configure.ac index 63f3f7e..3402d02 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,6 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -AC_CONFIG_FILES([shave shave-libtool]) - # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.2) @@ -123,8 +121,6 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION XORG_CHANGELOG -SHAVE_INIT([.], [enable]) - AC_OUTPUT([Makefile src/Makefile man/Makefile diff --git a/shave-libtool.in b/shave-libtool.in deleted file mode 100644 index 1f3a720..0000000 --- a/shave-libtool.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -# we need sed -s...@sed@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the real libtool to use -LIBTOOL="$1" -shift - -# if 1, don't print anything, the underlaying wrapper will do it -pass_though=0 - -# scan the arguments, keep the right ones for libtool, and discover the mode -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - preserved_args="$preserved_args $opt" - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -case "$mode" in -compile) - # shave will be called and print the actual CC/CXX/LINK line - preserved_args="$preserved_args --shave-mode=$mode" - pass_though=1 - ;; -link) - preserved_args="$preserved_args --shave-mode=$mode" - Q=" LINK " - ;; -*) - # let's u - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_though -eq 0; then - echo "$Q$output" - fi - $LIBTOOL --silent $preserved_args -else - echo $LIBTOOL $preserved_args - $LIBTOOL $preserved_args -fi diff --git a/shave.in b/shave.in deleted file mode 100644 index 5c16f27..0000000 --- a/shave.in +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -# we need sed -s...@sed@ -if test -z "$SED" ; then -SED=sed -fi - -lt_unmangle () -{ - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` -} - -# the tool to wrap (cc, cxx, ar, ranlib, ..) -tool="$1" -shift - -# the reel tool (to call) -REEL_TOOL="$1" -shift - -pass_through=0 -preserved_args= -while test "$#" -gt 0; do - opt="$1" - shift - - case $opt in - --shave-mode=*) - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` - ;; - -o) - lt_output="$1" - preserved_args="$preserved_args $opt" - ;; - *) - preserved_args="$preserved_args $opt" - ;; - esac -done - -# mode=link is handled in the libtool wrapper -case "$mode,$tool" in -link,*) - pass_through=1 - ;; -*,cxx) - Q=" CXX " - ;; -*,cc) - Q=" CC " - ;; -*,fc) - Q=" FC " - ;; -*,f77) - Q=" F77 " - ;; -*,objc) - Q=" OBJC " - ;; -*,*) - # should not happen - Q=" CC " - ;; -esac - -lt_unmangle "$lt_output" -output=$last_result - -if test -z $V; then - if test $pass_through -eq 0; then - echo "$Q$output" - fi - $REEL_TOOL $preserved_args -else - echo $REEL_TOOL $preserved_args - $REEL_TOOL $preserved_args -fi commit 1fa414dd6f32d68378bc9d571c439a603c2e7888 Author: Sascha Hlusiak <[email protected]> Date: Fri Oct 2 11:31:14 2009 +0200 add shave support clean up compile output diff --git a/.gitignore b/.gitignore index e5a79a1..443e330 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ xf86-input-joystick-*.tar.gz ChangeLog *.pc tags +shave +shave-libtool diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..0a3509e --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,77 @@ +dnl Make automake/libtool output more friendly to humans +dnl Damien Lespiau <[email protected]> +dnl +dnl SHAVE_INIT([shavedir],[default_mode]) +dnl +dnl shavedir: the directory where the shave scripts are, it defaults to +dnl $(top_builddir) +dnl default_mode: (enable|disable) default shave mode. This parameter +dnl controls shave's behaviour when no option has been +dnl given to configure. It defaults to disable. +dnl +dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just +dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and +dnl LIBTOOL, you don't want the configure tests to have these variables +dnl re-defined. +dnl * This macro requires GNU make's -s option. + +AC_DEFUN([_SHAVE_ARG_ENABLE], +[ + AC_ARG_ENABLE([shave], + AS_HELP_STRING( + [--enable-shave], + [use shave to make the build pretty [[default=$1]]]),, + [enable_shave=$1] + ) +]) + +AC_DEFUN([SHAVE_INIT], +[ + dnl you can tweak the default value of enable_shave + m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) + + if test x"$enable_shave" = xyes; then + dnl where can we find the shave scripts? + m4_if([$1],, + [shavedir="$ac_pwd"], + [shavedir="$ac_pwd/$1"]) + AC_SUBST(shavedir) + + dnl make is now quiet + AC_SUBST([MAKEFLAGS], [-s]) + AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) + + dnl we need sed + AC_CHECK_PROG(SED,sed,sed,false) + + dnl substitute libtool + SHAVE_SAVED_LIBTOOL=$LIBTOOL + LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" + AC_SUBST(LIBTOOL) + + dnl substitute cc/cxx + SHAVE_SAVED_CC=$CC + SHAVE_SAVED_CXX=$CXX + SHAVE_SAVED_FC=$FC + SHAVE_SAVED_F77=$F77 + SHAVE_SAVED_OBJC=$OBJC + CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" + CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" + FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" + F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" + OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" + AC_SUBST(CC) + AC_SUBST(CXX) + AC_SUBST(FC) + AC_SUBST(F77) + AC_SUBST(OBJC) + + V=@ + else + V=1 + fi + Q='$(V:1=)' + AC_SUBST(V) + AC_SUBST(Q) +]) + diff --git a/configure.ac b/configure.ac index 59d6c0c..a33737a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,8 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +AC_CONFIG_FILES([shave shave-libtool]) + # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.2) @@ -121,6 +123,8 @@ XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION XORG_CHANGELOG +SHAVE_INIT([.], [enable]) + AC_OUTPUT([Makefile src/Makefile man/Makefile diff --git a/shave-libtool.in b/shave-libtool.in new file mode 100644 index 0000000..1f3a720 --- /dev/null +++ b/shave-libtool.in @@ -0,0 +1,69 @@ +#!/bin/sh + +# we need sed +s...@sed@ +if test -z "$SED" ; then +SED=sed +fi + +lt_unmangle () +{ + last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +} + +# the real libtool to use +LIBTOOL="$1" +shift + +# if 1, don't print anything, the underlaying wrapper will do it +pass_though=0 + +# scan the arguments, keep the right ones for libtool, and discover the mode +preserved_args= +while test "$#" -gt 0; do + opt="$1" + shift + + case $opt in + --mode=*) + mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` + preserved_args="$preserved_args $opt" + ;; + -o) + lt_output="$1" + preserved_args="$preserved_args $opt" + ;; + *) + preserved_args="$preserved_args $opt" + ;; + esac +done + +case "$mode" in +compile) + # shave will be called and print the actual CC/CXX/LINK line + preserved_args="$preserved_args --shave-mode=$mode" + pass_though=1 + ;; +link) + preserved_args="$preserved_args --shave-mode=$mode" + Q=" LINK " + ;; +*) + # let's u + # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" + ;; +esac + +lt_unmangle "$lt_output" +output=$last_result + +if test -z $V; then + if test $pass_though -eq 0; then + echo "$Q$output" + fi + $LIBTOOL --silent $preserved_args +else + echo $LIBTOOL $preserved_args + $LIBTOOL $preserved_args +fi diff --git a/shave.in b/shave.in new file mode 100644 index 0000000..5c16f27 --- /dev/null +++ b/shave.in @@ -0,0 +1,79 @@ +#!/bin/sh + +# we need sed +s...@sed@ +if test -z "$SED" ; then +SED=sed +fi + +lt_unmangle () +{ + last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +} + +# the tool to wrap (cc, cxx, ar, ranlib, ..) +tool="$1" +shift + +# the reel tool (to call) +REEL_TOOL="$1" +shift + +pass_through=0 +preserved_args= +while test "$#" -gt 0; do + opt="$1" + shift + + case $opt in + --shave-mode=*) + mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` + ;; + -o) + lt_output="$1" + preserved_args="$preserved_args $opt" + ;; + *) + preserved_args="$preserved_args $opt" + ;; + esac +done + +# mode=link is handled in the libtool wrapper +case "$mode,$tool" in +link,*) + pass_through=1 + ;; +*,cxx) + Q=" CXX " + ;; +*,cc) + Q=" CC " + ;; +*,fc) + Q=" FC " + ;; +*,f77) + Q=" F77 " + ;; +*,objc) + Q=" OBJC " + ;; +*,*) + # should not happen + Q=" CC " + ;; +esac + +lt_unmangle "$lt_output" +output=$last_result + +if test -z $V; then + if test $pass_through -eq 0; then + echo "$Q$output" + fi + $REEL_TOOL $preserved_args +else + echo $REEL_TOOL $preserved_args + $REEL_TOOL $preserved_args +fi commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # This is the X Strike Force shell library for X Window System package # maintainer scripts. It serves to define shell functions commonly used by # such packages, and performs some error checking necessary for proper operation @@ -8,7 +6,7 @@ # removal tasks. # If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can # skip past this library by scanning forward in this file to the string # "GOBSTOPPER". commit 5fdab9ca49474d78f2ebfb27aa931565ce985e08 Author: Sascha Hlusiak <[email protected]> Date: Fri Sep 11 18:23:26 2009 +0200 Fix NULL pointers in rmlvo diff --git a/src/jstk.c b/src/jstk.c index 42274ad..a2e927c 100644 --- a/src/jstk.c +++ b/src/jstk.c @@ -669,15 +669,15 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "xkb_layout", NULL); if (!priv->rmlvo.layout) - priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "XkbLayout", "uk"); + priv->rmlvo.layout = xf86SetStrOption(dev->commonOptions, "XkbLayout", "us"); priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "xkb_variant", NULL); if (!priv->rmlvo.variant) - priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "XkbVariant", NULL); + priv->rmlvo.variant = xf86SetStrOption(dev->commonOptions, "XkbVariant", ""); priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "xkb_options", NULL); if (!priv->rmlvo.options) - priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "XkbOptions", NULL); + priv->rmlvo.options = xf86SetStrOption(dev->commonOptions, "XkbOptions", ""); priv->mouse_enabled = xf86SetBoolOption(dev->commonOptions, "StartMouseEnabled", TRUE); priv->keys_enabled = xf86SetBoolOption(dev->commonOptions, "StartKeysEnabled", TRUE); diff --git a/src/jstk_key.c b/src/jstk_key.c index 25b3856..fb1f52e 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -348,10 +348,6 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5 { -/* XkbRMLVOSet rmlvo; */ -/* XkbGetRulesDflts(&rmlvo); */ - /* FIXME */ - #warning KEYMAP FOR ABI_XINPUT_VERSION >= 5 BROKEN RIGHT NOW if (!InitKeyboardDeviceStruct(pJstk, &priv->rmlvo, NULL, jstkKbdCtrl)) { ErrorF("unable to init keyboard device\n"); @@ -388,7 +384,7 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) if (!XkbInitKeyboardDeviceStruct(pJstk, &xkbnames, &keySyms, modMap, NULL, jstkKbdCtrl)) - return 0; + return !Success; #endif /* Set Autorepeat and Delay */ commit 729b5bc6e3dba76ff763de27ec4c6e4c0933a9cd Author: Peter Hutterer <[email protected]> Date: Fri Sep 11 13:53:55 2009 +1000 joystick 1.4.99.1 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 8afad16..dafd453 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-joystick], - 1.4.0, + 1.4.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-joystick) commit e8f22493833e33683e659ae348d9f58a43838252 Author: Peter Hutterer <[email protected]> Date: Fri Sep 11 13:55:50 2009 +1000 Fix typo in configure. diff --git a/configure.ac b/configure.ac index d8e107b..8afad16 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,8 @@ echo Building BSD usbhid backend: $bsd_backend if test "x$linux_backend" != "xyes" -a \ "x$bsd_backend" != "xyes" -a \ "x$evdev_backend" != "xyes"; then - AC_MSG_ERROR([No backends were found. Your operating is not supported by the - joystick driver. Contact [email protected] if you are - interested in porting it.]) + AC_MSG_ERROR([No backends were found. Your operating system is not + supported by the joystick driver. Contact + [email protected] if you are interested in + porting it.]) fi commit 5693792171d885769e58dcccc053c08b11acd12a -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
