.gitignore | 4 ++++ ChangeLog | 4 ---- Makefile.am | 12 +++++++++++- XKBsrv.h | 6 +++--- configure.ac | 8 ++++++-- 5 files changed, 24 insertions(+), 10 deletions(-)
New commits: commit 4e3ccd5b2144005af1d5d2f9b96275a01156aec5 Author: Alan Coopersmith <[email protected]> Date: Mon Oct 12 22:39:05 2009 -0700 kbproto 1.0.4 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 22ae1db..9537951 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([KBProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS commit 6472994ea38a8416214b5ce12a34437541e6d15e Author: Alan Coopersmith <[email protected]> Date: Mon Oct 12 22:38:03 2009 -0700 Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index ae5a817..22ae1db 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([KBProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_OUTPUT([Makefile kbproto.pc]) commit 5273e7bc22cc7f11f2461ba1f5f30cbdecda1289 Author: Jeremy Huddleston <[email protected]> Date: Mon Apr 6 17:54:12 2009 -0700 Made some defines typedefs for better compatability diff --git a/XKBsrv.h b/XKBsrv.h index 49630af..26a4ed8 100644 --- a/XKBsrv.h +++ b/XKBsrv.h @@ -330,9 +330,9 @@ extern int DeviceButtonPress,DeviceButtonRelease; #undef IsKeypadKey #define IsKeypadKey(s) XkbKSIsKeypad(s) -#define Status int -#define XPointer pointer -#define Display struct _XDisplay +typedef int Status; +typedef pointer XPointer; +typedef struct _XDisplay Display; #ifndef True #define True 1 commit 3baa0be057f2bf2e2f0f049c0dded4a93c68819e Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore index 2940f09..cae696e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing kbproto.pc *~ +kbproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index b00e2b1..bbb5f36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ kb_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = kbproto.pc -EXTRA_DIST = autogen.sh kbproto.pc.in +EXTRA_DIST = kbproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -17,6 +17,6 @@ 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) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 15bfa19..ae5a817 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([KBProto], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile kbproto.pc]) commit 0396fb99f96ff15e1000a6e4b5ccdca119319a8a Author: James Cloos <[email protected]> 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 559105c..b00e2b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,3 +10,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = kbproto.pc EXTRA_DIST = autogen.sh kbproto.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 1a41bb4ff63d0fa27238be2af6a8b59941c0f7db Author: James Cloos <[email protected]> Date: Mon Sep 3 05:54:08 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index 2fb7f9c..2940f09 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing kbproto.pc +*~ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
