From 285deb33da14fb5476b18cb1071b41070cf3ae99 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Thu, 6 Dec 2007 15:51:16 -0500
Subject: Add missing PHONY line for automatic ChangeLog generation

---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index a7443ff..611f6b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,8 @@ pkgconfig_DATA = xext.pc
 EXTRA_DIST=xext.pc.in ChangeLog autogen.sh
 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)
 
-- 
cgit v1.2.3


From 37fe15843fd892c529e554f24a937ed712ea129c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 7 Dec 2007 15:39:13 -0800
Subject: Allow overriding the SOREV in configure.ac

---
 configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6cd40f0..ade0502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,13 @@ XORG_MACROS_VERSION(1.1)
 # Determine .so library version per platform 
 # based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl
 AC_CANONICAL_HOST
-case $host_os in
+if test "x$XEXT_SOREV" = "x" ; then
+    case $host_os in
 	openbsd*)	XEXT_SOREV=8:0 		;;
 	solaris*)       XEXT_SOREV=0 		;;
 	*)              XEXT_SOREV=6:4:0 	;;
-esac
+    esac
+fi
 AC_SUBST(XEXT_SOREV)
 
 # Checks for programs.
-- 
cgit v1.2.3


From f6c7c70f312c8eb0883437c003ba78bb4abbabc3 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 7 Dec 2007 15:41:42 -0800
Subject: Coverity #467: security_error_list has fewer than
 XSecurityNumberErrors entries

Sometimes it's annoying that C silently merges adjacent strings without
warning you that you forgot a comma in your list of strings.
---
 src/XSecurity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/XSecurity.c b/src/XSecurity.c
index 161ade3..9a09daa 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -78,7 +78,7 @@ static XExtensionHooks Security_extension_hooks = {
 };
 
 static char    *security_error_list[] = {
-    "BadAuthorization"
+    "BadAuthorization",
     "BadAuthorizationProtocol"
 };
 
-- 
cgit v1.2.3


From 9884a41dd0282ca3dd19db5bf3a11554ee7eee57 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu, 28 Feb 2008 19:02:58 -0800
Subject: Version bump: 1.0.4

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ade0502..efb0e7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libXext],
-        1.0.3,
+        1.0.4,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libXext)
 
-- 
cgit v1.2.3