libxinerama: Changes to 'upstream-unstable'
Makefile.am | 2 ++
configure.ac | 2 +-
man/Xinerama.man | 2 +-
src/Xinerama.c | 5 ++---
4 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit cbfc4113a44053c2dfacd14475ff14f43817f3c1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 15:42:56 2008 -0500
libXinerama 1.0.3
diff --git a/configure.ac b/configure.ac
index c1c9844..8fc368c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXinerama, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT(libXinerama, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 7c169beed2d8324c95385d248777f21c721b332e
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 24 20:30:03 2008 -0500
Bug #13660: XineramaQueryScreens() always modifies the 'number' outparameter.
This makes the code match the man page.
diff --git a/src/Xinerama.c b/src/Xinerama.c
index fa2b197..eff7633 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -307,12 +307,11 @@ XineramaQueryScreens(
*number = rep.number;
} else
_XEatData(dpy, rep.length << 2);
+ } else {
+ *number = 0;
}
UnlockDisplay (dpy);
SyncHandle ();
return scrnInfo;
}
-
-
-
commit 52040eaaba626dd998f7a5421a923de0b0e06ad2
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:17 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
diff --git a/Makefile.am b/Makefile.am
index 7642d24..e02c660 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ pkgconfig_DATA = xinerama.pc
EXTRA_DIST = xinerama.pc.in autogen.sh 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)
commit 5362a27db8fddfb03ade3b2c622a2256d91de9eb
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Wed Jul 25 21:41:28 2007 +0200
Fix typo in Xinerama.man
Reported by Emanuele Rocca <ema@debian.org> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432256
diff --git a/man/Xinerama.man b/man/Xinerama.man
index d6b5be7..bec9f80 100644
--- a/man/Xinerama.man
+++ b/man/Xinerama.man
@@ -103,7 +103,7 @@ incompatible, it returns zero.
.SS \fBXineramaIsActive()\fR
.LP
-The XineramaActive function returns a Boolean operator used to determine if
+The XineramaIsActive function returns a Boolean operator used to determine if
Xinerama is activated on the screen. Returns True for active and False for
not active.
.sp
Reply to: