[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

x11proto-xext: Changes to 'debian-unstable'



 .gitignore            |    3 
 COPYING               |   22 +
 ChangeLog             |  461 +++++++++++++++++++++++
 EVI.h                 |   36 +
 EVIproto.h            |   96 ++++
 MITMisc.h             |   66 ---
 Makefile.am           |   68 +--
 XEVI.h                |   64 ---
 XEVIstr.h             |   98 -----
 XLbx.h                |  155 -------
 XShm.h                |  161 --------
 XTest.h               |  164 --------
 Xag.h                 |  114 -----
 Xagstr.h              |  182 ---------
 Xcup.h                |   69 ---
 Xcupstr.h             |  109 -----
 Xdbe.h                |  136 ------
 Xdbeproto.h           |  277 --------------
 Xext.h                |   57 --
 Xge.h                 |   55 --
 ag.h                  |   52 ++
 agproto.h             |  178 +++++++++
 configure.ac          |    6 
 cup.h                 |   38 +
 cupproto.h            |  105 +++++
 dbe.h                 |   57 ++
 dbeproto.h            |  224 +++++++++++
 debian/changelog      |   17 
 debian/compat         |    2 
 debian/control        |   14 
 debian/xsfbs/xsfbs.mk |    4 
 debian/xsfbs/xsfbs.sh |  229 -----------
 dpms.h                |   67 ---
 dpmsconst.h           |   43 ++
 dpmsproto.h           |  175 ++++++++
 dpmsstr.h             |  186 ---------
 extutil.h             |  192 ---------
 lbx.h                 |   73 +++
 lbxbuf.h              |   51 --
 lbxbufstr.h           |   45 --
 lbxdeltastr.h         |  105 -----
 lbximage.h            |  151 -------
 lbxopts.h             |  133 ------
 lbxproto.h            |  975 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lbxstr.h              |  935 -----------------------------------------------
 lbxzlib.h             |   64 ---
 mitmiscconst.h        |   38 +
 mitmiscproto.h        |   68 +++
 mitmiscstr.h          |   70 ---
 multibuf.h            |  317 ----------------
 multibufconst.h       |   83 ++++
 multibufproto.h       |  295 +++++++++++++++
 multibufst.h          |  609 -------------------------------
 secur.h               |   61 +++
 security.h            |  111 -----
 securproto.h          |  110 +++++
 securstr.h            |  116 -----
 shape.h               |  180 ---------
 shapeconst.h          |   55 ++
 shapeproto.h          |  237 ++++++++++++
 shapestr.h            |  234 ------------
 shm.h                 |   44 ++
 shmproto.h            |  187 +++++++++
 shmstr.h              |  217 -----------
 sync.h                |  469 ------------------------
 syncconst.h           |  179 +++++++++
 syncproto.h           |  378 +++++++++++++++++++
 syncstr.h             |  494 -------------------------
 xtestconst.h          |   41 ++
 xtestext1.h           |  326 ----------------
 xtestext1const.h      |  160 ++++++++
 xtestext1proto.h      |  221 +++++++++++
 xtestproto.h          |  124 ++++++
 xteststr.h            |  120 ------
 74 files changed, 4879 insertions(+), 7179 deletions(-)

New commits:
commit 5ddbb05b074111cf9a4022ec4313240d0c4fe373
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Sep 12 10:39:31 2009 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1c71e54..69e8e82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
+x11proto-xext (7.1.1-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * Add README.source from xsfbs. Bump Standards-Version to 3.8.1.
@@ -15,7 +15,7 @@ x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
     don't go missing.
   * Bump xutils-dev build-dep to 1:7.4+4.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
+ -- Julien Cristau <jcristau@debian.org>  Sat, 12 Sep 2009 10:38:48 +0200
 
 x11proto-xext (7.0.4-2) unstable; urgency=low
 

commit dcf07a1bd027678f3f2df3ae5379cb079458e18c
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:57:32 2009 +0200

    Bump xutils-dev build-dep to 1:7.4+4.

diff --git a/debian/changelog b/debian/changelog
index 1ef9981..1c71e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
       some others have been renamed
   * Break old versions of libxtst-dev and libxext-dev to make sure the headers
     don't go missing.
+  * Bump xutils-dev build-dep to 1:7.4+4.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/control b/debian/control
index 29a29b5..ff8f7d1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Julien Cristau <jcristau@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
- xutils-dev,
+ xutils-dev (>= 1:7.4+4),
  autoconf,
  automake
 Standards-Version: 3.8.3

commit 2ad11d479a552d0a9242955eb2b5ba42e764700e
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:46:17 2009 +0200

    Break old versions of libxtst-dev and libxext-dev

diff --git a/debian/changelog b/debian/changelog
index ebba845..1ef9981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
   * New upstream release
     + many files moved from here to libXext and other extension libraries,
       some others have been renamed
+  * Break old versions of libxtst-dev and libxext-dev to make sure the headers
+    don't go missing.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/control b/debian/control
index 8b15db3..29a29b5 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git
 Package: x11proto-xext-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-input-dev, libxau-dev
+Breaks:
+ libxext-dev (<< 2:1.0.99),
+ libxtst-dev (<< 2:1.0.99)
 Description: X11 various extension wire protocol
  This package provides development headers describing the wire protocol
  for various extensions, the client-side libraries of which are provided

commit 0b6a39674e88be7624b0b782b01ca6f4ccec635d
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:31:45 2009 +0200

    Bump changelogs

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..c20b3a4
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,461 @@
+commit 987aeb9bd1915a655f31e250ee9c02d04927b150
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Aug 25 09:30:15 2009 +1000
+
+    xextproto 7.1.1
+
+commit 55a0bbdde9b27b8dbc6e75d41c51af3f92dea6e3
+Author: Eduard Bagrov <ebagrov@linuxtesting.org>
+Date:   Fri Aug 21 18:48:19 2009 +0200
+
+    Fix XSyncValueSubtract typo
+    
+    X.Org bug#23438 <http://bugs.freedesktop.org/show_bug.cgi?id=23438>
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 23ac4d5235862d51f0cfb080ad2118a9fb181673
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 5 15:09:11 2009 +1000
+
+    xextproto 7.1.0
+
+commit 5ffa318ddb35308e3a87122bfb3944e3201532ba
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 5 15:06:52 2009 +1000
+
+    lbxproto: remove debug macro and definition of lbxDebug.
+    
+    This should not be in the protocol headers.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5a266968b1ced367df1a47dc9729313c85be0516
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 22 20:26:35 2009 +1000
+
+    Bump to 7.0.99.3
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d7ead7a591da851f6bb2efecdd35b63836df4ed0
+Author: Magnus Kessler <Magnus.Kessler@gmx.net>
+Date:   Wed Jul 22 09:37:38 2009 +0100
+
+    Rename xtest.h to xtestconst.h to avoid a collision with XTest.h on case-insensitive filesystems
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2fd05eca7dd501c58b284d9cceb73d6146672b0a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Jul 21 13:35:58 2009 +1000
+
+    Bump to 7.0.99.2
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a049c37f789f881fad09e60a061488cba2b4072e
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Mon Jul 20 22:42:59 2009 +0100
+
+    Rename mitmisc.h to mitmiscconst.h to avoid a collision with MITMisc.h on case-insensitive filesystems
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 609c3b03fbed24f05d636d98dad9febc7226624c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 15 16:28:12 2009 +1000
+
+    Remove RCS tags.
+
+commit 6e9e47edf97a0bb504b4b65f5ef066f3d5e3d34b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Jul 15 16:20:13 2009 +1000
+
+    Bump to 7.0.99.1
+
+commit ef8766e44c5cdd1e3ba7ebabf576e2de77f57a09
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:43:12 2009 +1000
+
+    xtestext1: split xtestext1.h header into xtestext1proto.h
+
+commit a1f0b58efce74176c71070818fa98c25021bb25e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:36:22 2009 +1000
+
+    sync: remove sync.h library header, split into syncconst.h
+    
+    Rename syncstr.h to syncproto.h
+
+commit 35ec2669091197a4e5b3c56d79ea26ae87759b16
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:32:29 2009 +1000
+
+    shape: remove shape.h, split into shapeconst.h
+    
+    Rename shapestr.h to shapeproto.h
+
+commit 7cfdafd5ec565502a40e9e1f5b3edbb2be6aafbc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:30:17 2009 +1000
+
+    security: remove security.h, split into secur.h
+    
+    Rename securstr.h to securproto.h
+
+commit 19f527b4abe17b58dd78ec988a11c8081166cf01
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:28:02 2009 +1000
+
+    multibuf: remove multibuf.h, split into multibufconst.h
+
+commit 4b7fff5309f3e51e17372e3eaf91ee01c00ffd08
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:19:04 2009 +1000
+
+    remove extutil.h, pure library header
+
+commit 0af7f152239a0f14fc85acd146845c784bb1cd6a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:18:06 2009 +1000
+
+    dpms: remove dpms.h library header, split into dpmsconst.h
+
+commit ac0dfab3fe1ae9c9633696825636a4bcfa14dfd6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:14:14 2009 +1000
+
+    Remove Xext.h and Xge.h - pure library headers.
+
+commit 413572e112e24aa7a28632e13a8aa15c9fdaa57e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:10:01 2009 +1000
+
+    Xdbe: remove Xdbe.h library header, split into dbe.h
+    
+    Rename Xdbeproto to dbeproto.h
+
+commit d2574e8804a204653bda1786c1ece3437f7901a2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 11:04:12 2009 +1000
+
+    Xcup: remove XCup.h library header, split into cup.h
+    
+    Rename Xcupstr.h to cupproto.h
+
+commit 38daa9d8d9d86f3b9df12dd5032959822b7c0a45
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:59:10 2009 +1000
+
+    Xag: remove Xag.h library header, split into Xagconst.h
+
+commit 8cb2568c4a7df1eb0482009bf9150912e98969e6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:54:21 2009 +1000
+
+    XTest: remove XTest.h, split into xtest.h and xtestproto.h
+    
+    To avoid conflicts, xtest.h uses a XTEST_CONST_H include barrier.
+
+commit c63abdd1eb7bc1d8ae4e25073ef2f29d94991e2b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:46:33 2009 +1000
+
+    XShm: remove XShm.h library header, split into shm.h, shmproto.h
+    
+    Removing Xlib function prototypes.
+    Move extension name to shm.h
+    Move protocol request opcodes to shmproto.h
+
+commit 0adb09e032e3bd56426620b19438be9c0c66dd54
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:43:32 2009 +1000
+
+    XLbx: remove XLbx library headers, split into lbx.h, lbxproto.h
+    
+    Remove Xlib function prototypes.
+    Move extension name into lbx.h, move protocol opcodes into lbxproto.h
+
+commit 727003b51844dd1bd41b668bedfa92d2bb7ef964
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:30:40 2009 +1000
+
+    XEVI: remove XEVI.h library header, split into EVIproto.h
+    
+    Remove Xlib function prototypes.
+    Move protocol opcodes to EVIproto.h
+    Move extension name from EVIproto.h into EVI.h
+
+commit 3770d4bd035e43c8e2228d45184d9d398fccb325
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jun 25 10:24:57 2009 +1000
+
+    MITMisc: remove MITMisc.h library header, split into mitmistproto.h
+    
+    Moving extension name from mitmiststr.h into mitmisc.h.
+    Removing Xlib function prototypes from mitmisc.h.
+    Moving protocol request opcodes into mitmiscproto.h
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 57d09e47d05fce0d6df4060b2eff9a8efcc25b2f
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jul 15 13:41:36 2009 -0400
+
+    Remove most LBX headers.
+    
+    XLbx.h and lbxstr.h are required for libXext to build, and we're not
+    allowed to remove API from that.
+
+commit 7629def0733b82687f2879095451d72e42e13db7
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Mar 28 14:20:38 2009 -0400
+
+    C sucks: define XEventClass in terms of unsigned int, not CARD32.
+    
+    Apparently pulling in Xmd.h here breaks qt, since they both define an
+    INT32 type (and incompatible ones even, since Xmd's is unsigned long on
+    ILP32 because whoever wrote Xmd.h is a C novice).
+    
+    (Based on inputproto commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9.
+    Patch submitted to xorg@ in <20090117121713.46bf3332@family.dyweni.com>.)
+
+commit ac98d8c559dc798f09e35d13f51cb1116c6378bb
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jan 29 16:22:20 2009 -0200
+
+    Bump to libXext Version 7.0.5.
+    
+      Add required change to correct #18038
+    (patch to avoid gcc warning in libXext)
+
+commit 8b5b82ec72dd6952d0664655715a0a47951454f4
+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 fa652c6013a5d3ae8106814d97245fdbac3557ac
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Dec 23 16:16:46 2008 +0100
+
+    Add geproto.txt to EXTRA_DIST
+
+commit bd7f3e16b5a5520f0abb8c481f23a19219d26c7f
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Tue Dec 23 15:45:13 2008 +0100
+
+    COPYING: add Peter Hutterer's license and copyright notice
+    
+    Taken from Xge.h
+
+commit e1773d8ad7d36535f856dcb308be9a1b0601c1fc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Dec 18 10:10:42 2008 +1000
+
+    Bump to 7.0.4
+
+commit e7f0c4261c59da82da1c151dd1bd0d143a32906a
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Dec 1 14:44:03 2008 +1000
+
+    Clean up XGE documentation.
+
+commit b0080664e432f8ee569ce099a536c0232dd64d3e
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Mon Dec 1 15:41:16 2008 +1000
+
+    geproto: remote trailing whitespaces.
+
+commit f7e5f23e37e62cc0a981d9b002b69d90b8a7daa9
+Author: Peter Hutterer <peter.hutterer@redhat.com>
+Date:   Fri Sep 26 14:54:19 2008 +0930
+
+    Xge.h: include Xmd.h for CARD8
+
+commit db08133016b421ef12c65db9c4a2819078f01b06
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Wed May 28 17:18:14 2008 +0930
+
+    Bump to 7.0.3.
+
+commit 801650f0d15b4497c63d056559ad98a8ca82f271
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 17:26:02 2008 +0930
+
+    Xge: replace copyrights with standard format from xserver COPYING.
+
+commit 9dc48efe2b3136756613ae00afd706f9a52d6f10
+Merge: 69356e4 a07a30f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon May 12 17:22:14 2008 +0930
+
+    Merge branch 'master' into xge
+
+commit a07a30f9922e9768e2cf00cc2e479978242c58a8
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:10 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 087c2ccc7e348e530422a578059173c959aa5a78
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:25 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 69356e4165f11f3ed4b377d29df038549191a91e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu May 17 19:40:15 2007 +0930
+
+    Add XGE header files and protocol description.
+
+commit 88c24404b44def76a56f52a216a8cf2e0991c3e6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:41 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit a63b4a9d7ebc5929ce9172b10743396cd36addb8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Jun 27 16:25:22 2006 +0000
+
+    Remove Xserver API for appgroup extension [Will break Xorg server builds
+        prior to 2006-06-21 / git commit
+    77c947b900faf34f425eef1549d8210c475e093b]
+
+commit 7bcd3400a8043dee6399680ddc6592747b30f599
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Wed Jun 21 21:20:22 2006 +0000
+
+    Remove Xserver API for security extension (#ifdef _SECURITY_SERVER) [Will
+        break Xorg server builds prior to 2006-06-20 / git commit
+        d44b2a0a57fb89741173c31676af0ccc822387dc]
+
+commit cb67dc36362b018f3a9faa5c4558ce99dbfb2334
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:39 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 9f8dd222022cfafe3ca6467e02232af7d4d7934b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:15 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit cba4432f0d088517f2475881e93cf4dda96a7f94
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:40 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit 790de7da644c6f9114a715b99789253a9c79b0a5
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:57 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 cf67142f46ec2f754f2b3347b21139b66b7167cf
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Jun 10 04:01:14 2005 +0000
+
+    Bug #2799: Input shape. (Keith Packard)
+
+commit b855e49cf845cf814fa1d8a9abcd65cb14356644
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:40 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 1e1659043f908d2e648d0ee73f7f33f5fc79813b
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:19 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 1d316d39381cf0981b2f9687cd2f0200c92961ea
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Wed May 18 08:09:13 2005 +0000
+
+    Add COPYING file for XExt. Note that there are several similar but
+        subtly-different licenses included; in particular, there are some
+        copyright holders with multiple slightly-different licenses included.
+
+commit f3c7759e6dc671ab6db160e739d00133e9996296
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:06 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 474a31667a8addb29a0f115790df2910400c4081
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:32 2005 +0000
+
+    Initial build system files for proto module.
+
+commit be09530f849ec00001fc0575816030b7a5dde05c
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Tue Dec 7 23:37:37 2004 +0000
+
+    //bugs.freedesktop.org/show_bug.cgi?id=830): Get DPMS header file
+        (include/extensions/dpms.h) working with C++ applications. Patch by
+        Kevin DeKorte <kdekorte@yahoo.com> and Roland Mainz
+        <roland.mainz@nrubsig.org>.
+
+commit da24110547ed45c08d707dbffb2972f043dbc1b1
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 8fc2a0fd8ac1b777a35b01d65934ee100b304d20
+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 e7af2a9e4c47a46b3a68a2efebb171dc7872c341
+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 abb02cac08ca1d7d3a64b361df5d1be6f15c6440
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:14 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit c9d6200d559e57f4ca67291213cd282c7437c3c7
+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 023a09fe640f876478157e5b4cd9cfec1452da4b
+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 343e78e15048e6a25791449bfc7566c07ccddf28
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 9a41c9c6452753ac1911a585e59982e8e5186c6b
+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/debian/changelog b/debian/changelog
index a6fa001..ebba845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
+x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Add README.source from xsfbs. Bump Standards-Version to 3.8.1.
@@ -8,6 +8,9 @@ x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
   * Drop Conflicts/Replaces on libxext-dev and libxtst-dev, same deal.
   * Bump debhelper compat level to 5.
   * Bump Standards-Version to 3.8.3.
+  * New upstream release
+    + many files moved from here to libXext and other extension libraries,
+      some others have been renamed
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 

commit d723e46881e6ef81108d95e25cbefe806fca18a2
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:56:03 2009 +0200

    Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 56e0d23..a6fa001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
   * Drop Pre-Depends on x11-common, needed for upgrades from sarge.
   * Drop Conflicts/Replaces on libxext-dev and libxtst-dev, same deal.
   * Bump debhelper compat level to 5.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/control b/debian/control
index a120946..8b15db3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  xutils-dev,
  autoconf,
  automake
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xext
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git
 

commit e8a6031c304232d7eed7574ceb6abe738d41d43b
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:48:52 2009 +0200

    Bump debhelper compat level to 5.

diff --git a/debian/changelog b/debian/changelog
index 674b0b7..56e0d23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Drop Pre-Depends on x11-common, needed for upgrades from sarge.
   * Drop Conflicts/Replaces on libxext-dev and libxtst-dev, same deal.
+  * Bump debhelper compat level to 5.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 3cac363..a120946 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Julien Cristau <jcristau@debian.org>
 Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 5.0.0),
  xutils-dev,
  autoconf,
  automake

commit a2c3b62a7dcbb5dd41a4fa8c70e39e1c85b20e01
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:36:44 2009 +0200

    Drop Conflicts/Replaces on libxext-dev and libxtst-dev
    
    Needed for upgrades from the monolith.

diff --git a/debian/changelog b/debian/changelog
index c04486e..674b0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Drop Pre-Depends on x11-common, needed for upgrades from sarge.
+  * Drop Conflicts/Replaces on libxext-dev and libxtst-dev, same deal.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/control b/debian/control
index 0a941f6..3cac363 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git
 Package: x11proto-xext-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-input-dev, libxau-dev
-Conflicts: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
-Replaces: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
 Description: X11 various extension wire protocol
  This package provides development headers describing the wire protocol
  for various extensions, the client-side libraries of which are provided

commit 5e0a86766db33905e88b8960958bcdfa684fc3c6
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:28:25 2009 +0200

    Wrap the Build-Depends field

diff --git a/debian/control b/debian/control
index cab5209..0a941f6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,11 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 4.0.0), xutils-dev, autoconf, automake
+Build-Depends:
+ debhelper (>= 4.0.0),
+ xutils-dev,
+ autoconf,
+ automake
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xext
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xext.git

