merge xf86-input-magellan 1.1.1

2 files changed, 18 insertions, 10 deletions

diff --git a/driver/xf86-input-magellan/Makefile.in b/driver/xf86-input-magellan/Makefile.in
index 46295dd69..864b78812 100644
--- a/driver/xf86-input-magellan/Makefile.in
+++ b/driver/xf86-input-magellan/Makefile.in
@@ -210,6 +210,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
 
@@ -570,6 +572,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)
@@ -644,6 +647,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/driver/xf86-input-magellan/configure b/driver/xf86-input-magellan/configure
index 2d020e2fc..192cad3ff 100644
--- a/driver/xf86-input-magellan/configure
+++ b/driver/xf86-input-magellan/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xf86-input-magellan 1.1.0.
+# Generated by GNU Autoconf 2.59 for xf86-input-magellan 1.1.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,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"
@@ -966,7 +966,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]...
 
@@ -1032,7 +1032,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
 
@@ -1181,7 +1181,7 @@ fi
 test -n "$ac_init_help" && exit 0
 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.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1195,7 +1195,7 @@ cat >&5 <<_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.59.  Invocation command line was
 
   $ $0 $@
@@ -1840,7 +1840,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-input-magellan'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20481,7 +20481,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-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.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20544,7 +20544,7 @@ _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.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"