xserver-xorg-input-magellan: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 21
ChangeLog | 252 +
Makefile.am | 8
Makefile.in | 24
aclocal.m4 | 379 +-
config.guess | 667 ++--
config.h.in | 9
config.sub | 222 +
configure | 7817 ++++++++++++++++++++++++++------------------------
configure.ac | 2
debian/changelog | 19
debian/control | 12
debian/copyright | 3
debian/rules | 2
debian/xsfbs/xsfbs.mk | 46
debian/xsfbs/xsfbs.sh | 7
ltmain.sh | 12
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.in | 16
mkinstalldirs | 89
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.in | 14
src/magellan.c | 3
26 files changed, 5372 insertions(+), 4287 deletions(-)
New commits:
commit edf8c3e6e043070a0623a116d08943aad0688504
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 17:08:08 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1e96514..04b6f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-magellan (1:1.1.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-magellan (1:1.1.1-1) experimental; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -19,7 +19,7 @@ xserver-xorg-input-magellan (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 17:07:18 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 17:07:51 +0200
xserver-xorg-input-magellan (1:1.1.0-1) unstable; urgency=low
commit 7750b5b0f1f02817ea4f8832c03c4f0006f39a51
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 17:07:40 2007 +0200
Build against xserver 1.4 and fix various minor things
diff --git a/debian/changelog b/debian/changelog
index e818261..1e96514 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,14 @@ xserver-xorg-input-magellan (1:1.1.1-1) UNRELEASED; urgency=low
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-input-magellan
module in the long description.
- * Remove Fabio from uploaders with his permission. He's always welcome back.
* 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 17:05:54 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 17:07:18 +0200
xserver-xorg-input-magellan (1:1.1.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a615121..b21ba63 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-input-magellan
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-magellan
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-magellan.git
@@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mage
Package: xserver-xorg-input-magellan
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 -- Magellan input driver
This package provides the driver for Magellan SpaceMouse 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 be42569a96ab91d9bee3e553d73cb3ddc5d1079b
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 17:06:11 2007 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b85abec
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,241 @@
+commit bcee9eea6f6dfd53c604c2caa45048fb9fe2dc1e
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Mon Sep 10 18:48:01 2007 +0200
+
+ Bumped version to 1.1.1.
+
+commit 36b02c9b69b6ae2fc126936a03293f937256bbf9
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Mon Sep 10 18:47:21 2007 +0200
+
+ Generate ChangeLog from git.
+
+commit 854e74a9010202eb1a435fae80019c02041468d5
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:12 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 1fb884c596d79972ff2b340d1061c94cde6c6769
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:29 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 0cb6f76c93e19371c681fb4a3c7f698c1b098d39
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Aug 8 01:08:08 2007 +0300
+
+ Remove useless debugging statement
+
+commit bcd2a71ee0e861614cc7db18cd6b2cfc0b5bc6b5
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 09:15:49 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
+
+commit c3c95d2ada507b01f067fb2558f820dd697eea61
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 17:49:43 2006 +0000
+
+ bcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit cf4c58c56000797f7e50c17de2b2e41232efdb61
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:57 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 576bd77324a725b815b4cf4533435227e9f95882
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:51 2005 +0000
+
+ 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 --git a/Makefile.in b/Makefile.in
index d50b00f..8b714d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -214,6 +214,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+CLEANFILES = ChangeLog
+EXTRA_DIST = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -574,6 +576,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -648,6 +651,11 @@ uninstall-info: uninstall-info-recursive
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/config.sub b/config.sub
index fab0aa3..387c18d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1371,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index 7985846..f19a8e8 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-magellan 1.1.0.
+# Generated by GNU Autoconf 2.61 for xf86-input-magellan 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-magellan'
PACKAGE_TARNAME='xf86-input-magellan'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-input-magellan 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-input-magellan 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-magellan 1.1.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-magellan 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-magellan 1.1.0:";;
+ short | recursive ) echo "Configuration of xf86-input-magellan 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-magellan configure 1.1.0
+xf86-input-magellan 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-magellan $as_me 1.1.0, which was
+It was created by xf86-input-magellan $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-magellan'
- 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-magellan $as_me 1.1.0, which was
+This file was extended by xf86-input-magellan $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-magellan config.status 1.1.0
+xf86-input-magellan 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 4f82bfd..e818261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-magellan (1:1.1.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-magellan (1:1.1.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -13,8 +13,9 @@ xserver-xorg-input-magellan (1:1.1.0-2) UNRELEASED; urgency=low
* Add a link to www.X.org and a reference to the xf86-input-magellan
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
+ * New upstream release.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 22 Apr 2007 22:37:24 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 12 Sep 2007 17:05:54 +0200
xserver-xorg-input-magellan (1:1.1.0-1) unstable; urgency=low
commit bcee9eea6f6dfd53c604c2caa45048fb9fe2dc1e
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:48:01 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index b1d7236..217c06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 36b02c9b69b6ae2fc126936a03293f937256bbf9
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:47:21 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 a04e9eb..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/magellan.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 854e74a9010202eb1a435fae80019c02041468d5
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:12 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 1fb884c596d79972ff2b340d1061c94cde6c6769
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:29 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 0cb6f76c93e19371c681fb4a3c7f698c1b098d39
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:08:08 2007 +0300
Remove useless debugging statement
diff --git a/src/magellan.c b/src/magellan.c
index 56669ad..b27d595 100644
--- a/src/magellan.c
+++ b/src/magellan.c
@@ -249,7 +249,6 @@ MagellanPreInit(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 bcd2a71ee0e861614cc7db18cd6b2cfc0b5bc6b5
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 09:15:49 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/magellan.c b/src/magellan.c
index 926f47d..56669ad 100644
--- a/src/magellan.c
+++ b/src/magellan.c
@@ -84,7 +84,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,
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
commit 1d623b098300b207e8bf11387dc7f12a87a20e6c
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Reply to: