Update to xineramaproto 1.2

9 files changed, 239 insertions, 307 deletions

diff --git a/proto/xineramaproto/ChangeLog b/proto/xineramaproto/ChangeLog
index c722b519a..b2b735c24 100644
--- a/proto/xineramaproto/ChangeLog
+++ b/proto/xineramaproto/ChangeLog
@@ -1,4 +1,218 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 216c573fa004c1b7ae2bd273a340127515e329a7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 20:41:09 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    xineramaproto 1.2
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 489b2bf3698a3c4537ff1a473f9f080d8219cf07
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 20:34:09 2009 +1000
+
+    Require macros 1.3 for XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 419bcf5831b06a1ab9d01ef1188e53b1478e2860
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 11:39:16 2009 +1000
+
+    xineramaproto 1.1.99.1
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 21477147613c28c968b5e1eb9d8aea7017dd399d
+Author: Benjamin Close <Benjamin.Close@clearchain.com>
+Date:   Fri Feb 13 14:46:11 2009 +1030
+
+    The major/minor protocol versions exist in the proto headers not the lib/libXinerma userspace headers
+    
+    Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
+    Acked-by: Daniel Stone <daniel@fooishbar.org>
+    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b8b3878351a148e527df44ddf8886917f00d1a85
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit e28d33b35a0a795aec7e3174b42a0f317c15a827
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 19 22:40:07 2008 +0930
+
+    Remove panoramiXext.h and Xinerama.h. Xlib headers and don't belong here.
+    
+    For furture amendmends to these files please refer to
+    git://anongit.freedesktop.org/git/xorg/lib/libXinerama
+
+commit 47f0250dfcbc8edd3c0d0420f560e1316f5a444a
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 19 22:36:31 2008 +0930
+
+    Nuke RCS tags.
+
+commit 29a5de547f301b8b3af265d87889ba08ef3a5c8e
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:15 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit b845eec55045df17af46fead628e4814af6c1945
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:33 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit edd1f8255923146a6d8723649baa0018a8ca8962
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:52 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 6f36b1384ae09505815d4867e2a26781c4335f4e
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:40 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit a4319de7154a6f150dc32e45effd552681e877bb
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:16 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 7244429847b2bbed9b785463ff9e7086c6b39a34
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Aug 19 00:13:46 2005 +0000
+
+    More updates for Panoramix -> Xinerama rename
+
+commit aba421a2e74a326a0e4387d3173308735a6263fd
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Aug 18 23:38:59 2005 +0000
+
+    Xinerama protocol module should be named Xinerama, not Panoramix
+
+commit 74337d4f81c9050cb69da8fb825ebe9411b36140
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:39 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit c39a81928f245fa204030249868a422b65fec5a5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:56 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 51af7343cc12fec7d7d3e72efb613c9055aeeabc
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:12:42 2005 +0000
+
+    Set version to 1.1.
+
+commit 501d5823392a3ef6004bca877cfb5e9b4c346fd5
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:39 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit ead21add6c28dc2ade81a9b244dfe626f20f785f
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:18 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit ff3b1c8f0b2eaf1010e2a1043585ceb232ba3e53
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Mon May 16 08:24:15 2005 +0000
+
+    Add COPYING file for Panoramix.
+
+commit 2d1fbdb4b20e9c12cf7c6c1872d5fd888f39e390
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:05 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 2cc4bdad59cbb32cc4d363b437ee0c4fa44b148b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:31 2005 +0000
+
+    Initial build system files for proto module.
+
+commit b4e223f81287cf3f448266d8c7ac2ff5bb72e7a3
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Dec 1 19:03:46 2004 +0000
+
+    Include X11/Xlib.h in Xinerama.h, since it uses libX11 functions (#1897).
+
+commit 87a2015dff7b7dc2bef6cdc61bf1ff169eee45c1
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 93a7f9f29ea2630838fb5bf5852f15e282699e41
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:36 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit c7345384f43565544530a301df0bdd8acddc4e9e
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 2c683ef717bf72bd1529f5418202957dd5750add
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:14 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 3a23f49e5e0bcf6ac098053f223d82c5c7345ce2
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:28 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 2ecaf6adfe8f312f320424a2d8e312316e71e142
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Dec 19 20:54:21 2003 +0000
+
+    XFree86 4.3.99.902 (RC 2)
+
+commit cefe7009c777de6c98a7b4c342a7ea4a1f18c9ac
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:28:02 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 0280e9a705e5ef149124700131e826f4706318dd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 319abb7b20ca59f1ed311fd973650d281bd69229
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    Initial revision
+
+commit 550293c1888fb7e0b820633c2ee2162e24ff19f5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:35 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/proto/xineramaproto/Makefile b/proto/xineramaproto/Makefile
index c26115695..e49ed834b 100644
--- a/proto/xineramaproto/Makefile
+++ b/proto/xineramaproto/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/27 20:02:41 matthieu Exp $
 
 HEADERS_SUBDIR=	X11/extensions/
-HEADERS=	panoramiXext.h panoramiXproto.h Xinerama.h
+HEADERS=	panoramiXproto.h
 PKGCONFIG=	xineramaproto.pc
 
 .include <bsd.xorg.mk>
diff --git a/proto/xineramaproto/Makefile.am b/proto/xineramaproto/Makefile.am
index 9320e38dd..591a3015c 100644
--- a/proto/xineramaproto/Makefile.am
+++ b/proto/xineramaproto/Makefile.am
@@ -1,10 +1,18 @@
 xineramadir = $(includedir)/X11/extensions
 xinerama_HEADERS = \
-	panoramiXext.h \
-	panoramiXproto.h \
-	Xinerama.h
+	panoramiXproto.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xineramaproto.pc
 
-EXTRA_DIST = autogen.sh xineramaproto.pc.in
+EXTRA_DIST = xineramaproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/xineramaproto/Xinerama.h b/proto/xineramaproto/Xinerama.h
deleted file mode 100644
index 9ccc400be..000000000
--- a/proto/xineramaproto/Xinerama.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */
-/*
-
-Copyright 2003  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
-
-#ifndef _Xinerama_h
-#define _Xinerama_h
-
-#include <X11/Xlib.h>
-
-typedef struct {
-   int   screen_number;
-   short x_org;
-   short y_org;
-   short width;
-   short height;
-} XineramaScreenInfo;
-
-_XFUNCPROTOBEGIN
-
-Bool XineramaQueryExtension (
-   Display *dpy,
-   int     *event_base,
-   int     *error_base
-);
-
-Status XineramaQueryVersion(
-   Display *dpy,
-   int     *major_versionp,
-   int     *minor_versionp
-);
-
-Bool XineramaIsActive(Display *dpy);
-
-
-/* 
-   Returns the number of heads and a pointer to an array of
-   structures describing the position and size of the individual
-   heads.  Returns NULL and number = 0 if Xinerama is not active.
-  
-   Returned array should be freed with XFree().
-*/
-
-XineramaScreenInfo * 
-XineramaQueryScreens(
-   Display *dpy,
-   int     *number
-);
-
-_XFUNCPROTOEND
-
-#endif /* _Xinerama_h */
-
diff --git a/proto/xineramaproto/autogen.sh b/proto/xineramaproto/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/proto/xineramaproto/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/proto/xineramaproto/configure.ac b/proto/xineramaproto/configure.ac
index a1749c047..cba10f85a 100644
--- a/proto/xineramaproto/configure.ac
+++ b/proto/xineramaproto/configure.ac
@@ -1,8 +1,11 @@
 AC_PREREQ([2.57])
-AC_INIT([XineramaProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XineramaProto], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-XORG_RELEASE_VERSION
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            xineramaproto.pc])
diff --git a/proto/xineramaproto/mkinstalldirs b/proto/xineramaproto/mkinstalldirs
deleted file mode 100644
index 259dbfcd3..000000000
--- a/proto/xineramaproto/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/proto/xineramaproto/panoramiXext.h b/proto/xineramaproto/panoramiXext.h
deleted file mode 100644
index ad2f7e4b5..000000000
--- a/proto/xineramaproto/panoramiXext.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */
-/*****************************************************************
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-******************************************************************/
-/*  
- *	PanoramiX definitions
- */
-/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
-
-/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
-
-#define PANORAMIX_MAJOR_VERSION         1       /* current version number */
-#define PANORAMIX_MINOR_VERSION         1
-
-typedef struct {
-    Window  window;         /* PanoramiX window - may not exist */
-    int	    screen;
-    int     State;          /* PanroamiXOff, PanoramiXOn */
-    int	    width;	    /* width of this screen */
-    int     height;	    /* height of this screen */
-    int     ScreenCount;    /* real physical number of screens */
-    XID     eventMask;      /* selected events for this client */
-} XPanoramiXInfo;    
-
-extern XPanoramiXInfo *XPanoramiXAllocInfo (
-    void
-);        
diff --git a/proto/xineramaproto/panoramiXproto.h b/proto/xineramaproto/panoramiXproto.h
index 6b27c56eb..6fd1a0266 100644
--- a/proto/xineramaproto/panoramiXproto.h
+++ b/proto/xineramaproto/panoramiXproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */
 /*****************************************************************
 Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,13 +22,15 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
 #ifndef _PANORAMIXPROTO_H_
 #define _PANORAMIXPROTO_H_
 
+#define PANORAMIX_MAJOR_VERSION         1       /* current version number */
+#define PANORAMIX_MINOR_VERSION         1
+
 #define PANORAMIX_PROTOCOL_NAME "XINERAMA"
 
 #define X_PanoramiXQueryVersion		0