Hello community, here is the log from the commit of package xorg-x11-driver-input checked in at Tue Sep 11 18:36:00 CEST 2007. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2007-09-08 11:08:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2007-09-11 11:59:32.549852000 +0200 @@ -1,0 +2,24 @@ +Tue Sep 11 12:00:48 CEST 2007 - sndirsch@suse.de + +- xf86-input-elo2300 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-magellan 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-microtouch 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-penmount 1.2.1 + * Compatibility release for inputproto 1.4 +- xf86-input-spaceorb 1.1.1 + * Compatibility release for inputproto 1.4 + +------------------------------------------------------------------- +Mon Sep 10 20:59:37 CEST 2007 - sndirsch@suse.de + +- xf86-input-citron 2.2.1 + * Compatibility release for inputproto 1.4 +- xf86-input-calcomp 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-dynapro 1.1.1 + * Compatibility release for inputproto 1.4 + +------------------------------------------------------------------- Old: ---- xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2 xf86-input-citron-X11R7.1-2.2.0.tar.bz2 xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2 xf86-input-magellan-X11R7.1-1.1.0.tar.bz2 xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2 xf86-input-penmount-1.2.0.tar.bz2 xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2 New: ---- xf86-input-calcomp-1.1.1.tar.bz2 xf86-input-citron-2.2.1.tar.bz2 xf86-input-dynapro-1.1.1.tar.bz2 xf86-input-elo2300-1.1.1.tar.bz2 xf86-input-magellan-1.1.1.tar.bz2 xf86-input-microtouch-1.1.1.tar.bz2 xf86-input-penmount-1.2.1.tar.bz2 xf86-input-spaceorb-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.B25666/_old 2007-09-11 18:35:50.000000000 +0200 +++ /var/tmp/diff_new_pack.B25666/_new 2007-09-11 18:35:50.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 101 +Release: 103 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -23,12 +23,12 @@ Summary: X.Org input drivers Source0: xf86-input-acecad-1.2.1.tar.bz2 Source1: xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2 -Source2: xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2 -Source3: xf86-input-citron-X11R7.1-2.2.0.tar.bz2 +Source2: xf86-input-calcomp-1.1.1.tar.bz2 +Source3: xf86-input-citron-2.2.1.tar.bz2 Source4: xf86-input-digitaledge-X11R7.1-1.1.0.tar.bz2 Source5: xf86-input-dmc-1.1.1.tar.bz2 -Source6: xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 -Source7: xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2 +Source6: xf86-input-dynapro-1.1.1.tar.bz2 +Source7: xf86-input-elo2300-1.1.1.tar.bz2 Source8: xf86-input-elographics-1.1.0.tar.bz2 Source9: xf86-input-evdev-1.1.3.tar.bz2 Source10: xf86-input-fpit-X11R7.1-1.1.0.tar.bz2 @@ -36,14 +36,14 @@ Source12: xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2 Source13: xf86-input-joystick-1.2.3.tar.bz2 Source14: xf86-input-keyboard-1.2.2.tar.bz2 -Source15: xf86-input-magellan-X11R7.1-1.1.0.tar.bz2 +Source15: xf86-input-magellan-1.1.1.tar.bz2 Source16: xf86-input-magictouch-X11R7.1-1.0.0.5.tar.bz2 -Source17: xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2 +Source17: xf86-input-microtouch-1.1.1.tar.bz2 Source18: xf86-input-mouse-1.2.2.tar.bz2 Source19: xf86-input-mutouch-X11R7.1-1.1.0.tar.bz2 Source20: xf86-input-palmax-X11R7.1-1.1.0.tar.bz2 -Source21: xf86-input-penmount-1.2.0.tar.bz2 -Source22: xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2 +Source21: xf86-input-penmount-1.2.1.tar.bz2 +Source22: xf86-input-spaceorb-1.1.1.tar.bz2 Source23: xf86-input-summa-X11R7.1-1.1.0.tar.bz2 Source24: xf86-input-tek4957-X11R7.1-1.1.0.tar.bz2 Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2 @@ -132,6 +132,24 @@ %{_mandir}/man4/* %changelog +* Tue Sep 11 2007 - sndirsch@suse.de +- xf86-input-elo2300 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-magellan 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-microtouch 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-penmount 1.2.1 + * Compatibility release for inputproto 1.4 +- xf86-input-spaceorb 1.1.1 + * Compatibility release for inputproto 1.4 +* Mon Sep 10 2007 - sndirsch@suse.de +- xf86-input-citron 2.2.1 + * Compatibility release for inputproto 1.4 +- xf86-input-calcomp 1.1.1 + * Compatibility release for inputproto 1.4 +- xf86-input-dynapro 1.1.1 + * Compatibility release for inputproto 1.4 * Sat Sep 08 2007 - sndirsch@suse.de - xf86-input-void 1.1.1 * A quick xserver-1.4 compatibility release ++++++ xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2 -> xf86-input-calcomp-1.1.1.tar.bz2 ++++++ ++++ 21105 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/ChangeLog new/xf86-input-calcomp-1.1.1/ChangeLog --- old/xf86-input-calcomp-X11R7.1-1.1.0/ChangeLog 2006-04-07 18:54:17.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/ChangeLog 2007-09-10 18:15:08.000000000 +0200 @@ -1,45 +1,243 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit b202b45aeec28c5f858c0df977d1dc8e1a9d14eb +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:15:04 2007 +0200 - * configure.ac: - * src/xf86Calcomp.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Added some more patterns to .gitignore. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 60bb7cdf42b0ac2fc9b9e1340423af7518fe1abe +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:13:36 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Bumped version to 1.1.1. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 045dd911511bf806b8576302f1e196d137fb4665 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:12:33 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Generate ChangeLog from git. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1f3bd7beab75627cb3005faf9c0347eb7d7e5903 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 00:52:35 2007 +0300 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Compile fix when building with DEBUG + + XisbTrace didn't seem to do anything useful at all. -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c805910dda5b6aa7de2ded1e67b125ed2590fda5 +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 22:16:52 2007 +0200 - * configure.ac: - Update package version number for X11R7 RC3 release. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2417ced11cac0b3d3483c80a52d631009fb712d5 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Jan 2 14:28:42 2007 -0800 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + renamed: .cvsignore -> .gitignore -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit ce14d8f26f5f9c7c286941302bb5a53129239615 +Author: Eric S. Raymond <esr@thyrsus.com> +Date: Tue Jan 2 14:27:57 2007 -0800 - * configure.ac: - Only build dlloader modules by default. + Bug 9512: Broken list markup in calcomp.4 + + <https://bugs.freedesktop.org/show_bug.cgi?id=9512> -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 35b73a133fea204931b1624c8fa60ba75f9b99dd +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 16:54:17 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cdc0e8108a47f9ccf7dd1898bd75a996480a7df1 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Update package version for X11R7 release. + +commit 9600e57b8965e33c736ea728ee7dfe192042d184 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:49 2005 +0000 + + Stub COPYING files + +commit 1c6382cacb8f28f3a90ac7cbf974a34069826c80 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:13 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit ca4c2d1efafeada1a8104deb4d742dacc535534a +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:27 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit f87ae0938b0ef841bd6f2442762977e8908c3672 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:29 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 9cbc23babeb84dc2e5dc9226d931939a85485593 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit d6c038110aebc756849fa4f3795de750db2d40c8 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:54 2005 +0000 + + Only build dlloader modules by default. + +commit 094f25dbb87b58fe6a0a81a9e3a7ccb4c6b3f6c4 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:05 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 0dc26bbc517a5e7a16bbf20e1c8fa6518a8e3ffa +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:01 2005 +0000 + + Add .cvsignores for drivers. + +commit 3d5e4eb212d13010b175906a9499bafafcbd24a5 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:10 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit d53e6e9c20783d284ff88e4d3649ad2e7f8fe366 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:48 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 343486daf6b7faaeb88d98746fa91da17b112b8f +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:47:59 2005 +0000 + + Update package version number for RC1 release. + +commit ca6c572ea6cf765680790f45e27cf47366b9f2ee +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit beb4e20722c51ec9fd476d70f31a79733a90e22c +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:26 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 90fe5234710594018c432d654048487911020897 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:53 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit d5c04bd5cee42f0dd556050b7f726ffb4256f4ae +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:37 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 38a5ad6ab04226d721cd02b0d03f60795cc206b8 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 221c1e275de566f572dd5ae282e8431ddd5cc5e0 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 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 e53a9095fa9e2fe5df039f707fae149dc86ad37b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:20 2005 +0000 + + Make the module dir configurable + +commit 5c832ff7e5665cad91b1a65dd3150fa5be6d3bde +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:57 2005 +0000 + + Update all input drivers to pass distcheck + +commit e79ff6722d5c764c80ef02ed8af2381091e58e60 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit cc6d5df52208e532abc919010279d2143d8e82b6 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:58 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit d942bbdc43faae872e7699bfc378eccd89739797 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:00 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit c2a5716bcb661c36fb9c2adf687e2f45cc321f24 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 649bc72b3b73fefa54a9dc5869c798b3d7e861e9 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 3221c644e76e0df10a3ef47c999d71d8f3db0192 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:30 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 3377c708df6c81ab69bdd638d0f5afd03f0ea5f9 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit d48672f4cfa93907a68bfc5d42c3306551c96167 +Author: Egbert Eich <eich@suse.de> +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 955c9cbdced7dcd75b319c41023270db9bcfa028 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 82141c852d890ca247dde30af3ae016f24494d7c +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/config.h.in new/xf86-input-calcomp-1.1.1/config.h.in --- old/xf86-input-calcomp-X11R7.1-1.1.0/config.h.in 2006-05-23 05:13:01.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/config.h.in 2007-09-10 18:13:51.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/configure.ac new/xf86-input-calcomp-1.1.1/configure.ac --- old/xf86-input-calcomp-X11R7.1-1.1.0/configure.ac 2006-04-07 18:54:17.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/configure.ac 2007-09-10 18:13:18.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-calcomp], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-calcomp) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/Makefile.am new/xf86-input-calcomp-1.1.1/Makefile.am --- old/xf86-input-calcomp-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:08.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/Makefile.am 2007-09-10 18:12:01.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/man/calcomp.man new/xf86-input-calcomp-1.1.1/man/calcomp.man --- old/xf86-input-calcomp-X11R7.1-1.1.0/man/calcomp.man 2004-04-23 21:54:02.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/man/calcomp.man 2007-09-09 16:50:30.000000000 +0200 @@ -74,7 +74,6 @@ .TP 4 .B Option \fI"DebugLevel"\fP \fInumber \fP sets the level of debugging info reported. -.TP 4 .RE .SH "SEE ALSO" __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-calcomp-1.1.1/man/Makefile.am --- old/xf86-input-calcomp-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:27.000000000 +0100 +++ new/xf86-input-calcomp-1.1.1/man/Makefile.am 2007-09-09 16:50:30.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:05 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/missing new/xf86-input-calcomp-1.1.1/missing --- old/xf86-input-calcomp-X11R7.1-1.1.0/missing 2006-05-23 05:13:03.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/missing 2007-09-10 18:13:52.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-calcomp-X11R7.1-1.1.0/src/xf86Calcomp.c new/xf86-input-calcomp-1.1.1/src/xf86Calcomp.c --- old/xf86-input-calcomp-X11R7.1-1.1.0/src/xf86Calcomp.c 2006-04-07 18:54:17.000000000 +0200 +++ new/xf86-input-calcomp-1.1.1/src/xf86Calcomp.c 2007-09-09 16:50:30.000000000 +0200 @@ -101,7 +101,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -686,8 +686,6 @@ priv->checksum = 0; priv->buffer = XisbNew (local->fd, 200); - DBG (9, XisbTrace (priv->buffer, 1)); - /* * Verify that your hardware is attached and fuctional if you can */ ++++++ xf86-input-citron-X11R7.1-2.2.0.tar.bz2 -> xf86-input-citron-2.2.1.tar.bz2 ++++++ ++++ 21218 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/ChangeLog new/xf86-input-citron-2.2.1/ChangeLog --- old/xf86-input-citron-X11R7.1-2.2.0/ChangeLog 2006-04-07 18:56:47.000000000 +0200 +++ new/xf86-input-citron-2.2.1/ChangeLog 2007-09-10 18:00:44.000000000 +0200 @@ -1,61 +1,298 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 9a4d7854273a34c1a32f46fb52f2f8c3a227cd12 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:09:45 2007 +0200 - * configure.ac: - * src/citron.c: - Unlibcwrap. Bump server version requirement. Bump to 2.2.0. + Generate ChangeLog from git. -2006-03-01 Peter Kunzmann <kunzmann@citron.de> +commit f2cd377905ba74d6c13ab9e4f4491146e90a7e0d +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:03:33 2007 +0200 - * man/citron.man: - Change most -'s to \-. - Update list of supported devices. + Added some more patterns to .gitignore. - * src/citron.c: - * src/citron.h: - Call the PostButton event when breaking beams. - Added channels for ambient overload, keys and pwmex channels. - Beep on keyclicks. - Bug #6065: Add NULL to default_options[] to prevent crash. +commit 83adcd21fade2746b9a1b8e3ca3cc097db440919 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sun Sep 9 17:02:23 2007 +0200 - * configure.ac: - Bump to version 2.15. + Bumped version to 2.2.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a7295991a74b725a27efb1ed07ba4e396374b288 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Sep 7 10:14:14 2007 -0700 - * configure.ac: - Update package version for X11R7 release. + Move from TSCalibrationCtl to AbsCalibCtl - requires inputproto >= 1.4.1 + + Based on xf86-input-dmc commit 43a05fb4cb02f15fc91d0909a3cab37a9de6b622 by + Daniel Stone. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 75aca9fa1429ca9e2aa696c32cb77ca12d8c7856 +Author: Brice Goglin <bgoglin@debian.org> +Date: Tue Aug 7 09:50:40 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Define CITOUCH_VERSION* using PACKAGE_VERSION* -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 53a748872a1468845b99e7d9b90f2fcebf45c2b7 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Mar 1 10:33:07 2007 -0800 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + renamed: .cvsignore -> .gitignore -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit af0c6207afdcacc75c37e51f9f6fc4da1e3f5f57 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Mar 1 10:32:45 2007 -0800 - * configure.ac: - Update package version number for X11R7 RC3 release. + Replace references to XFree86/XF86Config in man page -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cacf63ad6432dd0a50df657b115cc17a22380a23 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 16:56:48 2006 +0000 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Unlibcwrap. Bump server version requirement. Bump to 2.2.0. -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit 82d53242c29bd3413cd3f167346d1d9f49a4dc13 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Mar 1 22:18:57 2006 +0000 - * configure.ac: - Only build dlloader modules by default. + keysym.h -> X11/keysym.h (minor compile fix). -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6b4742d17bcda83c7e23c828e49c04df42e411e2 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Mar 1 22:03:04 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Changes from Peter Kunzmann at Citron: + Change most -'s to \-. Update list of supported devices. + Call the PostButton event when breaking beams. Added channels for ambient + overload, keys and pwmex channels. Beep on keyclicks. Bug #6065: Add + NULL to default_options[] to prevent crash. + Bump to version 2.15. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8d5332b1d382c450112b4cf1b6813529b429d203 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Update package version for X11R7 release. + +commit 7492636f9514e3406a703ad62c09e8a597d47f7f +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:49 2005 +0000 + + Stub COPYING files + +commit 188e6952d3be04d4dad2ea3d1a40377a66b610be +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Dec 19 09:07:49 2005 +0000 + + Typo fixes, mailing list & url updates, and other changes to prepare for + X11R6.9 & 7.0 releases. + +commit fbe2b454ef4186dc98a5e31c27579322a74329ac +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:13 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 5d7ed446c18b8608926e693007d87e166d307d5c +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:28 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 1fe9eb74abe1260cc0948a820331423350759d62 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:29 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit ac581e01df3d241b2526e296ef28f80ee1526223 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 3be71ecdecf59548a8d247de0ce6ef758d83bff8 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:54 2005 +0000 + + Only build dlloader modules by default. + +commit a1a81ce3573d76399b0a1f87e2d944629630830e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:05 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 113f94d5740821fbfb9a307e0b807c9477acc7d1 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:01 2005 +0000 + + Add .cvsignores for drivers. + +commit 96066a398c9702db311f5397ca2674b2e5682cfe +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:11 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 58d71f3507c903488665fa5f9718580630b71a07 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:49 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 8adc791cd360dec3bbc328a2c76ffa8358d5c0cd +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Fri Oct 21 17:24:34 2005 +0000 + + Sun bug #6202893: nroff: if-else overflow.; line 93, file citron.7 + <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6202893> + (Sam Lau - Sun Microsystems) + +commit 390e528ddf888a25423b3f404228b4c2ed5cb3ec +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:47:59 2005 +0000 + + Update package version number for RC1 release. + +commit 50b6052617081b32ba54b9b56a142578b992b1ac +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit db124786d0587f6cbf932caca3d96287de9cae48 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:26 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 3f576c1ba0d041587d9dd84e50e3f19cb8f4fba8 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:54 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f0f77ad905c8b26584b6a7c7267d2d2afaad17f5 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:37 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 678c95d225917c68e32a6d6614aaf6b316443322 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit f706dac42faa46f369523a9130f3bc1d83686795 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 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 6ef16cf6992a500ad7214dd9147479aa77a19454 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:21 2005 +0000 + + Make the module dir configurable + +commit 5ae736718a172d3a9d464d5190ba607a1de4b8da +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:58 2005 +0000 + + Update all input drivers to pass distcheck + +commit f910c47f757944b0c5904f245f943301eb716a7c +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 589438d80cdf6de5e91bd93b5e1499c8f89ed4e1 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:58 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 3b95f5ab9aca05a13d1062ab42d5771b9b088fd1 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sun Jul 3 08:53:44 2005 +0000 + + Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". + +commit c75acfc7e0a7294839fe0e7960f1769e80d139b3 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Fri Jul 1 22:43:22 2005 +0000 + + Change all misc.h and os.h references to <X11/foo.h>. + +commit 2ed45230d3c2f00356ad9dc20bcc368c32ed1738 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:00 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 4eb604aee09c4009c26011de4f79f471795f4983 +Author: Adam Jackson <ajax@nwnk.net> +Date: Wed Sep 22 04:38:03 2004 +0000 + + Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones. + +commit 4b285dc4884e3717678f15467b4af30ed81bc0a6 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 517ff4d31ac900a782a205771872a556bdc882a6 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 6783ec2448a12a502fe3ff44c49fe3071eadabc3 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:30 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ba766c19ecfde3af4c97ef3a827180bf797023df +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 4c67b5403cdecdb4f515643c64f43877ce12f940 +Author: Egbert Eich <eich@suse.de> +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 be23cfeae88e85ac20934ee5a46bee9282b413a9 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:28:47 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 65fb6299c299cc85cec45105910f0952a339bc8d +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 913a596e57ca476d7cb721ba3b471a6a5b593781 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/config.h.in new/xf86-input-citron-2.2.1/config.h.in --- old/xf86-input-citron-X11R7.1-2.2.0/config.h.in 2006-05-23 05:13:38.000000000 +0200 +++ new/xf86-input-citron-2.2.1/config.h.in 2007-09-09 17:06:32.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/configure.ac new/xf86-input-citron-2.2.1/configure.ac --- old/xf86-input-citron-X11R7.1-2.2.0/configure.ac 2006-04-07 18:56:47.000000000 +0200 +++ new/xf86-input-citron-2.2.1/configure.ac 2007-09-09 17:01:45.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-citron], - 2.2.0, + 2.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-citron) @@ -72,7 +72,7 @@ # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) +XORG_DRIVER_CHECK_EXT(XINPUT, [inputproto >= 1.4.1]) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/Makefile.am new/xf86-input-citron-2.2.1/Makefile.am --- old/xf86-input-citron-X11R7.1-2.2.0/Makefile.am 2005-07-12 08:15:08.000000000 +0200 +++ new/xf86-input-citron-2.2.1/Makefile.am 2007-09-09 17:06:05.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/man/citron.man new/xf86-input-citron-2.2.1/man/citron.man --- old/xf86-input-citron-X11R7.1-2.2.0/man/citron.man 2006-03-01 23:03:04.000000000 +0100 +++ new/xf86-input-citron-2.2.1/man/citron.man 2007-09-09 16:57:53.000000000 +0200 @@ -1,8 +1,8 @@ .\" Copyright (c) 2000-2003 Peter Kunzmann <support@citron.de> -.\" $Id: citron.man,v 1.4 2005/12/19 09:07:49 alanc Exp $ +.\" $Id$ .\" .\" $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ -.\" $XdotOrg: driver/xf86-input-citron/man/citron.man,v 1.5 2006/03/01 22:03:04 daniels Exp $ +.\" $XdotOrg: driver/xf86-input-citron/man/citron.man,v 1.4 2005/12/19 09:07:49 alanc Exp $ .\" .\" shorthand for double quote that works everywhere. .ds q \N'34' @@ -903,6 +903,6 @@ "60" .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__). .SH "AUTHORS" 2000\-2005 \- written by Citron GmbH (support@citron.de) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/man/Makefile.am new/xf86-input-citron-2.2.1/man/Makefile.am --- old/xf86-input-citron-X11R7.1-2.2.0/man/Makefile.am 2005-12-06 23:48:28.000000000 +0100 +++ new/xf86-input-citron-2.2.1/man/Makefile.am 2007-09-09 16:57:53.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:05 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/missing new/xf86-input-citron-2.2.1/missing --- old/xf86-input-citron-X11R7.1-2.2.0/missing 2006-05-23 05:13:41.000000000 +0200 +++ new/xf86-input-citron-2.2.1/missing 2007-09-09 16:59:06.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/src/citron.c new/xf86-input-citron-2.2.1/src/citron.c --- old/xf86-input-citron-X11R7.1-2.2.0/src/citron.c 2006-04-07 18:56:48.000000000 +0200 +++ new/xf86-input-citron-2.2.1/src/citron.c 2007-09-09 17:13:00.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: citron.c,v 1.7 2005/07/11 02:37:58 ajax Exp $ +/* $Id$ * Copyright (c) 1998 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a @@ -138,12 +138,12 @@ #define INITT 0 /* Initialisation of touch in first loop */ -#define CITOUCH_VERSION 0x220 char version[]="Touch Driver V2.2.0 (c) 1999-2006 Citron GmbH"; -#define CITOUCH_VERSION_MAJOR ((CITOUCH_VERSION >> 8) & 0xf) -#define CITOUCH_VERSION_MINOR ((CITOUCH_VERSION >> 4) & 0xf) -#define CITOUCH_VERSION_PATCH ((CITOUCH_VERSION >> 0) & 0xf) +#define CITOUCH_VERSION PACKAGE_VERSION +#define CITOUCH_VERSION_MAJOR PACKAGE_VERSION_MAJOR +#define CITOUCH_VERSION_MINOR PACKAGE_VERSION_MINOR +#define CITOUCH_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL /***************************************************************************** @@ -2020,7 +2020,7 @@ static int ControlProc (LocalDevicePtr local, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; cit_PrivatePtr priv = (cit_PrivatePtr) (local->private); DBG(5, ErrorF("%sControlProc called\n", CI_INFO)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-X11R7.1-2.2.0/src/citron.h new/xf86-input-citron-2.2.1/src/citron.h --- old/xf86-input-citron-X11R7.1-2.2.0/src/citron.h 2006-03-01 23:03:04.000000000 +0100 +++ new/xf86-input-citron-2.2.1/src/citron.h 2007-09-09 16:57:53.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: citron.h,v 1.3 2005/07/01 22:43:22 daniels Exp $ +/* $Id$ * Copyright (c) 1998 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a ++++++ xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2 -> xf86-input-dynapro-1.1.1.tar.bz2 ++++++ ++++ 21090 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/ChangeLog new/xf86-input-dynapro-1.1.1/ChangeLog --- old/xf86-input-dynapro-X11R7.1-1.1.0/ChangeLog 2006-04-07 19:16:44.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/ChangeLog 2007-09-10 18:29:00.000000000 +0200 @@ -1,45 +1,239 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 17ae2bf9557e025f0e7d0d5f3afd1a89bcde9add +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:28:20 2007 +0200 - * configure.ac: - * src/xf86Dyna.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Bumped version to 1.1.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c0353c29e28629cca89328980ac0306b2db5e95b +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:27:32 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Added man/dynapro.? to .gitignore. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 264d4e1509dc446c1d16c4906b5db1ababe36981 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:25:40 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Generate ChangeLog from git. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2d11aff614b841afe0ec27162c5ed4fbe321878d +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:05 2007 -0400 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6e6d5d69cacafd05702aadf21605dd5c6d6410fd +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:24 2007 -0400 - * configure.ac: - Update package version number for X11R7 RC3 release. + Rename .cvsignore to .gitignore -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cdfc90bcdc9760c6cc858f738343aada8d93b8c1 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:00:55 2007 +0300 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Convert from TSCalibrationCtl to AbsCalibCtl -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit 766ed72d88d4fd09b942deede1421537dc0bd44a +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 22:29:40 2007 +0200 - * configure.ac: - Only build dlloader modules by default. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 806acb7a47923534ffafb898b77ee75d1a2d9707 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:16:44 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cec77bdc5d80e1294b8e22f3541b947f6b1a8aae +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Update package version for X11R7 release. + +commit 20e849b949a63a63f1e39b7db6a7f5edc52537ec +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:50 2005 +0000 + + Stub COPYING files + +commit ca6ca16aaa911440064d7f8e91578b84ccf6a56c +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:13 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 07446f0ed181a16995d2a351edb5aa1cda9fee98 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:28 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 53652cde0812985b7d40df7a48b1c8947b4ca5ed +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:30 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 498787a47d8f6605bfaf9c87de78bdb19145cb5e +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit ef679346f2a8bf63cc18282555150e88e3db3ac7 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:54 2005 +0000 + + Only build dlloader modules by default. + +commit ec9024586123e60b63307b38ab0d37a95fbc6f1e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:06 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 8478e70602ad7b50b93f99c0e025ff3864faff2e +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:02 2005 +0000 + + Add .cvsignores for drivers. + +commit c1fe43339292f6c9b9b3d7d14a7e15df5914d917 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:11 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit a08b56a1d033c2e1757aaaece7056498e25884ff +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:49 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 103dd9ab4f22b29015e8f49a21e664174e031756 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:47:59 2005 +0000 + + Update package version number for RC1 release. + +commit 1ab73dcbf364e5fea8a24c3712093c44c63b8077 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit 2f5780587ff66bec6a823e8b763e9dbe72cda390 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:27 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit 423e0c66e8772de03716f97ae246e5479517872d +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:55 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 0ad380f55c7b028e7b10b287485555cda4ed0af2 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:38 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit b037733baafff7bb9a801f630f75cc1ab85d12ea +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 0321f64bdc67e48c38e93afdc23620a0b1f3f024 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 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 34277d454d02cd216a8ba11b5a4289ba0711305e +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:21 2005 +0000 + + Make the module dir configurable + +commit 2c17a50da1705e0156ee90438ca42f34ecb185a7 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:58 2005 +0000 + + Update all input drivers to pass distcheck + +commit 2864517ccdbd05f901f1b2e686c006c07a2a0485 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 891ee2c118748fc351c3e597abd2d8490e00130e +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:59 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 8a059473c58d974f6fdcf19d15988b08ebfe59f5 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:01 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 28eb77d136d2c43d655fe8ad8a77665381bd97c5 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 43b7590380650bc97ccb198fdf95acd6c5b51cfe +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit aa890304e71ad6685869b2b680c81d4f9ddb3191 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:33 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 9429c8bf9971f2d48966fd95e0e5341047e1c9ab +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit af618d91797e6e82750219f283bcceb9d7542192 +Author: Egbert Eich <eich@suse.de> +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 71e94f4fc7dd9e6ca43d502ea6b4e8ed36c15d30 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 1fc94a326113bb789b383c8d052add7de66fb923 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/config.h.in new/xf86-input-dynapro-1.1.1/config.h.in --- old/xf86-input-dynapro-X11R7.1-1.1.0/config.h.in 2006-05-23 05:15:29.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/config.h.in 2007-09-10 18:29:00.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/configure.ac new/xf86-input-dynapro-1.1.1/configure.ac --- old/xf86-input-dynapro-X11R7.1-1.1.0/configure.ac 2006-04-07 19:16:44.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/configure.ac 2007-09-10 18:28:08.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-dynapro], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-dynapro) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/Makefile.am new/xf86-input-dynapro-1.1.1/Makefile.am --- old/xf86-input-dynapro-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:08.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/Makefile.am 2007-09-10 18:24:53.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-dynapro-1.1.1/man/Makefile.am --- old/xf86-input-dynapro-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:28.000000000 +0100 +++ new/xf86-input-dynapro-1.1.1/man/Makefile.am 2007-09-09 17:22:43.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:06 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/missing new/xf86-input-dynapro-1.1.1/missing --- old/xf86-input-dynapro-X11R7.1-1.1.0/missing 2006-05-23 05:15:32.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/missing 2007-09-10 18:26:03.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-dynapro-X11R7.1-1.1.0/src/xf86Dyna.c new/xf86-input-dynapro-1.1.1/src/xf86Dyna.c --- old/xf86-input-dynapro-X11R7.1-1.1.0/src/xf86Dyna.c 2006-04-07 19:16:44.000000000 +0200 +++ new/xf86-input-dynapro-1.1.1/src/xf86Dyna.c 2007-09-09 17:22:43.000000000 +0200 @@ -66,7 +66,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -459,7 +459,7 @@ static int ControlProc (InputInfoPtr pInfo, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; DynaproPrivatePtr priv = (DynaproPrivatePtr) (pInfo->private); priv->min_x = c->min_x; ++++++ xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2 -> xf86-input-elo2300-1.1.1.tar.bz2 ++++++ ++++ 21109 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/ChangeLog new/xf86-input-elo2300-1.1.1/ChangeLog --- old/xf86-input-elo2300-X11R7.1-1.1.0/ChangeLog 2006-04-07 19:18:35.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/ChangeLog 2007-09-10 18:39:57.000000000 +0200 @@ -1,45 +1,247 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit b243a4a8eaadbd7d5115e0a14c494c242b79da80 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:38:03 2007 +0200 - * configure.ac: - * src/elo.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Bumped version to 1.1.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 07f187d8c882a853491e5810df9015d4a34ab5b4 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:37:32 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Generate ChangeLog from git. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7ce7f2cbe022222a73248a318e75d9c42ca8a5a7 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:06 2007 -0400 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c75cc4de22637732dac647f4cba852af376e09d3 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:24 2007 -0400 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Rename .cvsignore to .gitignore -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 46c3fa9d4f62b6dae97ff598efc3a3a90f470501 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 00:59:15 2007 +0300 - * configure.ac: - Update package version number for X11R7 RC3 release. + Convert from TSCalibrationCtl to AbsCalibCtl -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0b7b6b4f17e9e258f546fbe3eb901fea16a4a62c +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 00:58:54 2007 +0300 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Remove useless debugging statement -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit c80b29b22a6b30846fd43c6f3e43e70639071c3e +Author: Brice Goglin <bgoglin@debian.org> +Date: Mon Aug 6 22:34:31 2007 +0200 - * configure.ac: - Only build dlloader modules by default. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d99906117a5718a87959187a8d9d925fab87d4da +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:18:35 2006 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0d6876589f98d6ec2272af1bd6e574e0a1984ec2 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:56 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Update package version for X11R7 release. + +commit bb7d4253fb69cf03a491b3978f59e8be0936f56a +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:50 2005 +0000 + + Stub COPYING files + +commit 11b037940716176c23afb95eace5e8b58df19a9b +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:14 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 4d5354cda99932fb60546dc3fd404c1ae7672d23 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:28 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 445aec41ad0849891526572b0a0959e4f35119cf +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:30 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 5cd4e2dc7450c9e15339c89f0eedf850b7e1125f +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:04 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 28f25db6de8e0370e3d3b7c82874b1fc662786f3 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:55 2005 +0000 + + Only build dlloader modules by default. + +commit 7bd96934500c6e5d95a47db942717a8f7b355ba4 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Nov 28 22:04:06 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 f7ed9d21fff320201bffec8d82b687e9a0dd4967 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:03 2005 +0000 + + Add .cvsignores for drivers. + +commit 9d44ea55e33d0fb5a5fe286877bafb780b420e0b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:11 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit bc7252de45ecf18a4f2e5f8724d85da038e2775c +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:49 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 01f585199be704deed405722ceb104f455c23bf4 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:00 2005 +0000 + + Update package version number for RC1 release. + +commit e8758d4c0ac66e7e7f3a9cfdf48cd4cead569004 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Oct 18 15:46:36 2005 +0000 + + Do the following to make the drivers pass distcheck: + - Only define EXTRA_DIST when there are actually man pages to be processed + - Add missing man pages to keyboard and ati drivers EXTRA_DIST + +commit 81427fa6f0300cfcd5f6c08036e3abd8ce9dc98c +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:50 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit 3daac7af59740fe39dc6956a13cf024f0cf6734d +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:27 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit c7fc74e044cde765bd17285e839e5c592d9b34b7 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:55 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit f9b8b11457ec43140790f8f8921b7c0ab197d1b5 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:38 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 17b08a86ff73fa1e466889450fd50518733356bb +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:22 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 895141c36d4cda1cd991da28bd116f9ce6a1a086 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:40 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 2295b83544576cae9da43304aff5e5be71195ea3 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:21 2005 +0000 + + Make the module dir configurable + +commit c1a824048051fc5e826ce96a555b706a1e4a015c +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:20:59 2005 +0000 + + Update all input drivers to pass distcheck + +commit b230244cdf99e2f7b06efd8ffd1651dbd12dc248 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:08 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 6d29f6326c7d84e91fd8f098e5cf824e7a1b4b99 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:37:59 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit dbfc977f2bce5b7443fbac37c60e93901e8d2b15 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:01 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit aa2adeb9bf82cbff5c160eb347e429860c370361 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit aa36c590fefa3695b7311648aa8490407da1573c +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:33:51 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit c4326a81952c6328da61cd8ce625d1a1e6169f84 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:33 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 92a56ab2cc652f41d73b9c9e23dedb79a31afd01 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit fbd3d8bddebbf82e2085aa0be3474502f21f8b13 +Author: Egbert Eich <eich@suse.de> +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 d4e069f987bc046c06830370cee997d1a18041a2 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit d1b8d291ae597ccb4822bf464c60e6cf2b59dca7 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/config.h.in new/xf86-input-elo2300-1.1.1/config.h.in --- old/xf86-input-elo2300-X11R7.1-1.1.0/config.h.in 2006-05-23 05:16:08.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/config.h.in 2007-09-10 18:38:21.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/configure.ac new/xf86-input-elo2300-1.1.1/configure.ac --- old/xf86-input-elo2300-X11R7.1-1.1.0/configure.ac 2006-04-07 19:18:35.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/configure.ac 2007-09-10 18:37:53.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-elo2300], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-elo2300) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/Makefile.am new/xf86-input-elo2300-1.1.1/Makefile.am --- old/xf86-input-elo2300-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:08.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/Makefile.am 2007-09-10 18:36:59.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-elo2300-1.1.1/man/Makefile.am --- old/xf86-input-elo2300-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:28.000000000 +0100 +++ new/xf86-input-elo2300-1.1.1/man/Makefile.am 2007-09-09 17:26:42.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:06 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/missing new/xf86-input-elo2300-1.1.1/missing --- old/xf86-input-elo2300-X11R7.1-1.1.0/missing 2006-05-23 05:16:10.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/missing 2007-09-10 18:38:22.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-elo2300-X11R7.1-1.1.0/src/elo.c new/xf86-input-elo2300-1.1.1/src/elo.c --- old/xf86-input-elo2300-X11R7.1-1.1.0/src/elo.c 2006-04-07 19:18:35.000000000 +0200 +++ new/xf86-input-elo2300-1.1.1/src/elo.c 2007-09-09 17:26:42.000000000 +0200 @@ -87,7 +87,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -183,8 +183,6 @@ priv->buffer = XisbNew (local->fd, 200); priv->button_down = FALSE; - DBG (9, XisbTrace (priv->buffer, 1)); - EloNewPacket (priv); if (QueryHardware (priv, errmaj, errmin) != Success) { @@ -457,7 +455,7 @@ ControlProc( LocalDevicePtr local, xDeviceCtl * control ) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; EloPrivatePtr priv = (EloPrivatePtr) (local->private); priv->min_x = c->min_x; ++++++ xf86-input-magellan-X11R7.1-1.1.0.tar.bz2 -> xf86-input-magellan-1.1.1.tar.bz2 ++++++ ++++ 21093 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/ChangeLog new/xf86-input-magellan-1.1.1/ChangeLog --- old/xf86-input-magellan-X11R7.1-1.1.0/ChangeLog 2006-04-07 19:49:43.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/ChangeLog 2007-09-10 18:48:34.000000000 +0200 @@ -1,45 +1,241 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit bcee9eea6f6dfd53c604c2caa45048fb9fe2dc1e +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:48:01 2007 +0200 - * configure.ac: - * src/magellan.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Bumped version to 1.1.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 36b02c9b69b6ae2fc126936a03293f937256bbf9 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:47:21 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Generate ChangeLog from git. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 854e74a9010202eb1a435fae80019c02041468d5 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:12 2007 -0400 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1fb884c596d79972ff2b340d1061c94cde6c6769 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:29 2007 -0400 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Rename .cvsignore to .gitignore -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0cb6f76c93e19371c681fb4a3c7f698c1b098d39 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:08:08 2007 +0300 - * configure.ac: - Update package version number for X11R7 RC3 release. + Remove useless debugging statement -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit bcd2a71ee0e861614cc7db18cd6b2cfc0b5bc6b5 +Author: Brice Goglin <bgoglin@debian.org> +Date: Tue Aug 7 09:15:49 2007 +0200 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit c3c95d2ada507b01f067fb2558f820dd697eea61 +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:49:43 2006 +0000 - * configure.ac: - Only build dlloader modules by default. + bcwrap. Bump server version requirement. Bump to 1.1.0. -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cf4c58c56000797f7e50c17de2b2e41232efdb61 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:57 2005 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Update package version for X11R7 release. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 576bd77324a725b815b4cf4533435227e9f95882 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:51 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Stub COPYING files + +commit b2bcc47596a01a3b1105d77bf3e0fbff28822145 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:15 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 3386debf879f50462c437a6df184e883e429f1ad +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:30 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 88613dd1dac61a880b1a43ebf090f6d259c0b91c +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:31 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 36668f804fbd134b86ba6a8ae8a419be681a1c47 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:05 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit ef39ff9cb640e061f2c28240130792e26e09d655 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:56 2005 +0000 + + Only build dlloader modules by default. + +commit e44ef9c8a48689781b6bef79b9ce1cdbe0777eff +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 bf05a444f9ab0f4d353b8e3f0d8de862565a5556 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:05 2005 +0000 + + Add .cvsignores for drivers. + +commit b79e5ce704a56e9959ecff20cb15a6ccb69a0a27 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:12 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 6a30673621d61657e2880daa4c31a21b77e904d3 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:50 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit a06ec440098f327c7c1d63833aebc5ccf0870d13 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:00 2005 +0000 + + Update package version number for RC1 release. + +commit 76e2714697f072c5b9bd028e737c15a7fa5f4230 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Oct 18 15:46:37 2005 +0000 + + Do the following to make the drivers pass distcheck: + - Only define EXTRA_DIST when there are actually man pages to be processed + - Add missing man pages to keyboard and ati drivers EXTRA_DIST + +commit bf6410bd872d18169d4e4dceaa8119bfbeca4cd7 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Oct 18 00:01:51 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro + substitutions to work better with BSD make + +commit 8b44006376ec609428b969bda5e783a4ed911d03 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:28 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit e34f6a2b686be59c5831cff78488a9d1235ace9d +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:58 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 7c4290c3192e8b69e7b72d33f1284a9402486e26 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:39 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 4184e19b0336d1a442d86abb6332a359c5f6cb8f +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:23 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 5b7ddbb0619dc35c3dd759ca2d5dcc32e4659363 +Author: Kevin E Martin <kem@kem.org> +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 e9bd08c50720bae7f3314701181516bb7353774d +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:22 2005 +0000 + + Make the module dir configurable + +commit 16f90eb43864138446d5748e59cea36db500af98 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:21:00 2005 +0000 + + Update all input drivers to pass distcheck + +commit 03ca0405c6c4e9c8fbe0d4057d24e5378c2b163c +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:09 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 4ff4c13342fb496ac5ca51bc0814fd27d2df1961 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:38:00 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 0a9608b4e3be39f60630dc84b712f6bc5e67b592 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:02 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit c5c5a625b10ecebde38d73fabdebfb40b02b6c50 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:03 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 1034ff3c2b725bf1fdee087171616560558b7dee +Author: Egbert Eich <eich@suse.de> +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 d17622daa7d2905dd417df6cdbdf8db55af50e35 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:12:33 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 881cc800bfd1e3fbb5680c9f03b295b95e8656c4 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 09cc6101badb509de39d0dd5e530902fd2241260 +Author: Egbert Eich <eich@suse.de> +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 fd5f31531c0205a718cb7565b639aafe1116070b +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit 0010c7d5bf893f18f6bae52b58229a5ae1557a9b +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/config.h.in new/xf86-input-magellan-1.1.1/config.h.in --- old/xf86-input-magellan-X11R7.1-1.1.0/config.h.in 2006-05-23 05:20:34.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/config.h.in 2007-09-10 18:48:22.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/configure.ac new/xf86-input-magellan-1.1.1/configure.ac --- old/xf86-input-magellan-X11R7.1-1.1.0/configure.ac 2006-04-07 19:49:43.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/configure.ac 2007-09-10 18:47:48.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-magellan], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-magellan) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/Makefile.am new/xf86-input-magellan-1.1.1/Makefile.am --- old/xf86-input-magellan-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:09.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/Makefile.am 2007-09-10 18:47:02.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-magellan-1.1.1/man/Makefile.am --- old/xf86-input-magellan-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:30.000000000 +0100 +++ new/xf86-input-magellan-1.1.1/man/Makefile.am 2007-09-09 17:28:15.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:07 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/missing new/xf86-input-magellan-1.1.1/missing --- old/xf86-input-magellan-X11R7.1-1.1.0/missing 2006-05-23 05:20:36.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/missing 2007-09-10 18:48:23.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-magellan-X11R7.1-1.1.0/src/magellan.c new/xf86-input-magellan-1.1.1/src/magellan.c --- old/xf86-input-magellan-X11R7.1-1.1.0/src/magellan.c 2006-04-07 19:49:43.000000000 +0200 +++ new/xf86-input-magellan-1.1.1/src/magellan.c 2007-09-09 17:28:15.000000000 +0200 @@ -84,7 +84,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -249,7 +249,6 @@ } priv->buffer = XisbNew (pInfo->fd, 200); - DBG (9, XisbTrace (priv->buffer, 1)); /* * Verify the hardware is attached and functional ++++++ xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2 -> xf86-input-microtouch-1.1.1.tar.bz2 ++++++ ++++ 21105 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/ChangeLog new/xf86-input-microtouch-1.1.1/ChangeLog --- old/xf86-input-microtouch-X11R7.1-1.1.0/ChangeLog 2006-04-07 19:56:05.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/ChangeLog 2007-09-10 18:57:25.000000000 +0200 @@ -1,45 +1,245 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit e637accb60b5ad8d927529775abbae79aebf5313 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:56:49 2007 +0200 - * configure.ac: - * src/microtouch.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Bumped version to 1.1.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fdbeee41879b4b0af5908c944ba3c7d02a1bdde4 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:56:30 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Added man/microtouch.? to .gitignore. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit af1c432abdbb12b0888b68cdd64da9a016ba174a +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 18:55:53 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Generate ChangeLog from git. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 53ab4513190e5b1ddb8dd0dc25d187cce15b545e +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:17 2007 -0400 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1bbb12ba2dfaef10a90eff9750e3faf97ccd44f3 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:33 2007 -0400 - * configure.ac: - Update package version number for X11R7 RC3 release. + Rename .cvsignore to .gitignore -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit f5ab3489df04fc779eb02d578fe4d5ce89a31cf1 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:08:57 2007 +0300 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Convert from TSCalibrationCtl to AbsCalibCtl -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit 4717885202727d16bf9f8712ac4c8bbcab5315df +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:08:33 2007 +0300 - * configure.ac: - Only build dlloader modules by default. + Remove useless debugging statement -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3cafcdec160434abb31bac16673c23b411a15a63 +Author: Brice Goglin <bgoglin@debian.org> +Date: Tue Aug 7 09:18:14 2007 +0200 - * configure.ac: - Update package version number for X11R7 RC2 release. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 9fc3589deb973b70fc7e9513e9a31f9e199ac45a +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 17:56:05 2006 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + +commit cf37b232d6d4ec6e4d9c21a146a8039b66385e8d +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:57 2005 +0000 + + Update package version for X11R7 release. + +commit 237e9e3a31b0afda993b80f0e868436544c44004 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:51 2005 +0000 + + Stub COPYING files + +commit 896541f04611b5e46047769dd008ee39c2fba413 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:15 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 1f33cb32d49e21b9591625674e11dcfd029bb4bf +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:31 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit e9bee2728441a693b8ce89d172d0ac1cf38022ed +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:31 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 7436b6ed988a8a456f5f3ff36b01e10d82f1e45c +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:06 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 3918da11973aa1f57899cdd486e1aab2fd612f06 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:56 2005 +0000 + + Only build dlloader modules by default. + +commit 7a7149c617fb08795b473ec187fd4502bf117184 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 ca33288b1f8d2cb5efb099087ff11cb91759eab3 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:06 2005 +0000 + + Add .cvsignores for drivers. + +commit b2aa9470ce74c64f7d9272fce0965cf2974a0168 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:12 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 4d8b5de5543ece0fa1d9d9dfd66225ada1ae00a0 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:50 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 143e26fdd44231ec600da41ae622b9075424951b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:01 2005 +0000 + + Update package version number for RC1 release. + +commit e743ddc911fd59b48cb279f6c8b16502b4cb4b7a +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 74fcf3718f1dcb2692e0c843b91ea5ba271d421c +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Oct 17 22:57:29 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead + of indirectly + +commit d3ad1193e99600ebfe39cf955bfbbecd3c5e067d +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:08:59 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 807bb7ed3d0fa5a77c66200f564d75e2e9e0b321 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:40 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 1ba3e944e6538015b96050efc1ade7a234f319fd +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Aug 10 14:07:23 2005 +0000 + + Don\'t lose existing CFLAGS in all the input drivers and some of the video + drivers + +commit 0f9543756b9d4d21c2d0cb1c5524f617af880f68 +Author: Kevin E Martin <kem@kem.org> +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 f1c1b44d7fba1a25f7c141154034cbde52b210c4 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:22 2005 +0000 + + Make the module dir configurable + +commit 15b739e9516e41ccb594e011f8e45d4cabb4cbae +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:21:01 2005 +0000 + + Update all input drivers to pass distcheck + +commit 6f79ec79620219117ad0520ccf2f6d3fc4a7d7b9 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:09 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 45775f7085e93e15465ab86540e378331155adef +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:38:00 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit 58570d8456c500100d3ab54e2e0f37650d2681dd +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:02 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit e227d2f84ce400ab515824281c99796aa84b502c +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:03 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 4652a6457efe8d061c9dbd9fbf8c0758b374f2b6 +Author: Egbert Eich <eich@suse.de> +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 12ec7ce7c48907243a086c0d0483e1f3374bf2b7 +Author: Egbert Eich <eich@suse.de> +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 08f8cae52802d63be3f9b098b160421a15716881 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit f7c7cccb0496d2e5019d1344b55c2d1d889cd8a1 +Author: Egbert Eich <eich@suse.de> +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 35ba6ccccbb5b7311c0ae8dbe475acc6ca6350fe +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit f680e23cbef4224c8c3c1b2f36719e7f54d60eee +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/config.h.in new/xf86-input-microtouch-1.1.1/config.h.in --- old/xf86-input-microtouch-X11R7.1-1.1.0/config.h.in 2006-05-23 05:21:51.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/config.h.in 2007-09-10 18:57:13.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/configure.ac new/xf86-input-microtouch-1.1.1/configure.ac --- old/xf86-input-microtouch-X11R7.1-1.1.0/configure.ac 2006-04-07 19:56:05.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/configure.ac 2007-09-10 18:56:41.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-microtouch], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-microtouch) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/Makefile.am new/xf86-input-microtouch-1.1.1/Makefile.am --- old/xf86-input-microtouch-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:09.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/Makefile.am 2007-09-10 18:55:32.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-microtouch-1.1.1/man/Makefile.am --- old/xf86-input-microtouch-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:31.000000000 +0100 +++ new/xf86-input-microtouch-1.1.1/man/Makefile.am 2007-09-09 17:29:33.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:07 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/missing new/xf86-input-microtouch-1.1.1/missing --- old/xf86-input-microtouch-X11R7.1-1.1.0/missing 2006-05-23 05:21:53.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/missing 2007-09-10 18:57:14.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-microtouch-X11R7.1-1.1.0/src/microtouch.c new/xf86-input-microtouch-1.1.1/src/microtouch.c --- old/xf86-input-microtouch-X11R7.1-1.1.0/src/microtouch.c 2006-04-07 19:56:05.000000000 +0200 +++ new/xf86-input-microtouch-1.1.1/src/microtouch.c 2007-09-09 17:29:33.000000000 +0200 @@ -105,7 +105,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -275,8 +275,6 @@ priv->proximity = FALSE; priv->button_down = FALSE; - DBG (9, XisbTrace (priv->buffer, 1)); - MuTNewPacket (priv); if (QueryHardware(local) != Success) { @@ -538,7 +536,7 @@ static int ControlProc (LocalDevicePtr local, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; MuTPrivatePtr priv = (MuTPrivatePtr) (local->private); priv->min_x = c->min_x; ++++++ xf86-input-penmount-1.2.0.tar.bz2 -> xf86-input-penmount-1.2.1.tar.bz2 ++++++ ++++ 19793 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/ChangeLog new/xf86-input-penmount-1.2.1/ChangeLog --- old/xf86-input-penmount-1.2.0/ChangeLog 2006-06-03 11:26:42.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/ChangeLog 2007-09-10 19:06:04.000000000 +0200 @@ -1,54 +1,245 @@ -2006-06-03 Daniel Stone <daniel@freedesktop.org> +commit db7b7d03a7e9136badf994c218cd137b59a376c2 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 19:05:02 2007 +0200 - * configure.ac: - Bump to 1.2.0. + Added man/penmount.? to .gitignore. - * src/xf86PM.c: - * src/xf86PM.h: - Add DMC9000 support (Jaya Kumar). +commit 564d77fc97015fe5ae1dd7baf643524ad32ba19d +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 19:04:08 2007 +0200 -2006-04-06 Adam Jackson <ajax@freedesktop.org> + Bumped version to 1.2.1. - * configure.ac: - * src/xf86PM.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. +commit 45808497336a336ed76450fbe8279f0e6a7d5a4d +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 19:03:30 2007 +0200 -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> + Generate ChangeLog from git. - * configure.ac: - Update package version for X11R7 release. +commit 395e77e359d7d95e57116e70393ddba8d753efcc +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:21 2007 -0400 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + Add *~ to .gitignore to skip patch/emacs droppings - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 4f886668127dad7f561334459cd9723f9af93103 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:36 2007 -0400 -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> + Rename .cvsignore to .gitignore - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit 960f0207a4845b489a1c1ca9823821047722585d +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:09:31 2007 +0300 -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + Convert from TSCalibrationCtl to AbsCalibCtl - * configure.ac: - Update package version number for X11R7 RC3 release. +commit 7810e0bb438525c005f66a9bc5cc0af489fa08a1 +Author: Drew Parsons <dparsons@debian.org> +Date: Thu Jun 14 21:52:28 2007 +1000 -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + Update version using PACKAGE_VERSION_* - * configure.ac: - Remove extraneous AC_MSG_RESULT. +commit 5b785515ddbf7e799a1a32b9957195966a5cd513 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Jun 3 09:35:42 2006 +0000 -2005-11-29 Adam Jackson <ajax@freedesktop.org> + Bug #4495: Add DMC9000 support. (Jaya Kumar). Bump to 1.2.0. - * configure.ac: - Only build dlloader modules by default. +commit f661f8975ff3940d8bff03e4090f235fe18a682e +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 18:06:50 2006 +0000 -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. - * configure.ac: - Update package version number for X11R7 RC2 release. +commit 68ee6b856239014ce271102d63431bedf99f3f4e +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:58 2005 +0000 -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + Update package version for X11R7 release. - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. +commit dff9657264aa0a54452bfdd2391af8336cd1d424 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:51 2005 +0000 + + Stub COPYING files + +commit 5b6dcc48d42c63cf77daf51c7d50f1a47deedf4a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:15 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 84251ccbe8c60a1526ff62290946071df87fd137 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:31 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 1d6b5856c1f4c8aff95feba1670fd689b2e13fe4 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:31 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 94ffe20ab22ea7316eb29b96e9a9d8d0d8e9a1f1 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:06 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit dbec007fe040b83b4e8a9d2ecde42c61fd230de9 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:57 2005 +0000 + + Only build dlloader modules by default. + +commit 2d0449c9e99654dcd52968137bb38c7022efc24e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 <anholt@freebsd.org> +Date: Mon Nov 21 10:49:07 2005 +0000 + + Add .cvsignores for drivers. + +commit cad99fd68ed79009fe4f17b09c0f8bbd5c152a0b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:13 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 7d8b7d1f3c8ff4c9a9b36e20da8b5cdb4ba49066 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:51 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit be3d4203d254b2778b0f5c12fb08e4943b93198a +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:01 2005 +0000 + + Update package version number for RC1 release. + +commit fe5c2db4f8a4cc83403d64e290bb3c6dda77ea1f +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 <ajax@nwnk.net> +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 <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:09:00 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit b2285b3290f68584044c8b475d358916051c783a +Author: Daniel Stone <daniel@fooishbar.org> +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 <sandmann@daimi.au.dk> +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 <kem@kem.org> +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 <kem@kem.org> +Date: Wed Jul 13 20:03:23 2005 +0000 + + Make the module dir configurable + +commit 69ea32f73ddd3304679e2275fce17a0de3ee9e17 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:21:02 2005 +0000 + + Update all input drivers to pass distcheck + +commit db7a0e403e949fff010941a0bb71737ae4e1f3ac +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:09 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 39bd1d974266114c2110c8fd14a8e98cb40862c6 +Author: Adam Jackson <ajax@nwnk.net> +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 <ajax@nwnk.net> +Date: Sat Jun 25 21:17:02 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 2e05fc0dce5ddbbabaac4795152d2296a1167941 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:05 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e6ad5c52b96444c15f499a6c119d55ba0b779efc +Author: Egbert Eich <eich@suse.de> +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 <eich@suse.de> +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 <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 0ab885c5a0cce8734fd1343eef892c2d3b1f4c74 +Author: Egbert Eich <eich@suse.de> +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 <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit dfee8a2321bf8c77a14ffbc4a74e11dff7fdb54c +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/config.h.in new/xf86-input-penmount-1.2.1/config.h.in --- old/xf86-input-penmount-1.2.0/config.h.in 2006-06-03 11:27:05.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/config.h.in 2007-09-10 19:04:26.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/configure.ac new/xf86-input-penmount-1.2.1/configure.ac --- old/xf86-input-penmount-1.2.0/configure.ac 2006-06-03 11:25:57.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/configure.ac 2007-09-10 19:03:56.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/Makefile.am new/xf86-input-penmount-1.2.1/Makefile.am --- old/xf86-input-penmount-1.2.0/Makefile.am 2005-07-12 08:15:09.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/Makefile.am 2007-09-10 19:03:14.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/man/Makefile.am new/xf86-input-penmount-1.2.1/man/Makefile.am --- old/xf86-input-penmount-1.2.0/man/Makefile.am 2005-12-06 23:48:31.000000000 +0100 +++ new/xf86-input-penmount-1.2.1/man/Makefile.am 2007-09-09 17:30:56.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.7 2005/12/06 22:48:31 kem Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/missing new/xf86-input-penmount-1.2.1/missing --- old/xf86-input-penmount-1.2.0/missing 2006-06-03 11:27:07.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/missing 2007-09-10 19:04:26.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-penmount-1.2.0/src/xf86PM.c new/xf86-input-penmount-1.2.1/src/xf86PM.c --- old/xf86-input-penmount-1.2.0/src/xf86PM.c 2006-06-03 11:25:45.000000000 +0200 +++ new/xf86-input-penmount-1.2.1/src/xf86PM.c 2007-09-09 17:30:56.000000000 +0200 @@ -73,7 +73,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -751,7 +751,7 @@ 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; ++++++ xf86-input-spaceorb-X11R7.1-1.1.0.tar.bz2 -> xf86-input-spaceorb-1.1.1.tar.bz2 ++++++ ++++ 21093 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/ChangeLog new/xf86-input-spaceorb-1.1.1/ChangeLog --- old/xf86-input-spaceorb-X11R7.1-1.1.0/ChangeLog 2006-04-07 20:07:53.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/ChangeLog 2007-09-10 19:12:33.000000000 +0200 @@ -1,45 +1,241 @@ -2006-04-06 Adam Jackson <ajax@freedesktop.org> +commit 93fd49758565321036891543bbbdea74e759a393 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 19:12:04 2007 +0200 - * configure.ac: - * src/spaceorb.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + Bumped version to 1.1.1. -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3050a5436baffa108f7ff598aed59bbcd60816be +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Mon Sep 10 19:11:37 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Generate ChangeLog from git. -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 92df1dc6af4fea8094dab07651058a86b6fd51e0 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:22 2007 -0400 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add *~ to .gitignore to skip patch/emacs droppings -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2bf3c8cadbec255b856d77cf1c05935a47d4c701 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:25:39 2007 -0400 - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Rename .cvsignore to .gitignore -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 56511dca3f7fcf174ff44425533d888dfb37cd76 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Aug 8 01:09:58 2007 +0300 - * configure.ac: - Update package version number for X11R7 RC3 release. + Remove useless debugging statement -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 45d04b90e0d1d944e6ed73702adcc0bc99957814 +Author: Brice Goglin <bgoglin@debian.org> +Date: Tue Aug 7 09:42:50 2007 +0200 - * configure.ac: - Remove extraneous AC_MSG_RESULT. + Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec -2005-11-29 Adam Jackson <ajax@freedesktop.org> +commit de867ddea246854fb4876eae66cf449ac2e71aeb +Author: Adam Jackson <ajax@nwnk.net> +Date: Fri Apr 7 18:07:53 2006 +0000 - * configure.ac: - Only build dlloader modules by default. + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 13ffd0da40c667a80162f480450968bb624d3d2d +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:29:58 2005 +0000 - * configure.ac: - Update package version number for X11R7 RC2 release. + Update package version for X11R7 release. -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b8d93a5f5201c1c7bf9546563f24f668fe21e13c +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:25:52 2005 +0000 - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. + Stub COPYING files + +commit cc09c38ab9bf1c974ee167712e11942280171da6 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:15 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit d3a4698cbf162616c0c0e8618588ca6990b2d77e +Author: Kevin E Martin <kem@kem.org> +Date: Tue Dec 6 22:48:32 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 977400dfa3a0f284b46218bcf3bbf7df6e47141c +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:32 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 7e4a9b025d53425af52480e1690196901828eaef +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 2 02:16:06 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit 0b2f03eb65dc58bab7874ba40dad72ca40571587 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Nov 29 23:29:57 2005 +0000 + + Only build dlloader modules by default. + +commit 40dfecb159573ab8db81f7f5fba17e4daa6f349e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 38f122e753ad5dc5ed4ee60c0c52e636bccd5d37 +Author: Eric Anholt <anholt@freebsd.org> +Date: Mon Nov 21 10:49:08 2005 +0000 + + Add .cvsignores for drivers. + +commit 39057ed8052950eb24dd8d9f9f7c1ebd2668b420 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Nov 9 21:15:13 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 3983242ff9e6520d7613a612c51271d0b02db0ba +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 1 15:08:51 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit f0c66e718d669fd1692b1f5ac6fb88d38a8e55aa +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:01 2005 +0000 + + Update package version number for RC1 release. + +commit 1885f8248d51c754c9b9da4076335a97ca3d9530 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Oct 18 15:46:37 2005 +0000 + + Do the following to make the drivers pass distcheck: + - Only define EXTRA_DIST when there are actually man pages to be processed + - Add missing man pages to keyboard and ati drivers EXTRA_DIST + +commit 788926a3e5d1ad346356aea1c830a2b24dac2b77 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +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 4394c8dd003e12ef5dc436c31897ce19f441bd86 +Author: Adam Jackson <ajax@nwnk.net> +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 8f1cd3d90b7c8074e5abc60f294363478fbb74db +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Mon Oct 17 00:09:00 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 0d7b700156400defc904ba9678080d37e94b66bd +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Aug 18 09:03:45 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 4a8086d6e1a334087e9809cdeff93ed61f40e878 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +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 f07093beb344e92ad560db6a34c69e0a05566110 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:42 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 db6005a51ff2d71d1ac317bdf4acb9e07cd1c087 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 20:03:23 2005 +0000 + + Make the module dir configurable + +commit 0a57f004ac08227599eff1aaa5ed26a7b342d385 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Jul 13 02:21:03 2005 +0000 + + Update all input drivers to pass distcheck + +commit 4555a073c2558bfcc02f922883434b73570c4258 +Author: Adam Jackson <ajax@nwnk.net> +Date: Tue Jul 12 06:15:10 2005 +0000 + + Build skeletons for input drivers. Should basically work. + +commit 4b9925b88dcd78aa2f2a8a23708e7f7b45638783 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Jul 11 02:38:00 2005 +0000 + + Prep input drivers for modularizing by adding guarded #include "config.h" + +commit e3cf13f68e5ff565a5108925f0319ad84790ba21 +Author: Adam Jackson <ajax@nwnk.net> +Date: Sat Jun 25 21:17:03 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit b22890df06610e3d3deeb1521c13b325497149e2 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 19:54:05 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 587d74c8a8bb70f9c2f4286fab84633c6baa7958 +Author: Egbert Eich <eich@suse.de> +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 b5e90b66e909d390056fd8554fe7477665d4fc58 +Author: Egbert Eich <eich@suse.de> +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 c3059c4705e94f8227bdd88376e2d0a71f723332 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:36:00 2004 +0000 + + readding XFree86's cvs IDs + +commit 8a3bd98dca8ae9fb09e218a2eaaffa87b9443a69 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:23:35 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 4c3bde7fb901a9e31ce27f1b1dda6e9ca9b9c9fb +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + XFree86 4.3.0.1 + +commit e74668bfa6605bfed226df2136152de369281020 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:56 2003 +0000 + + Initial revision diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/config.h.in new/xf86-input-spaceorb-1.1.1/config.h.in --- old/xf86-input-spaceorb-X11R7.1-1.1.0/config.h.in 2006-05-23 05:25:06.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/config.h.in 2007-09-10 19:12:22.000000000 +0200 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/configure.ac new/xf86-input-spaceorb-1.1.1/configure.ac --- old/xf86-input-spaceorb-X11R7.1-1.1.0/configure.ac 2006-04-07 20:07:53.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/configure.ac 2007-09-10 19:11:57.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-spaceorb], - 1.1.0, + 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-spaceorb) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/Makefile.am new/xf86-input-spaceorb-1.1.1/Makefile.am --- old/xf86-input-spaceorb-X11R7.1-1.1.0/Makefile.am 2005-07-12 08:15:10.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/Makefile.am 2007-09-10 19:11:22.000000000 +0200 @@ -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) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-spaceorb-1.1.1/man/Makefile.am --- old/xf86-input-spaceorb-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:32.000000000 +0100 +++ new/xf86-input-spaceorb-1.1.1/man/Makefile.am 2007-09-09 17:32:05.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2005/11/28 22:04:07 alanc Exp $ +# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/missing new/xf86-input-spaceorb-1.1.1/missing --- old/xf86-input-spaceorb-X11R7.1-1.1.0/missing 2006-05-23 05:25:09.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/missing 2007-09-10 19:12:23.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-spaceorb-X11R7.1-1.1.0/src/spaceorb.c new/xf86-input-spaceorb-1.1.1/src/spaceorb.c --- old/xf86-input-spaceorb-X11R7.1-1.1.0/src/spaceorb.c 2006-04-07 20:07:53.000000000 +0200 +++ new/xf86-input-spaceorb-1.1.1/src/spaceorb.c 2007-09-09 17:32:05.000000000 +0200 @@ -76,7 +76,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -231,7 +231,6 @@ } priv->buffer = XisbNew (pInfo->fd, 200); - DBG (9, XisbTrace (priv->buffer, 1)); /* * Verify the hardware is attached and functional ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org