x11proto-input: Changes to 'upstream-unstable'
.gitignore | 1 +
ChangeLog | 4 ----
Makefile.am | 10 ++++++++++
XI.h | 3 ++-
configure.ac | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 5 22:06:19 2008 -0500
inputproto 1.4.3
diff --git a/configure.ac b/configure.ac
index c010699..b07f4ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
Author: Jesse Barnes <jesse.barnes@intel.com>
Date: Mon Jan 21 15:28:49 2008 -0800
Use Xmd.h instead of X.h to pull in CARD32 definition
On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it for
us. Apparently X.h is no longer sufficient.
diff --git a/XI.h b/XI.h
index 0bfefcc..fe4981a 100644
--- a/XI.h
+++ b/XI.h
@@ -52,7 +52,7 @@ SOFTWARE.
#ifndef _XI_H_
#define _XI_H_
-#include <X11/X.h> /* CARD32 */
+#include <X11/Xmd.h> /* CARD32 */
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32
commit 9359e625787761e6b3df15f29bbf842c67a9516d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:39:02 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index e39ea0a..f8d4a32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = inputproto.pc
EXTRA_DIST = autogen.sh inputproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = 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)
+
+dist-hook: ChangeLog
commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 27 12:27:19 2007 -0400
XI.h needs X.h for CARD32 on 64-bit systems.
diff --git a/XI.h b/XI.h
index ae52292..0bfefcc 100644
--- a/XI.h
+++ b/XI.h
@@ -50,9 +50,10 @@ SOFTWARE.
/* Definitions used by the server, library and client */
#ifndef _XI_H_
-
#define _XI_H_
+#include <X11/X.h> /* CARD32 */
+
#define sz_xGetExtensionVersionReq 8
#define sz_xGetExtensionVersionReply 32
#define sz_xListInputDevicesReq 4
commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:06 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 2c3bca3..503dd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
inputproto.pc
+*~
commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Aug 31 17:58:27 2007 +0930
Bump to 1.4.2.1
No source changes, the 1.4.2 tarball had a busted configure script.
diff --git a/configure.ac b/configure.ac
index 72f9882..c010699 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
Reply to: