Author: dnusinow
Date: 2006-08-27 19:58:10 -0400 (Sun, 27 Aug 2006)
New Revision: 3067
Modified:
trunk/proto/x11proto-composite/ChangeLog
trunk/proto/x11proto-composite/compositeproto.h
trunk/proto/x11proto-composite/configure
trunk/proto/x11proto-composite/configure.ac
trunk/proto/x11proto-composite/debian/changelog
trunk/proto/x11proto-composite/debian/compat
trunk/proto/x11proto-composite/debian/control
trunk/proto/x11proto-composite/debian/rules
Log:
Merge x11proto-composite from the 7.1 branch to trunk now that it's in unstable
Modified: trunk/proto/x11proto-composite/ChangeLog
===================================================================
--- trunk/proto/x11proto-composite/ChangeLog 2006-08-27 23:57:00 UTC (rev
3066)
+++ trunk/proto/x11proto-composite/ChangeLog 2006-08-27 23:58:10 UTC (rev
3067)
@@ -1,3 +1,8 @@
+2006-04-07 Adam Jackson <[EMAIL PROTECTED]>
+
+ * compositeproto.h:
+ Bug #1425: Fix the protocol definition on big-endian LP64. (René Rebe)
+
2006-3-13 Deron Johnson <[EMAIL PROTECTED]>
* composite.h
Modified: trunk/proto/x11proto-composite/compositeproto.h
===================================================================
--- trunk/proto/x11proto-composite/compositeproto.h 2006-08-27 23:57:00 UTC
(rev 3066)
+++ trunk/proto/x11proto-composite/compositeproto.h 2006-08-27 23:58:10 UTC
(rev 3067)
@@ -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: trunk/proto/x11proto-composite/configure
===================================================================
--- trunk/proto/x11proto-composite/configure 2006-08-27 23:57:00 UTC (rev
3066)
+++ trunk/proto/x11proto-composite/configure 2006-08-27 23:58:10 UTC (rev
3067)
@@ -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: trunk/proto/x11proto-composite/configure.ac
===================================================================
--- trunk/proto/x11proto-composite/configure.ac 2006-08-27 23:57:00 UTC (rev
3066)
+++ trunk/proto/x11proto-composite/configure.ac 2006-08-27 23:58:10 UTC (rev
3067)
@@ -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: trunk/proto/x11proto-composite/debian/changelog
===================================================================
--- trunk/proto/x11proto-composite/debian/changelog 2006-08-27 23:57:00 UTC
(rev 3066)
+++ trunk/proto/x11proto-composite/debian/changelog 2006-08-27 23:58:10 UTC
(rev 3067)
@@ -1,3 +1,27 @@
+x11proto-composite (0.3.1-2) unstable; urgency=low
+
+ [ Andres Salomon ]
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
+ [ David Nusinow ]
+ * Upload to unstable
+
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 21 Aug 2006 20:53:54 +0000
+
+x11proto-composite (0.3.1-1) experimental; urgency=low
+
+ * New upstream release
+ * Put debhelper in build-depends rather than build-depends-indep because we
+ use dh_clean in the clean target
+ * Bump x11-common pre-dep to 1:7.0.0 to match debian versioning and shut
+ lintian up
+ * Remove duplicate dependency on x11-common
+ * Bump debhelper compat to 5
+ * Run dh_install with --list-missing
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 1 Jul 2006 21:41:04 -0400
+
x11proto-composite (0.3-2) unstable; urgency=low
* Upload to unstable
Modified: trunk/proto/x11proto-composite/debian/compat
===================================================================
--- trunk/proto/x11proto-composite/debian/compat 2006-08-27 23:57:00 UTC
(rev 3066)
+++ trunk/proto/x11proto-composite/debian/compat 2006-08-27 23:58:10 UTC
(rev 3067)
@@ -1 +1 @@
-4
+5
Modified: trunk/proto/x11proto-composite/debian/control
===================================================================
--- trunk/proto/x11proto-composite/debian/control 2006-08-27 23:57:00 UTC
(rev 3066)
+++ trunk/proto/x11proto-composite/debian/control 2006-08-27 23:58:10 UTC
(rev 3067)
@@ -3,15 +3,15 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 5.0.0)
+Standards-Version: 3.7.2
Package: x11proto-composite-dev
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, x11proto-core-dev,
x11proto-fixes-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev,
x11proto-fixes-dev
Conflicts: libxcomposite-dev (<< 6.8.2-16)
Replaces: libxcomposite-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1:1.0)
+Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Composite extension wire protocol
This package provides the wire protocol for the Composite extension, used to
let arbitrary client programs control drawing of the final image.
Modified: trunk/proto/x11proto-composite/debian/rules
===================================================================
--- trunk/proto/x11proto-composite/debian/rules 2006-08-27 23:57:00 UTC (rev
3066)
+++ trunk/proto/x11proto-composite/debian/rules 2006-08-27 23:58:10 UTC (rev
3067)
@@ -35,7 +35,7 @@
build-stamp:
dh_testdir
- mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
@@ -72,7 +72,7 @@
dh_installdocs
dh_installman
- dh_install --sourcedir=debian/tmp
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
