diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-08 10:54:02 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-12 22:11:30 -0700 |
| commit | 370b3d3bdb95ca39d8e8bd00f526fb193c28be82 (patch) | |
| tree | 55822d62633a7804ddbb307af618f42c0b23a9eb | |
| parent | 1ea50b8687b14a7e74d57c0fcc9dd95aa574328a (diff) | |
Rename this package 'xproto', taking over the existing 'xproto'
The existing 'xproto' package contains the base protocol definitions
along with a pile of headers used on both client and server side. It
seems reasonable that this unified package should share this same name
and version sequence.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | x11proto/Makefile.am | 3 | ||||
| -rw-r--r-- | xproto.pc.in (renamed from x11proto/xproto.pc.in) | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index db6fc28..727ffbd 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([Proto], [0.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([Xproto], [7.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -72,8 +72,6 @@ VIDEOPROTO_VERSION=2.3.0 AC_SUBST(VIDEOPROTO_VERSION) WINDOWSWMPROTO_VERSION=1.0.4 AC_SUBST(WINDOWSWMPROTO_VERSION) -X11PROTO_VERSION=7.0.16 -AC_SUBST(X11PROTO_VERSION) XCMISCPROTO_VERSION=1.2.0 AC_SUBST(XCMISCPROTO_VERSION) XEXTPROTO_VERSION=7.1.1 @@ -285,6 +283,7 @@ fi AC_OUTPUT([Makefile + xproto.pc applewmproto/Makefile applewmproto/applewmproto.pc bigreqsproto/Makefile @@ -329,7 +328,6 @@ AC_OUTPUT([Makefile windowswmproto/windowswmproto.pc x11proto/Makefile x11proto/Xpoll.h - x11proto/xproto.pc xcmiscproto/Makefile xcmiscproto/xcmiscproto.pc xextproto/Makefile diff --git a/x11proto/Makefile.am b/x11proto/Makefile.am index 0895a5e..db27b9e 100644 --- a/x11proto/Makefile.am +++ b/x11proto/Makefile.am @@ -29,8 +29,5 @@ nodist_xproto_HEADERS = \ Xfuncproto.h \ Xpoll.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xproto.pc - diff --git a/x11proto/xproto.pc.in b/xproto.pc.in index cc9863d..c6fc2d3 100644 --- a/x11proto/xproto.pc.in +++ b/xproto.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ includex11dir=@includedir@/X11 Name: Xproto -Description: Xproto headers -Version: @X11PROTO_VERSION@ +Description: X Window System protocol headers +Version: @PACKAGE_VERSION@ Cflags: -I${includedir} |