commit a3aa4699ad40a6b5716a7ac28b38aa157a70369d
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Sep 11 23:27:50 2009 +0200

    Drop Pre-Depends on x11-common, needed for upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 032b07f..c04486e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 x11proto-xext (7.0.4-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Add README.source from xsfbs. Bump Standards-Version to 3.8.1.
 
+  [ Julien Cristau ]
+  * Drop Pre-Depends on x11-common, needed for upgrades from sarge.
+
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Fri, 31 Jul 2009 14:42:15 +0300
 
 x11proto-xext (7.0.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e198ad1..cab5209 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-input-dev, libxau-dev
 Conflicts: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
 Replaces: libxext-dev (<< 6.8.2-25), libxtst-dev (<< 6.8.2-25)
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 various extension wire protocol
  This package provides development headers describing the wire protocol
  for various extensions, the client-side libraries of which are provided

commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:53:36 2009 +0200

    xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
 	#                                    debian/*.prerm
 	>$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-	cat debian/*.shlibs >$@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:47:09 2009 +0200

    xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n "$1" ]; then
-    # does the operand contain any whitespace?
-    if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
-      # can't use die(), because I want to avoid forward references
-      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
-           "possibly malicious garbage \"$1\"" >&2
-      exit $SHELL_LIB_THROWN_ERROR
-    fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:23:53 2009 +0200

    xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-    msg
-
-  reject_whitespace "$1"
-  message "Searching for overlapping packages..."
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-    if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
-      possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-        "(xbase-clients|x11-common|xfs|xlibs)")
-      if [ -n "$possible_culprits" ]; then
-        smoking_guns=$(grep -l "$1" $possible_culprits || true)
-        if [ -n "$smoking_guns" ]; then
-          bad_packages=$(printf "\\n")
-          for f in $smoking_guns; do
-            # too bad you can't nest parameter expansion voodoo
-            p=${f%*.list}      # strip off the trailing ".list"
-            package=${p##*/}   # strip off the directories
-            bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
-          done
-          msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install".  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove".  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-          message "$msg"
-          message "The overlapping packages are: $bad_packages"
-        else
-          message "no overlaps found."
-        fi
-      fi
-    else
-      message "cannot search; no matches for $dpkg_info_dir/*.list."
-    fi
-  else
-    message "cannot search; $dpkg_info_dir does not exist."
-  fi
-}
-
 font_update () {
   # run $UPDATECMDS in $FONTDIRS
 

commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:23:06 2009 +0200

    xsfbs.sh: remove unused maplink function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-
-maplink () {
-  # returns what symlink should point to; i.e., what the "sane" answer is
-  # Keep this in sync with the debian/*.links files.
-  # This is only needed for symlinks to directories.
-  #
-  # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
-  # If we've stopped using this function, fixing it might enable us to re-enable
-  # it again and catch more errors.
-  case "$1" in
-    /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
-    /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
-    /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
-    /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
-    /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
-    /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
-    /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
-    /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
-    /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
-    /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
-    /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
-    /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
-    /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
-    /usr/bin/X11) echo ../X11R6/bin ;;
-    /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
-    /usr/include/X11) echo ../X11R6/include/X11 ;;
-    /usr/lib/X11) echo ../X11R6/lib/X11 ;;
-    *) internal_error "maplink() called with unknown path \"$1\"" ;;
-  esac
-}
-
 find_culprits () {
   local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
     msg

commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Aug 26 18:21:34 2009 +0200


Reply to: