X Strike Force X.Org X11 SVN commit: r2380 - in branches/7.1/proto/compositeproto: . debian
Author: dnusinow
Date: 2006-07-01 20:16:25 -0400 (Sat, 01 Jul 2006)
New Revision: 2380
Modified:
branches/7.1/proto/compositeproto/ChangeLog
branches/7.1/proto/compositeproto/compositeproto.h
branches/7.1/proto/compositeproto/configure
branches/7.1/proto/compositeproto/configure.ac
branches/7.1/proto/compositeproto/debian/changelog
Log:
Merge vendor drop of composite proto 0.3.1 to 7.1 working branch
Modified: branches/7.1/proto/compositeproto/ChangeLog
===================================================================
--- branches/7.1/proto/compositeproto/ChangeLog 2006-07-02 00:13:30 UTC (rev 2379)
+++ branches/7.1/proto/compositeproto/ChangeLog 2006-07-02 00:16:25 UTC (rev 2380)
@@ -1,3 +1,8 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * compositeproto.h:
+ Bug #1425: Fix the protocol definition on big-endian LP64. (René Rebe)
+
2006-3-13 Deron Johnson <deron.johnson@sun.com>
* composite.h
Modified: branches/7.1/proto/compositeproto/compositeproto.h
===================================================================
--- branches/7.1/proto/compositeproto/compositeproto.h 2006-07-02 00:13:30 UTC (rev 2379)
+++ branches/7.1/proto/compositeproto/compositeproto.h 2006-07-02 00:16:25 UTC (rev 2380)
@@ -50,6 +50,7 @@
#define Window CARD32
#define Region CARD32
+#define Pixmap CARD32
/*
* requests and replies
@@ -186,5 +187,6 @@
#undef Window
#undef Region
+#undef Pixmap
#endif /* _COMPOSITEPROTO_H_ */
Modified: branches/7.1/proto/compositeproto/configure
===================================================================
--- branches/7.1/proto/compositeproto/configure 2006-07-02 00:13:30 UTC (rev 2379)
+++ branches/7.1/proto/compositeproto/configure 2006-07-02 00:16:25 UTC (rev 2380)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for CompositeProto 0.3.
+# Generated by GNU Autoconf 2.59 for CompositeProto 0.3.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='CompositeProto'
PACKAGE_TARNAME='compositeproto'
-PACKAGE_VERSION='0.3'
-PACKAGE_STRING='CompositeProto 0.3'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='CompositeProto 0.3.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS'
@@ -722,7 +722,7 @@
# 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 CompositeProto 0.3 to adapt to many kinds of systems.
+\`configure' configures CompositeProto 0.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -784,7 +784,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of CompositeProto 0.3:";;
+ short | recursive ) echo "Configuration of CompositeProto 0.3.1:";;
esac
cat <<\_ACEOF
@@ -890,7 +890,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-CompositeProto configure 0.3
+CompositeProto configure 0.3.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -904,7 +904,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by CompositeProto $as_me 0.3, which was
+It was created by CompositeProto $as_me 0.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1547,7 +1547,7 @@
# Define the identity of the package.
PACKAGE='compositeproto'
- VERSION='0.3'
+ VERSION='0.3.1'
cat >>confdefs.h <<_ACEOF
@@ -2089,7 +2089,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by CompositeProto $as_me 0.3, which was
+This file was extended by CompositeProto $as_me 0.3.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2144,7 +2144,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-CompositeProto config.status 0.3
+CompositeProto config.status 0.3.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/7.1/proto/compositeproto/configure.ac
===================================================================
--- branches/7.1/proto/compositeproto/configure.ac 2006-07-02 00:13:30 UTC (rev 2379)
+++ branches/7.1/proto/compositeproto/configure.ac 2006-07-02 00:16:25 UTC (rev 2380)
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([CompositeProto], [0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([CompositeProto], [0.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
Modified: branches/7.1/proto/compositeproto/debian/changelog
===================================================================
--- branches/7.1/proto/compositeproto/debian/changelog 2006-07-02 00:13:30 UTC (rev 2379)
+++ branches/7.1/proto/compositeproto/debian/changelog 2006-07-02 00:16:25 UTC (rev 2380)
@@ -1,3 +1,9 @@
+x11proto-composite (0.3.1-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 1 Jul 2006 20:15:35 -0400
+
x11proto-composite (0.3-2) unstable; urgency=low
* Upload to unstable
Reply to: