xserver-xorg-input-spaceorb: Changes to 'debian-unstable'
.cvsignore | 19 ---
.gitignore | 21 ++++
ChangeLog | 252 ++++++++++++++++++++++++++++++++++++++++++++------
Makefile.am | 8 +
Makefile.in | 8 +
config.guess | 32 +-----
config.sub | 28 +----
configure | 20 +--
configure.ac | 2
debian/changelog | 17 ++-
debian/control | 6 -
debian/copyright | 3
debian/xsfbs/xsfbs.mk | 27 +++--
debian/xsfbs/xsfbs.sh | 7 -
man/.cvsignore | 2
man/.gitignore | 2
src/.cvsignore | 6 -
src/.gitignore | 6 +
src/spaceorb.c | 3
19 files changed, 334 insertions(+), 135 deletions(-)
New commits:
commit 536afa2fa646bcd3059948a7bb6d5e4268db54f7
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 15:32:21 2007 -0400
* Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index daf03e6..bae92e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-spaceorb (1:1.1.1-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 15:13:39 -0400
+
xserver-xorg-input-spaceorb (1:1.1.1-1) experimental; urgency=low
* New upstream release.
commit cb15ea2a80d00537cd207fad248b20a5678e25ae
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 12:20:11 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ed59b2c..daf03e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-spaceorb (1:1.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-spaceorb (1:1.1.1-1) experimental; urgency=low
* New upstream release.
* Add upstream URL to debian/copyright.
@@ -7,7 +7,7 @@ xserver-xorg-input-spaceorb (1:1.1.1-1) UNRELEASED; urgency=low
* Add myself to uploaders, and remove Branden and Fabio with their
permission.
- -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 12:10:50 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 12:18:47 +0200
xserver-xorg-input-spaceorb (1:1.1.0-2) unstable; urgency=low
commit fd273a90fb3675b8fb59c47e1137d4cd773fab19
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 12:18:42 2007 +0200
Add upstream changelog
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..1c20a7d
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,241 @@
+commit 93fd49758565321036891543bbbdea74e759a393
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Mon Sep 10 19:12:04 2007 +0200
+
+ Bumped version to 1.1.1.
+
+commit 3050a5436baffa108f7ff598aed59bbcd60816be
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Mon Sep 10 19:11:37 2007 +0200
+
+ Generate ChangeLog from git.
+
+commit 92df1dc6af4fea8094dab07651058a86b6fd51e0
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:22 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 2bf3c8cadbec255b856d77cf1c05935a47d4c701
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:39 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 56511dca3f7fcf174ff44425533d888dfb37cd76
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Aug 8 01:09:58 2007 +0300
+
+ Remove useless debugging statement
+
+commit 45d04b90e0d1d944e6ed73702adcc0bc99957814
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 09:42:50 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
+
+commit de867ddea246854fb4876eae66cf449ac2e71aeb
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:07:53 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit 13ffd0da40c667a80162f480450968bb624d3d2d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:58 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit b8d93a5f5201c1c7bf9546563f24f668fe21e13c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:52 2005 +0000
+
+ 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
commit 7ebfe6d6167c493bdf13693833286bb9a94fda07
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 12:11:32 2007 +0200
New upstream release
diff --git a/Makefile.in b/Makefile.in
index d50b00f..8b714d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -214,6 +214,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+CLEANFILES = ChangeLog
+EXTRA_DIST = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -574,6 +576,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -648,6 +651,11 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config.guess b/config.guess
index 0f0fe71..396482d 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -781,7 +780,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW*:*)
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -791,15 +790,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -954,9 +950,6 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
- exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1215,15 +1208,6 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index 5defff6..387c18d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -324,7 +323,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -925,9 +920,6 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1222,7 +1214,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1374,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
@@ -1417,9 +1406,6 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index 1a7d564..ef3a969 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-spaceorb 1.1.0.
+# Generated by GNU Autoconf 2.61 for xf86-input-spaceorb 1.1.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-spaceorb'
PACKAGE_TARNAME='xf86-input-spaceorb'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-input-spaceorb 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-input-spaceorb 1.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1412,7 +1412,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-spaceorb 1.1.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-spaceorb 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-spaceorb 1.1.0:";;
+ short | recursive ) echo "Configuration of xf86-input-spaceorb 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1594,7 +1594,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-spaceorb configure 1.1.0
+xf86-input-spaceorb configure 1.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1608,7 +1608,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-spaceorb $as_me 1.1.0, which was
+It was created by xf86-input-spaceorb $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2280,7 +2280,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-spaceorb'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -21060,7 +21060,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-spaceorb $as_me 1.1.0, which was
+This file was extended by xf86-input-spaceorb $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21113,7 +21113,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-spaceorb config.status 1.1.0
+xf86-input-spaceorb config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 69964dd..ed59b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xserver-xorg-input-spaceorb (1:1.1.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-spaceorb (1:1.1.1-1) UNRELEASED; urgency=low
+ * New upstream release.
* Add upstream URL to debian/copyright.
* Build against xserver 1.4.
* Generate the Provides field automatically.
* Add myself to uploaders, and remove Branden and Fabio with their
permission.
- -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 12:08:08 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 12:10:50 +0200
xserver-xorg-input-spaceorb (1:1.1.0-2) unstable; urgency=low
commit 2dc1f8fcd0b159beaae8b95633ec48ad463337cc
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 12:08:45 2007 +0200
Build against xserver 1.4 and fix various minor things
diff --git a/debian/changelog b/debian/changelog
index d34fc26..69964dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xserver-xorg-input-spaceorb (1:1.1.0-3) UNRELEASED; urgency=low
- * Remove Fabio from uploaders with his permission. He's always welcome back.
+ * Add upstream URL to debian/copyright.
+ * Build against xserver 1.4.
+ * Generate the Provides field automatically.
+ * Add myself to uploaders, and remove Branden and Fabio with their
+ permission.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 01:06:17 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 12:08:08 +0200
xserver-xorg-input-spaceorb (1:1.1.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index df7f3ad..1289cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-input-spaceorb
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-spaceorb
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-spaceorb.git
@@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-spac
Package: xserver-xorg-input-spaceorb
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-input
+Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- SpaceOrb input driver
This package provides the driver for SpaceOrb input devices.
diff --git a/debian/copyright b/debian/copyright
index 349b559..09f0cc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright (c) 1998 Metro Link Incorporated
Permission is hereby granted, free of charge, to any person obtaining a
commit 93fd49758565321036891543bbbdea74e759a393
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 19:12:04 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index 1249481..d175c65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 3050a5436baffa108f7ff598aed59bbcd60816be
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 19:11:37 2007 +0200
Generate ChangeLog from git.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..d90176e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
Makefile
Makefile.in
*.la
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 32952c7..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/spaceorb.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..42f8b54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,11 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+CLEANFILES = ChangeLog
+EXTRA_DIST = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
commit 92df1dc6af4fea8094dab07651058a86b6fd51e0
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:22 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 2bf3c8cadbec255b856d77cf1c05935a47d4c701
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:39 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 56511dca3f7fcf174ff44425533d888dfb37cd76
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:09:58 2007 +0300
Remove useless debugging statement
diff --git a/src/spaceorb.c b/src/spaceorb.c
index d272b9d..7a8f6e6 100644
--- a/src/spaceorb.c
+++ b/src/spaceorb.c
@@ -231,7 +231,6 @@ SpaceorbPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
priv->buffer = XisbNew (pInfo->fd, 200);
- DBG (9, XisbTrace (priv->buffer, 1));
/*
* Verify the hardware is attached and functional
commit 45d04b90e0d1d944e6ed73702adcc0bc99957814
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 09:42:50 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/spaceorb.c b/src/spaceorb.c
index e622959..d272b9d 100644
--- a/src/spaceorb.c
+++ b/src/spaceorb.c
@@ -76,7 +76,7 @@ static XF86ModuleVersionInfo VersionRec =
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,
Reply to: