.cvsignore | 19 .gitignore | 22 ChangeLog | 259 + Makefile.am | 8 Makefile.in | 24 aclocal.m4 | 376 +- config.guess | 58 config.h.in | 9 config.sub | 87 configure | 7736 ++++++++++++++++++++++++++------------------------ configure.ac | 2 debian/changelog | 20 debian/control | 12 debian/copyright | 3 debian/rules | 2 debian/xsfbs/xsfbs.mk | 46 debian/xsfbs/xsfbs.sh | 7 ltmain.sh | 2 man/.cvsignore | 2 man/.gitignore | 2 man/Makefile.in | 16 mkinstalldirs | 89 src/.cvsignore | 6 src/.gitignore | 6 src/Makefile.in | 14 src/xf86PM.c | 4 26 files changed, 4900 insertions(+), 3931 deletions(-)
New commits: commit aa044e5e30b664ee108ab4b91af5dc2c61a44f7d Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Sep 12 12:50:38 2007 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 75226d4..8a07cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-penmount (1:1.2.1-1) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.2.1-1) experimental; urgency=low [ Julien Cristau ] * Add link to xserver-xorg-core bug script, so that bugreports contain @@ -20,11 +20,7 @@ xserver-xorg-input-penmount (1:1.2.1-1) UNRELEASED; urgency=low * New upstream release. + Builds fine on Xserver 1.4, closes: #422678. - [ Drew Parsons ] - * Use PACKAGE_VERSION_* to identify the driver version (pull from - upstream git) - - -- Brice Goglin <[EMAIL PROTECTED]> Wed, 12 Sep 2007 12:47:38 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 12 Sep 2007 12:50:09 +0200 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9e7aabd..ee23923 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-penmount Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount commit 4bdb91fb956d448a9a72e92a9febedde7498b032 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Sep 12 12:48:47 2007 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..32ee712 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,245 @@ +commit db7b7d03a7e9136badf994c218cd137b59a376c2 +Author: Tilman Sauerbeck <[EMAIL PROTECTED]> +Date: Mon Sep 10 19:05:02 2007 +0200 + + Added man/penmount.? to .gitignore. + +commit 564d77fc97015fe5ae1dd7baf643524ad32ba19d +Author: Tilman Sauerbeck <[EMAIL PROTECTED]> +Date: Mon Sep 10 19:04:08 2007 +0200 + + Bumped version to 1.2.1. + +commit 45808497336a336ed76450fbe8279f0e6a7d5a4d +Author: Tilman Sauerbeck <[EMAIL PROTECTED]> +Date: Mon Sep 10 19:03:30 2007 +0200 + + Generate ChangeLog from git. + +commit 395e77e359d7d95e57116e70393ddba8d753efcc +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:52:21 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 4f886668127dad7f561334459cd9723f9af93103 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Aug 23 19:25:36 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 960f0207a4845b489a1c1ca9823821047722585d +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Wed Aug 8 01:09:31 2007 +0300 + + Convert from TSCalibrationCtl to AbsCalibCtl + +commit 7810e0bb438525c005f66a9bc5cc0af489fa08a1 +Author: Drew Parsons <[EMAIL PROTECTED]> +Date: Thu Jun 14 21:52:28 2007 +1000 + + Update version using PACKAGE_VERSION_* + +commit 5b785515ddbf7e799a1a32b9957195966a5cd513 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sat Jun 3 09:35:42 2006 +0000 + + Bug #4495: Add DMC9000 support. (Jaya Kumar). Bump to 1.2.0. + +commit f661f8975ff3940d8bff03e4090f235fe18a682e +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Fri Apr 7 18:06:50 2006 +0000 + + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit 68ee6b856239014ce271102d63431bedf99f3f4e +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:29:58 2005 +0000 + + Update package version for X11R7 release. + +commit dff9657264aa0a54452bfdd2391af8336cd1d424 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:25:51 2005 +0000 + + Stub COPYING files + +commit 5b6dcc48d42c63cf77daf51c7d50f1a47deedf4a +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:15 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 84251ccbe8c60a1526ff62290946071df87fd137 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:31 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 1d6b5856c1f4c8aff95feba1670fd689b2e13fe4 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:31 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 94ffe20ab22ea7316eb29b96e9a9d8d0d8e9a1f1 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Dec 2 02:16:06 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit dbec007fe040b83b4e8a9d2ecde42c61fd230de9 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Nov 29 23:29:57 2005 +0000 + + Only build dlloader modules by default. + +commit 2d0449c9e99654dcd52968137bb38c7022efc24e +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:04:07 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 9576737f2a5e32804a138cab956ee6aa0f805bd7 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:49:07 2005 +0000 + + Add .cvsignores for drivers. + +commit cad99fd68ed79009fe4f17b09c0f8bbd5c152a0b +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Nov 9 21:15:13 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 7d8b7d1f3c8ff4c9a9b36e20da8b5cdb4ba49066 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Nov 1 15:08:51 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit be3d4203d254b2778b0f5c12fb08e4943b93198a +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:48:01 2005 +0000 + + Update package version number for RC1 release. + +commit fe5c2db4f8a4cc83403d64e290bb3c6dda77ea1f +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Tue Oct 18 00:01:52 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit a0bf43dda49ed89eb9f46e9e85b0dc1d77d6555c +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Oct 17 22:57:30 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 65e6fa25c2ce5f11008d20b8ed0dd67232c8c3b8 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 00:09:00 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit b2285b3290f68584044c8b475d358916051c783a +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Thu Aug 18 09:03:40 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 869663ad207b3975a37d9c4ebc671afa51cc85dd +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed Aug 10 14:07:24 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit af1694382dd22d3e060d57a3f7904e0cbd96e8a0 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:41 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit ce9805fa17620f95049a6337b9237a6c0df55253 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Jul 13 20:03:23 2005 +0000 + + Make the module dir configurable + +commit 69ea32f73ddd3304679e2275fce17a0de3ee9e17 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Jul 13 02:21:02 2005 +0000 + + Update all input drivers to pass distcheck + +commit db7a0e403e949fff010941a0bb71737ae4e1f3ac +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Tue Jul 12 06:15:09 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 39bd1d974266114c2110c8fd14a8e98cb40862c6 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Jul 11 02:38:00 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 6cbcf72a9ea4340af320554fd64a692025744d19 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Sat Jun 25 21:17:02 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 2e05fc0dce5ddbbabaac4795152d2296a1167941 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:54:05 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e6ad5c52b96444c15f499a6c119d55ba0b779efc +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:33:52 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit d3e15e8f0a6f2449977228a2b711047529dc501c +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:12:34 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit eb77df0294796b6a13edadc376309d2f486bb6a7 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 0ab885c5a0cce8734fd1343eef892c2d3b1f4c74 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:23:34 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit a872db7cd08ffa3406cdcf4c7052c558f6b30335 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit dfee8a2321bf8c77a14ffbc4a74e11dff7fdb54c +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff --git a/Makefile.in b/Makefile.in index d50b00f..8b714d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -214,6 +214,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man +CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -574,6 +576,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -648,6 +651,11 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/config.sub b/config.sub index fab0aa3..387c18d 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2006-07-02' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -276,7 +276,6 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -285,7 +284,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -368,7 +367,7 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -910,10 +909,6 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; sei) basic_machine=mips-sei os=-seiux @@ -1371,9 +1366,6 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) - os=-elf - ;; spu-*) os=-elf ;; diff --git a/configure b/configure index 53b3efd..3f43b5c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for xf86-input-penmount 1.2.0. +# Generated by GNU Autoconf 2.61 for xf86-input-penmount 1.2.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-input-penmount' PACKAGE_TARNAME='xf86-input-penmount' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='xf86-input-penmount 1.2.0' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='xf86-input-penmount 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-input-penmount 1.2.0 to adapt to many kinds of systems. +\`configure' configures xf86-input-penmount 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-input-penmount 1.2.0:";; + short | recursive ) echo "Configuration of xf86-input-penmount 1.2.1:";; esac cat <<\_ACEOF @@ -1594,7 +1594,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-input-penmount configure 1.2.0 +xf86-input-penmount configure 1.2.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1608,7 +1608,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-input-penmount $as_me 1.2.0, which was +It was created by xf86-input-penmount $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2280,7 +2280,7 @@ fi # Define the identity of the package. PACKAGE='xf86-input-penmount' - VERSION='1.2.0' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -21060,7 +21060,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-input-penmount $as_me 1.2.0, which was +This file was extended by xf86-input-penmount $as_me 1.2.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21113,7 +21113,7 @@ Report bugs to <[EMAIL PROTECTED]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-input-penmount config.status 1.2.0 +xf86-input-penmount config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/debian/changelog b/debian/changelog index ed9888c..75226d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-penmount (1:1.2.0-2) UNRELEASED; urgency=low +xserver-xorg-input-penmount (1:1.2.1-1) UNRELEASED; urgency=low [ Julien Cristau ] * Add link to xserver-xorg-core bug script, so that bugreports contain @@ -17,12 +17,14 @@ xserver-xorg-input-penmount (1:1.2.0-2) UNRELEASED; urgency=low * Generate the Provides field automatically. * Add myself to uploaders, and remove Branden and Fabio with their permission. + * New upstream release. + + Builds fine on Xserver 1.4, closes: #422678. [ Drew Parsons ] * Use PACKAGE_VERSION_* to identify the driver version (pull from upstream git) - -- Brice Goglin <[EMAIL PROTECTED]> Wed, 12 Sep 2007 12:42:59 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 12 Sep 2007 12:47:38 +0200 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low commit 53ad6a4a396d5fb92400eaf87063a23f0945d72f Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Sep 12 12:43:41 2007 +0200 Build against xserver 1.4 and fix various minor things diff --git a/debian/changelog b/debian/changelog index d3da403..ed9888c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,13 +12,17 @@ xserver-xorg-input-penmount (1:1.2.0-2) UNRELEASED; urgency=low * Add XS-Vcs-*. * Add a link to www.X.org and a reference to the xf86-input-penmount module in the long description. - * Remove Fabio from uploaders with his permission. He's always welcome back. + * Add upstream URL to debian/copyright. + * Build against xserver 1.4. + * Generate the Provides field automatically. + * Add myself to uploaders, and remove Branden and Fabio with their + permission. [ Drew Parsons ] - * Use PACKAGE_VERSION_* to identify the driver version (pull from + * Use PACKAGE_VERSION_* to identify the driver version (pull from upstream git) - -- Drew Parsons <[EMAIL PROTECTED]> Thu, 14 Jun 2007 21:58:22 +1000 + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 12 Sep 2007 12:42:59 +0200 xserver-xorg-input-penmount (1:1.2.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 367bd10..9e7aabd 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: xserver-xorg-input-penmount Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-penmount XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penmount.git @@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-penm Package: xserver-xorg-input-penmount Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} -Provides: xserver-xorg-input +Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- Penmount input driver This package provides the driver for Penmount input devices. diff --git a/debian/copyright b/debian/copyright index 0e1aaa9..87ce102 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Copyright (c) 1999 Machine Vision Holdings Incorporated Author: David Woodhouse <[EMAIL PROTECTED]> CoAuthor: Mayk Langer <[EMAIL PROTECTED]> commit db7b7d03a7e9136badf994c218cd137b59a376c2 Author: Tilman Sauerbeck <[EMAIL PROTECTED]> Date: Mon Sep 10 19:05:02 2007 +0200 Added man/penmount.? to .gitignore. diff --git a/.gitignore b/.gitignore index d90176e..04b9542 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ ltmain.sh missing stamp-h1 *~ +man/penmount.? commit 564d77fc97015fe5ae1dd7baf643524ad32ba19d Author: Tilman Sauerbeck <[EMAIL PROTECTED]> Date: Mon Sep 10 19:04:08 2007 +0200 Bumped version to 1.2.1. diff --git a/configure.ac b/configure.ac index 17a0a88..a207053 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-penmount], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-penmount) commit 45808497336a336ed76450fbe8279f0e6a7d5a4d Author: Tilman Sauerbeck <[EMAIL PROTECTED]> Date: Mon Sep 10 19:03:30 2007 +0200 Generate ChangeLog from git. diff --git a/.gitignore b/.gitignore index 2df4a8d..d90176e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +ChangeLog Makefile Makefile.in *.la diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 0eea29e..0000000 --- a/ChangeLog +++ /dev/null @@ -1,54 +0,0 @@ -2006-06-03 Daniel Stone <[EMAIL PROTECTED]> - - * configure.ac: - Bump to 1.2.0. - - * src/xf86PM.c: - * src/xf86PM.h: - Bug #4495: Add DMC9000 support (Jaya Kumar). - -2006-04-06 Adam Jackson <[EMAIL PROTECTED]> - - * configure.ac: - * src/xf86PM.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-29 Adam Jackson <[EMAIL PROTECTED]> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 7052905..42f8b54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,11 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +CLEANFILES = ChangeLog +EXTRA_DIST = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) commit 395e77e359d7d95e57116e70393ddba8d753efcc Author: James Cloos <[EMAIL PROTECTED]> Date: Mon Sep 3 05:52:21 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index fb1befd..2df4a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libtool ltmain.sh missing stamp-h1 +*~ commit 575efb7249d7cf194f07e45db17e601d9c259231 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed Aug 29 09:36:00 2007 +0200 Do not call laptop-detect, let the only user call it directly diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 52473ca..a90ff7d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -59,13 +59,6 @@ fi ARCHITECTURE="$(dpkg --print-installation-architecture)" -LAPTOP="" -if [ -n "$(which laptop-detect)" ]; then - if laptop-detect >/dev/null; then - LAPTOP=true - fi -fi - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else commit 4f886668127dad7f561334459cd9723f9af93103 Author: James Cloos <[EMAIL PROTECTED]> Date: Thu Aug 23 19:25:36 2007 -0400 Rename .cvsignore to .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index fb1befd..0000000 --- a/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -Makefile -Makefile.in -*.la -*.lo -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fb1befd --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +Makefile +Makefile.in +*.la +*.lo +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/man/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/man/.gitignore b/man/.gitignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/man/.gitignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 9730646..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..9730646 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +*.la +*.lo commit 960f0207a4845b489a1c1ca9823821047722585d Author: Daniel Stone <[EMAIL PROTECTED]> Date: Wed Aug 8 01:09:31 2007 +0300 Convert from TSCalibrationCtl to AbsCalibCtl diff --git a/src/xf86PM.c b/src/xf86PM.c index 70e855c..0a6d1ad 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -751,7 +751,7 @@ DMC9000_ReadInput (InputInfoPtr pInfo) static int ControlProc (InputInfoPtr pInfo, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private); priv->min_x = c->min_x; commit 12a633f722a2ff9677728d1e2ae56767f804232a Author: Brice Goglin <[EMAIL PROTECTED]> Date: Thu Jul 12 16:06:22 2007 +0200 Fix "display the output of quilt push/pop". Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the return value of quilt, not the one of tee. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5f13302..bfca7bb 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare fi; \ if $(QUILT) next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/patch; \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ exit 1; \ fi; \ @@ -164,9 +166,11 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ echo "successful."; \ else \ + cat $(STAMP_DIR)/log/unpatch; \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ exit 1; \ fi; \ commit e29b56820909668b062fdba72458ee9483a4ae44 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Mon Jul 9 21:50:47 2007 +0200 Minor fixes in the patching system. * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920). * Display which patches are applied and removed instead of just the first one (for #428090). diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 2930c1e..5f13302 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -21,6 +21,11 @@ # Pass $(DH_OPTIONS) into the environment for debhelper's benefit. export DH_OPTIONS +# force quilt to not use ~/.quiltrc +QUILT = quilt --quiltrc /dev/null +# force QUILT_PATCHES to the default in case it is exported in the environment +QUILT_PATCHES = patches/ + # Set up parameters for the upstream build environment. # Determine (source) package name from Debian changelog. @@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ exit 1; \ fi; \ - if quilt next >/dev/null 2>&1; then \ + if $(QUILT) next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ @@ -159,7 +164,7 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ @@ -295,17 +300,17 @@ patch-audit: prepare unpatch @echo -n "Auditing patches..."; \ >$(STAMP_DIR)/log/patch; \ FUZZY=; \ - while [ -n "$$(quilt next)" ]; do \ - RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ case "$$RESULT" in \ succeeded) \ - echo "fuzzy patch: $$(quilt top)" \ - | tee -a $(STAMP_DIR)/log/$$(quilt top); \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ FUZZY=yes; \ ;; \ FAILED) \ - echo "broken patch: $$(quilt next)" \ - | tee -a $(STAMP_DIR)/log/$$(quilt next); \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ exit 1; \ ;; \ esac; \ commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]