x11proto-fixes: Changes to 'debian-unstable'

2011-06-17 Thread Steve Langasek 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d281306d06dae7801ffbcc791ff7deb486f232a
Author: Steve Langasek 
Date:   Fri Jun 17 08:49:50 2011 -0700

releasing version 1:5.0-2

diff --git a/debian/changelog b/debian/changelog
index 6752818..cccb985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x11proto-fixes (1:5.0-2) UNRELEASED; urgency=low
+x11proto-fixes (1:5.0-2) unstable; urgency=low
 
   * Mark x11proto-fixes-dev Multi-Arch: foreign
   * Install .pc file to /usr/share/pkgconfig instead of /usr/lib/pkgconfig.
 
- -- Steve Langasek   Fri, 17 Jun 2011 00:08:57 -0700
+ -- Steve Langasek   Fri, 17 Jun 2011 08:49:26 -0700
 
 x11proto-fixes (1:5.0-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qxbj5-0003sm...@vasks.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2011-06-17 Thread Steve Langasek 
 debian/changelog  |7 +++
 debian/control|1 +
 debian/x11proto-fixes-dev.install |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7fe1f463ae36e95bf2553d782e014bf19611a7f9
Author: Steve Langasek 
Date:   Fri Jun 17 00:10:00 2011 -0700

Install .pc file to /usr/share/pkgconfig instead of /usr/lib/pkgconfig.

diff --git a/debian/changelog b/debian/changelog
index 5511683..6752818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11proto-fixes (1:5.0-2) UNRELEASED; urgency=low
 
   * Mark x11proto-fixes-dev Multi-Arch: foreign
+  * Install .pc file to /usr/share/pkgconfig instead of /usr/lib/pkgconfig.
 
  -- Steve Langasek   Fri, 17 Jun 2011 00:08:57 -0700
 
diff --git a/debian/x11proto-fixes-dev.install 
b/debian/x11proto-fixes-dev.install
index 6a03d21..511bce9 100644
--- a/debian/x11proto-fixes-dev.install
+++ b/debian/x11proto-fixes-dev.install
@@ -1,3 +1,3 @@
 usr/include/X11/extensions/*
-usr/lib/pkgconfig/fixesproto.pc
+usr/lib/pkgconfig/fixesproto.pc /usr/share/pkgconfig
 usr/share/doc/fixesproto/fixesproto.txt usr/share/doc/x11proto-fixes-dev/

commit cedea193a1af40c0c8336b69bf4ea68eb4ca041f
Author: Steve Langasek 
Date:   Fri Jun 17 00:09:35 2011 -0700

Mark x11proto-fixes-dev Multi-Arch: foreign

diff --git a/debian/changelog b/debian/changelog
index b6cae29..5511683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:5.0-2) UNRELEASED; urgency=low
+
+  * Mark x11proto-fixes-dev Multi-Arch: foreign
+
+ -- Steve Langasek   Fri, 17 Jun 2011 00:08:57 -0700
+
 x11proto-fixes (1:5.0-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index d4001d7..b7577f3 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 Package: x11proto-fixes-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev, 
x11proto-xext-dev (>= 7.0.99.1)
+Multi-Arch: foreign
 Description: X11 Fixes extension wire protocol
  This package provides development headers describing the wire protocol
  for the Fixes extension, which contains a few small extensions to the


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qxtc6-00022h...@vasks.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2011-03-08 Thread Cyril Brulebois 
 COPYING  |1 
 ChangeLog|   21 
 configure.ac |2 -
 debian/changelog |8 
 debian/copyright |1 
 fixesproto.txt   |   92 ---
 xfixesproto.h|   33 +++
 xfixeswire.h |   18 --
 8 files changed, 168 insertions(+), 8 deletions(-)

New commits:
commit 95e72f38703bab96d6e6a7b9d6caf2e4934c3efa
Author: Cyril Brulebois 
Date:   Tue Mar 8 17:52:57 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index b256a6e..b6cae29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11proto-fixes (1:5.0-1) UNRELEASED; urgency=low
+x11proto-fixes (1:5.0-1) unstable; urgency=low
 
   * New upstream release:
 - Pointer barriers.
   * Update debian/copyright from upstream COPYING.
 
- -- Cyril Brulebois   Tue, 08 Mar 2011 17:47:51 +0100
+ -- Cyril Brulebois   Tue, 08 Mar 2011 17:52:51 +0100
 
 x11proto-fixes (1:4.1.2-1) unstable; urgency=low
 

commit 6e14f1f53ef2b4477969abbde0cd4983d1ca1c60
Author: Cyril Brulebois 
Date:   Tue Mar 8 17:52:49 2011 +0100

Mention “Pointer barriers” in changelog.

diff --git a/debian/changelog b/debian/changelog
index 719cb98..b256a6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11proto-fixes (1:5.0-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+- Pointer barriers.
   * Update debian/copyright from upstream COPYING.
 
  -- Cyril Brulebois   Tue, 08 Mar 2011 17:47:51 +0100

commit 48b45af4ee0499c25c68a72e364d4604d4de1f1d
Author: Cyril Brulebois 
Date:   Tue Mar 8 17:49:20 2011 +0100

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index c1e12a9..719cb98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11proto-fixes (1:5.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update debian/copyright from upstream COPYING.
 
  -- Cyril Brulebois   Tue, 08 Mar 2011 17:47:51 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 6fe99c4..45cd472 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/proto/
 
 Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright 2010 Red Hat, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

commit da0001f85ae4d923b0e19112587fe6edbab021ff
Author: Cyril Brulebois 
Date:   Tue Mar 8 17:47:58 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index c994411..e148637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+commit b8a682cc30499a751091c84efabb3012e02f47c5
+Author: Adam Jackson 
+Date:   Mon Feb 28 09:53:30 2011 -0500
+
+fixesproto 5.0
+
+Signed-off-by: Adam Jackson 
+
+commit 9760b4bdd1f9fdd6a33b9f876c4a835ed969aa84
+Author: Adam Jackson 
+Date:   Mon Nov 15 17:09:31 2010 -0500
+
+fixesproto v5: Pointer barriers
+
+v3: Review fixes:
+- INT16 not CARD16 for coordinates
+- BadDevice not BadMatch
+
+Reviewed-by: Peter Hutterer 
+Signed-off-by: Adam Jackson 
+
 commit 29324d36b3aa6697268c9b51522afcafc2244361
 Author: Alan Coopersmith 
 Date:   Fri Oct 29 21:01:26 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 33c62cf..c1e12a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:5.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois   Tue, 08 Mar 2011 17:47:51 +0100
+
 x11proto-fixes (1:4.1.2-1) unstable; urgency=low
 
   [ Julien Cristau ]

commit b8a682cc30499a751091c84efabb3012e02f47c5
Author: Adam Jackson 
Date:   Mon Feb 28 09:53:30 2011 -0500

fixesproto 5.0

Signed-off-by: Adam Jackson 

diff --git a/configure.ac b/configure.ac
index 6ae6bda..f85b802 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([FixesProto], [4.1.2],
+AC_INIT([FixesProto], [5.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 9760b4bdd1f9fdd6a33b9f876c4a835ed969aa84
Author: Adam Jackson 
Date:   Mon Nov 15 17:09:31 2010 -0500

fixesproto v5: Pointer barriers

v3: Review fixes:
- INT16 not CARD16 for coordinates
- BadDevice not BadMatch

Reviewed-by: Peter Hutterer 
Signed-off-by: Adam Jackson 

diff --git a/COPYING b/COPYING
index cdcb1ad..c8114fe 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
 Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright 2010 Red Hat, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Soft

x11proto-fixes: Changes to 'debian-unstable'

2010-11-03 Thread Cyril Brulebois 
 debian/changelog  |   12 +--
 debian/control|2 -
 debian/copyright  |   41 ++
 debian/rules  |6 ++---
 debian/x11proto-fixes-dev.install |1 
 5 files changed, 35 insertions(+), 27 deletions(-)

New commits:
commit e6bc57831533bd3ebc7809214150eb2b8bc9dbaa
Author: Cyril Brulebois 
Date:   Wed Nov 3 23:44:23 2010 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 0a8a783..33c62cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
+x11proto-fixes (1:4.1.2-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -16,7 +16,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
   * No longer pass --disable-shared, this option is gone.
   * Add myself to Uploaders.
 
- -- Robert Hooker   Tue, 02 Nov 2010 19:21:43 -0400
+ -- Cyril Brulebois   Wed, 03 Nov 2010 23:44:17 +0100
 
 x11proto-fixes (1:4.1.1-2) unstable; urgency=low
 

commit 108d1b678ef019482a7ce29854f3b85b9b11f611
Author: Cyril Brulebois 
Date:   Wed Nov 3 23:44:01 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index f8a8554..0a8a783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
 dh_installdocs.
   * Switch from --list-missing to --fail-missing for additional safety.
   * No longer pass --disable-shared, this option is gone.
+  * Add myself to Uploaders.
 
  -- Robert Hooker   Tue, 02 Nov 2010 19:21:43 -0400
 
diff --git a/debian/control b/debian/control
index 6e22a3c..d4001d7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-fixes
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Andres Salomon 

+Uploaders: David Nusinow , Andres Salomon 
, Cyril Brulebois 
 Build-Depends:
  debhelper (>= 5.0.0),
  automake,

commit e31eaf908932bce51ee367ab58a204c0df01a36d
Author: Cyril Brulebois 
Date:   Wed Nov 3 23:43:40 2010 +0100

Install fixesproto.txt with dh_install rather than with dh_installdocs.

diff --git a/debian/changelog b/debian/changelog
index 46336f0..f8a8554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Update debian/copyright.
+  * Install fixesproto.txt with dh_install rather than with
+dh_installdocs.
   * Switch from --list-missing to --fail-missing for additional safety.
   * No longer pass --disable-shared, this option is gone.
 
diff --git a/debian/rules b/debian/rules
index 527b280..238eefb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ binary-indep: build install
dh_testdir
dh_testroot
 
-   dh_installdocs fixesproto.txt
+   dh_installdocs
dh_installman
dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
diff --git a/debian/x11proto-fixes-dev.install 
b/debian/x11proto-fixes-dev.install
index 3eab5d3..6a03d21 100644
--- a/debian/x11proto-fixes-dev.install
+++ b/debian/x11proto-fixes-dev.install
@@ -1,2 +1,3 @@
 usr/include/X11/extensions/*
 usr/lib/pkgconfig/fixesproto.pc
+usr/share/doc/fixesproto/fixesproto.txt usr/share/doc/x11proto-fixes-dev/

commit 7fd0f5a0c7d7aeb6b1b82933712f1d54446f2016
Author: Cyril Brulebois 
Date:   Wed Nov 3 23:37:21 2010 +0100

No longer pass --disable-shared, this option is gone.

diff --git a/debian/changelog b/debian/changelog
index 7de06ef..46336f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Update debian/copyright.
   * Switch from --list-missing to --fail-missing for additional safety.
+  * No longer pass --disable-shared, this option is gone.
 
  -- Robert Hooker   Tue, 02 Nov 2010 19:21:43 -0400
 
diff --git a/debian/rules b/debian/rules
index a3a21b9..527b280 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
---infodir=\$${prefix}/share/info --disable-shared \
+--infodir=\$${prefix}/share/info \
 $(confflags) CFLAGS="$(CFLAGS)" 
cd build && $(MAKE)
>$@

commit 657b49c80809740a9094cd8371a8b9de8479568c
Author: Cyril Brulebois 
Date:   Wed Nov 3 23:37:08 2010 +0100

Switch from --list-missing to --fail-missing for additional safety.

diff --git a/debian/changelog b/debian/changelog
index 8b0ccb1..7de06ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Update debian/copyright.
+  *

x11proto-fixes: Changes to 'debian-unstable'

2010-11-02 Thread Cyril Brulebois 
 ChangeLog |  116 ++
 1 file changed, 116 insertions(+)

New commits:
commit 73719d7328f2d446ee1da709740ea863168f8e88
Author: Cyril Brulebois 
Date:   Wed Nov 3 00:50:47 2010 +0100

Update upstream changelog as well.

diff --git a/ChangeLog b/ChangeLog
index 7474b88..c994411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+commit 29324d36b3aa6697268c9b51522afcafc2244361
+Author: Alan Coopersmith 
+Date:   Fri Oct 29 21:01:26 2010 -0700
+
+fixesproto 4.1.2
+
+Signed-off-by: Alan Coopersmith 
+
+commit d3dc092d123139bdb0db40fde42fc9a9f4ee6a9c
+Author: Alan Coopersmith 
+Date:   Fri Oct 29 20:59:41 2010 -0700
+
+Sun's copyrights now belong to Oracle
+
+Signed-off-by: Alan Coopersmith 
+
+commit 66c8619be99d10de5969371ff6ccf08088bffdff
+Author: Gaetan Nadon 
+Date:   Sun Mar 28 19:00:30 2010 -0400
+
+config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+Automake always includes it in the tarball.
+
+Signed-off-by: Gaetan Nadon 
+
+commit f7cd767d6f1d1f42da3c4e50ea414fe9716ac240
+Author: Alan Coopersmith 
+Date:   Fri Jan 15 13:29:22 2010 -0800
+
+Update Sun license notices to current X.Org standard form
+
+Signed-off-by: Alan Coopersmith 
+
+commit ef0cad8cf54d1a672983ffac213cdca99fa9151e
+Author: Rémi Cardona 
+Date:   Thu Dec 17 08:35:10 2009 +0100
+
+Use $(docdir) for fixesproto.txt install path
+
+Signed-off-by: Rémi Cardona 
+Reviewed-by: Gaetan Nadon 
+Reviewed-by: Alan Coopersmith 
+Reviewed-by: Dan Nicholson 
+
+commit 8b518027c4243101a7da00b3a9419d63ece1c782
+Author: Gaetan Nadon 
+Date:   Sun Nov 22 19:24:48 2009 -0500
+
+Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+Now that the INSTALL file is generated.
+Allows running make maintainer-clean.
+
+commit 36ed341de07d5c4df48116c3fcdbb6b9a432e5fe
+Author: Gaetan Nadon 
+Date:   Mon Nov 16 16:10:15 2009 -0500
+
+INSTALL file is missing or incorrect #24206
+
+The file is copied from util-macros.
+The copy in git is removed.
+
+commit 8c866c15f1898105d7ee09ad3d8ed38213e76338
+Author: Gaetan Nadon 
+Date:   Mon Nov 16 11:10:10 2009 -0500
+
+README: file created or updated #24206
+
+Contains a set of URLs to freedesktop.org.
+
+commit 7f1bfe8c784db325ae532f54823ef07767e0a5ad
+Author: Gaetan Nadon 
+Date:   Sun Nov 15 20:28:56 2009 -0500
+
+NEWS: remove empty file #24206
+
+commit e7f981e0994f748faada122f8592359e8cb42c85
+Author: Gaetan Nadon 
+Date:   Sun Nov 15 19:45:26 2009 -0500
+
+Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ChangeLog filename is known to Automake and requires no further
+coding in the makefile.
+
+commit 2beee4825c0f1605988808c3bf9cd1347f6e3c02
+Author: Gaetan Nadon 
+Date:   Sun Nov 15 18:31:28 2009 -0500
+
+Makefile.am: INSTALL file is missing or incorrect #24206
+
+The standard GNU file on building/installing  tarball is copied
+using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
+Add INSTALL target
+
+commit a76d9bcc9d07aa64cfcb31624702efb444ae5109
+Author: Gaetan Nadon 
+Date:   Sun Nov 15 18:11:36 2009 -0500
+
+configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
+
+This macro aggregate a number of existing macros that sets commmon
+X.Org components configuration options. It shields the configuration file 
from
+future changes.
+
+commit 3907b71be026b126565e3859239032c6f437185d
+Author: Gaetan Nadon 
+Date:   Sat Nov 14 18:26:46 2009 -0500
+
+.gitignore: use common defaults with custom section # 24239
+
+Using common defaults will reduce errors and maintenance.
+Only the very small or inexistent custom section need periodic maintenance
+when the structure of the component changes. Do not edit defaults.
+
 commit 88cd481b5349fe4962ac609c8711a17d4323e42a
 Author: Peter Hutterer 
 Date:   Tue Oct 6 12:13:58 2009 +1000


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pdqct-0005oi...@alioth.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2010-11-02 Thread Robert Hooker 
 .gitignore   |   77 ++-
 COPYING  |   21 +++
 INSTALL  |8 -
 Makefile.am  |   14 +-
 README   |9 +-
 configure.ac |8 +++--
 debian/changelog |8 -
 xfixesproto.h|   38 ++-
 xfixeswire.h |   38 ++-
 9 files changed, 156 insertions(+), 65 deletions(-)

New commits:
commit d37a9b6ab60b8e05846ab60e48917daffcc55bec
Author: Robert Hooker 
Date:   Tue Nov 2 19:22:14 2010 -0400

Update changelog.

diff --git a/debian/changelog b/debian/changelog
index a6c371d..6f60d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-x11proto-fixes (1:4.1.1-3) UNRELEASED; urgency=low
+x11proto-fixes (1:4.1.2-1) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
- -- Julien Cristau   Sat, 16 Jan 2010 16:47:49 +
+  [ Robert Hooker ]
+  * New upstream release.
+
+ -- Robert Hooker   Tue, 02 Nov 2010 19:21:43 -0400
 
 x11proto-fixes (1:4.1.1-2) unstable; urgency=low
 

commit 29324d36b3aa6697268c9b51522afcafc2244361
Author: Alan Coopersmith 
Date:   Fri Oct 29 21:01:26 2010 -0700

fixesproto 4.1.2

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 04a9feb..6ae6bda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([FixesProto], [4.1.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FixesProto], [4.1.2],
+[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit d3dc092d123139bdb0db40fde42fc9a9f4ee6a9c
Author: Alan Coopersmith 
Date:   Fri Oct 29 20:59:41 2010 -0700

Sun's copyrights now belong to Oracle

Signed-off-by: Alan Coopersmith 

diff --git a/COPYING b/COPYING
index 6f42002..cdcb1ad 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/xfixesproto.h b/xfixesproto.h
index d7d7bed..ed872d1 100644
--- a/xfixesproto.h
+++ b/xfixesproto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/xfixeswire.h b/xfixeswire.h
index 3342753..7b43f09 100644
--- a/xfixeswire.h
+++ b/xfixeswire.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

commit 66c8619be99d10de5969371ff6ccf08088bffdff
Author: Gaetan Nadon 
Date:   Sun Mar 28 19:00:30 2010 -0400

config: remove the pkgconfig pc.in file from EXTRA_DIST

Automake always includes it in the tarball.

Signed-off-by: Gaetan Nadon 

diff --git a/Makefile.am b/Makefile.am
index 25f0fff..f1716b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,6 @@ dist_doc_DATA = fixesproto.txt
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fixesproto.pc
 
-EXTRA_DIST = fixesproto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 

commit f7cd767d6f1d1f42da3c4e50ea414fe9716ac240
Author: Alan Coopersmith 
Date:   Fri Jan 15 13:29:22 2010 -0800

Update Sun license notices to current X.Org standard form

Signed-off-by: Alan Coopersmith 

diff --git a/COPYING b/COPYING
index a97b6e6..6f42002 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,24 @@
+Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
+
+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, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) 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 WARR

x11proto-fixes: Changes to 'debian-unstable'

2010-05-07 Thread Mikhail Gusarov 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 184b57d0eeb50f6600e472bb4125beee6fe070ac
Author: Mikhail Gusarov 
Date:   Fri May 7 18:58:51 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index cafaf5b..6e22a3c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,5 @@ Description: X11 Fixes extension wire protocol
  .
  More information about X.Org can be found at:
  http://www.X.org>
- http://xorg.freedesktop.org>
- http://lists.freedesktop.org/mailman/listinfo/xorg>
  .
  This package is built from the X.org fixesproto proto module.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oamif-00021s...@alioth.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2010-01-22 Thread Julien Cristau 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5065d37b28052973199e76db1b6757b3890e8d93
Author: Julien Cristau 
Date:   Sat Jan 23 01:46:47 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 41cbe4d..a6c371d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-fixes (1:4.1.1-3) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:49 +
 
diff --git a/debian/control b/debian/control
index 8d04d56..cafaf5b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-fixes
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Andres Salomon 
, Julien Cristau 
+Uploaders: David Nusinow , Andres Salomon 

 Build-Depends:
  debhelper (>= 5.0.0),
  automake,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/rules |   10 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 4d945501be80d859d29ed320e9ff1347897f8938
Author: Julien Cristau 
Date:   Sat Jan 16 16:49:01 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 80b87c8..41cbe4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-fixes (1:4.1.1-3) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau   Sat, 16 Jan 2010 16:47:49 +
+
 x11proto-fixes (1:4.1.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/rules b/debian/rules
index 8de961c..9ef0a5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
 build-stamp:
dh_testdir
autoreconf -vfi
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE) && \
+   mkdir -p build
+   cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info --disable-shared \
 $(confflags) CFLAGS="$(CFLAGS)" 
-   cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+   cd build && $(MAKE)
>$@
 
 clean:
@@ -53,7 +53,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f aclocal.m4 configure install-sh missing mkinstalldirs
rm -f config.guess config.sub
find -name Makefile.in -delete
@@ -66,7 +66,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-independent files here.
 binary-indep: build install


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2010-01-06 Thread Julien Cristau 
 debian/changelog |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 8bf4778659adbf6addbf4c0fe2b25bb809a18932
Author: Julien Cristau 
Date:   Wed Jan 6 12:29:51 2010 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 64f2a3e..80b87c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:4.1.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau   Wed, 06 Jan 2010 12:30:52 +
+
 x11proto-fixes (1:4.1.1-1) experimental; urgency=low
 
   [ Timo Aaltonen ]

commit 722bfd73f089be2d895a61c806f41920d4346693
Author: Julien Cristau 
Date:   Thu Nov 26 13:47:51 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d1b4643..64f2a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
+x11proto-fixes (1:4.1.1-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release (closes: #556003).
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
- -- Timo Aaltonen   Fri, 20 Nov 2009 15:11:48 +0200
+ -- Julien Cristau   Thu, 26 Nov 2009 13:47:49 +0100
 
 x11proto-fixes (1:4.1-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-21 Thread Timo Aaltonen 
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6e3d7541c1581d09c9945a585094b7fae765d0cf
Author: Timo Aaltonen 
Date:   Sat Nov 21 13:52:47 2009 +0200

Bump the build-dep on xutils-dev (>= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index 31e1d0f..d1b4643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release (closes: #556003).
+  * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
  -- Timo Aaltonen   Fri, 20 Nov 2009 15:11:48 +0200
 
diff --git a/debian/control b/debian/control
index b060752..8d04d56 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Andres Salomon 
= 5.0.0),
  automake,
- xutils-dev
+ xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-21 Thread Julien Cristau 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 511e57918725539ec4fabf2fb01b8bd1db4011e7
Author: Julien Cristau 
Date:   Sat Nov 21 12:41:18 2009 +0100

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index 530a06e..31e1d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release (closes: #556003).
 
  -- Timo Aaltonen   Fri, 20 Nov 2009 15:11:48 +0200
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-21 Thread Julien Cristau 
 debian/rules |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cbd617fdd79823c87fb028192f467bac53c90c14
Author: Julien Cristau 
Date:   Sat Nov 21 12:04:00 2009 +0100

Remove config.* in debian/rules clean

diff --git a/debian/rules b/debian/rules
index 57299e7..8de961c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,7 @@ clean:
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
rm -f aclocal.m4 configure install-sh missing mkinstalldirs
+   rm -f config.guess config.sub
find -name Makefile.in -delete
 
dh_clean


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-20 Thread Timo Aaltonen 
 ChangeLog |   57 +
 1 file changed, 57 insertions(+)

New commits:
commit 3f60b51ff291a06b2bafd3402d088b7a51bfa577
Author: Timo Aaltonen 
Date:   Fri Nov 20 17:06:32 2009 +0200

Update the ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 9725eea..7474b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+commit 88cd481b5349fe4962ac609c8711a17d4323e42a
+Author: Peter Hutterer 
+Date:   Tue Oct 6 12:13:58 2009 +1000
+
+fixesproto 4.1.1
+
+Signed-off-by: Peter Hutterer 
+
+commit d76dd3834a9443ed2237fc26d6eff1cc429606b5
+Author: Peter Hutterer 
+Date:   Tue Oct 6 12:16:30 2009 +1000
+
+Remove RCS tags
+
+Signed-off-by: Peter Hutterer 
+
+commit 9fe9e1abb2ff3c839a6049fea39adf6d753c09c3
+Author: Peter Hutterer 
+Date:   Tue Oct 6 12:13:11 2009 +1000
+
+Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Peter Hutterer 
+
+commit 39d4e91171de13d4b7079d4609e7930e32948d99
+Author: Alan Coopersmith 
+Date:   Mon Oct 5 19:21:42 2009 -0700
+
+Add README with pointers to mailing lists, bugzilla, & git
+
+Also correct INSTALL to list the right extension name
+
+Signed-off-by: Alan Coopersmith 
+
+commit 50921252322e05fea4f0f85c8ae8735b6df11860
+Author: Peter Hutterer 
+Date:   Fri Jul 31 08:53:51 2009 +1000
+
+Document behaviour of CursorNotifies with XI2 servers.
+
+CursorNotifies are only sent for the ClientPointer to avoid confusion in 
the
+client.
+
+Signed-off-by: Peter Hutterer 
+
+commit beebe5339ee97b36c3d5b2a5c2b2f140d03f2003
+Author: Peter Hutterer 
+Date:   Fri Jul 31 08:21:14 2009 +1000
+
+Hide/ShowCursor works on all master pointers in XI2.
+
+Servers supporting XI2 will hide all cursors when a client requests
+HideCursor. This is arguably closest to the original intent of the request 
-
+to not display a cursor above the given window.
+
+Signed-off-by: Peter Hutterer 
+
 commit 9a3f2e436481face8e79c80bffdfb3e00b48eeab
 Author: Adam Jackson 
 Date:   Thu Jul 23 08:44:54 2009 -0400


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-20 Thread Timo Aaltonen 
 debian/xsfbs/xsfbs.mk |   17 ++---
 debian/xsfbs/xsfbs.sh |4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
  <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau 
Date:   Fri Sep 25 15:33:39 2009 +0200

xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper 
operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # "GOBSTOPPER".
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

x11proto-fixes: Changes to 'debian-unstable'

2009-11-20 Thread Timo Aaltonen 
 .gitignore   |6 +-
 COPYING  |2 --
 ChangeLog|   32 
 INSTALL  |4 ++--
 Makefile.am  |   13 ++---
 README   |   32 
 configure.ac |9 +
 debian/changelog |   12 ++--
 debian/control   |2 +-
 fixesproto.pc.in |1 +
 fixesproto.txt   |   21 +
 xfixesproto.h|6 +-
 xfixeswire.h |2 --
 13 files changed, 108 insertions(+), 34 deletions(-)

New commits:
commit 9297f4c472970b4950df13b6c44c47b6d5d05335
Author: Timo Aaltonen 
Date:   Fri Nov 20 15:12:13 2009 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 5609c2a..530a06e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:4.1.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Fri, 20 Nov 2009 15:11:48 +0200
+
 x11proto-fixes (1:4.1-1) experimental; urgency=low
 
   [ Timo Aaltonen ]

commit 88cd481b5349fe4962ac609c8711a17d4323e42a
Author: Peter Hutterer 
Date:   Tue Oct 6 12:13:58 2009 +1000

fixesproto 4.1.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index da5bc3e..d468ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([FixesProto], [4.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FixesProto], [4.1.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit d76dd3834a9443ed2237fc26d6eff1cc429606b5
Author: Peter Hutterer 
Date:   Tue Oct 6 12:16:30 2009 +1000

Remove RCS tags

Signed-off-by: Peter Hutterer 

diff --git a/COPYING b/COPYING
index d2d23d5..a97b6e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,3 @@
-$Id: COPYING,v 1.1 2003-10-09 01:48:22 keithp Exp $
-
 Copyright © 2001,2003 Keith Packard
 
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Makefile.am b/Makefile.am
index 3b0ff24..2991f95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
 # 
-#  $Id: Makefile.am,v 1.1 2003-10-09 01:48:22 keithp Exp $
-# 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
 #  Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index c91c4a3..da5bc3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-dnl  
-dnl  $Id: configure.ac,v 1.7 2004-07-26 17:17:33 keithp Exp $
 dnl 
 dnl  Copyright © 2003 Keith Packard, Noah Levitt
 dnl 
diff --git a/xfixesproto.h b/xfixesproto.h
index 545e325..1e9a983 100644
--- a/xfixesproto.h
+++ b/xfixesproto.h
@@ -1,6 +1,4 @@
 /*
- * $XFree86: xc/include/extensions/xfixesproto.h,v 1.1 2002/11/30 06:21:43 
keithp Exp $
- *
  * Copyright � 2006 Sun Microsystems
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixeswire.h b/xfixeswire.h
index 6f20270..72e84a7 100644
--- a/xfixeswire.h
+++ b/xfixeswire.h
@@ -1,6 +1,4 @@
 /*
- * $XFree86: xc/include/extensions/xfixeswire.h,v 1.1 2002/11/30 06:21:43 
keithp Exp $
- *
  * Copyright � 2006 Sun Microsystems
  *
  * Permission to use, copy, modify, distribute, and sell this software and its

commit 9fe9e1abb2ff3c839a6049fea39adf6d753c09c3
Author: Peter Hutterer 
Date:   Tue Oct 6 12:13:11 2009 +1000

Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 0d422d4..c91c4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,10 @@ AC_INIT([FixesProto], [4.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# 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
fixesproto.pc])

commit 39d4e91171de13d4b7079d4609e7930e32948d99
Author: Alan Coopersmith 
Date:   Mon Oct 5 19:21:42 2009 -0700

Add README with pointers to mailing lists, bugzilla, & git

Also correct INSTALL to list the right extension name

Signed-off-by: Alan Coopersmith 

diff --git a/INSTALL b/INSTALL
index b94098a..3b1329a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-Render is built with the traditional configure script:
+xfixesproto is built with the traditional configure script:
 
-   $ ./configure --prefix=/usr/X11R6
+   $ ./configure --prefix=/usr
 
 This should generate valid Makefiles, then:
 
diff --git a/REA

x11proto-fixes: Changes to 'debian-unstable'

2009-09-06 Thread Julien Cristau 
 Makefile.in   |  491 ---
 aclocal.m4|  585 -
 configure | 3129 --
 debian/changelog  |9 
 debian/compat |2 
 debian/control|   10 
 debian/rules  |   16 
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 ---
 install-sh|  323 -
 missing   |  360 -
 mkinstalldirs |  111 -
 12 files changed, 24 insertions(+), 5245 deletions(-)

New commits:
commit 58f87b00ad902a88da6b0d15bdd29510d3439f5f
Author: Julien Cristau 
Date:   Sun Sep 6 12:16:44 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 095ef5a..bb0f4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11proto-fixes (1:4.0-4) UNRELEASED; urgency=low
   * Bump debhelper compat level to 5.
   * Drop Conflicts/Replaces on libxfixes-dev and Pre-Depends on x11-common.
 This was only needed for upgrades from sarge.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Fri, 31 Jul 2009 14:31:46 +0300
 
diff --git a/debian/control b/debian/control
index 48cbac9..221d278 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5.0.0),
  automake,
  xutils-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 

commit 9a84703d90a0c45150a0445cbb5fbc212aa2680f
Author: Julien Cristau 
Date:   Sun Sep 6 12:15:01 2009 +0200

Drop Conflicts/Replaces on libxfixes-dev and Pre-Depends on x11-common.

This was only needed for upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 6d8163d..095ef5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ x11proto-fixes (1:4.0-4) UNRELEASED; urgency=low
   * Run autoreconf at build time.
   * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
   * Bump debhelper compat level to 5.
+  * Drop Conflicts/Replaces on libxfixes-dev and Pre-Depends on x11-common.
+This was only needed for upgrades from sarge.
 
  -- Timo Aaltonen   Fri, 31 Jul 2009 14:31:46 +0300
 
diff --git a/debian/control b/debian/control
index db18c75..48cbac9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,6 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 Package: x11proto-fixes-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev, 
x11proto-xext-dev
-Conflicts: libxfixes-dev (<< 6.8.2-16)
-Replaces: libxfixes-dev (<< 6.8.2-16)
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Fixes extension wire protocol
  This package provides development headers describing the wire protocol
  for the Fixes extension, which contains a few small extensions to the

commit 3c8b0ba503bc9a60269a2fa31db7d678251fc2f2
Author: Julien Cristau 
Date:   Sun Sep 6 12:11:29 2009 +0200

Bump debhelper compat level to 5.

diff --git a/debian/changelog b/debian/changelog
index 74c92f6..6d8163d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11proto-fixes (1:4.0-4) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Run autoreconf at build time.
   * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
+  * Bump debhelper compat level to 5.
 
  -- Timo Aaltonen   Fri, 31 Jul 2009 14:31:46 +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 5e93750..db18c75 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Andres Salomon 
, Julien Cristau 
 Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 5.0.0),
  automake,
  xutils-dev
 Standards-Version: 3.8.1

commit 1317ac1718127a7ca557fc9b11676dde5e949a4c
Author: Julien Cristau 
Date:   Sun Sep 6 12:11:09 2009 +0200

Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.

diff --git a/debian/changelog b/debian/changelog
index 544eb65..74c92f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-fixes (1:4.0-4) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Run autoreconf at build time.
+  * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
 
  -- Timo Aaltonen   Fri, 31 Jul 2009 14:31:46 +0300
 
diff --git a/debian/rules b/debian/rules
index dd497bf..57299e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,14 @@ PACKAGE = x11proto-fixes-dev
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$

x11proto-fixes: Changes to 'debian-unstable'

2009-07-31 Thread Timo Aaltonen 
 debian/README.source   |   73 
 debian/changelog   |6 
 debian/control |2 
 debian/xsfbs/repack.sh |   32 +++
 debian/xsfbs/xsfbs.mk  |   47 +
 debian/xsfbs/xsfbs.sh  |  417 +
 6 files changed, 312 insertions(+), 265 deletions(-)

New commits:
commit 9495f5d9393e13311ea166150a8e9d1b675430ac
Author: Timo Aaltonen 
Date:   Fri Jul 31 14:32:57 2009 +0300

Bump Standards-Version

diff --git a/debian/changelog b/debian/changelog
index 92fc50c..513b37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:4.0-4) UNRELEASED; urgency=low
+
+  * Add README.source from xsfbs.  Bump Standards-Version to 3.8.1.
+
+ -- Timo Aaltonen   Fri, 31 Jul 2009 14:31:46 +0300
+
 x11proto-fixes (1:4.0-3) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 5db15e8..342a806 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Andres Salomon 
, Julien Cristau 
 Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 

commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau 
Date:   Wed Jun 3 03:37:37 2009 +0200

Kill custom readlink function

This was needed for very, very old versions of debianutils.
Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
-  message "The readlink command was not found.  Please install version" \
-  "1.13.1 or later of the debianutils package."
-  readlink () {
-# returns what symlink in $1 actually points to
-perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless 
$r; print "$r\n"' "$1"
-  }
-fi
-
 check_symlink () {
   # syntax: check_symlink symlink
   #

commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau 
Date:   Tue May 26 15:58:19 2009 +0200

xsfbs: don't run dpkg --print-installation-architecture

This is deprecated in new dpkg, and had no users anyway.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
   exit $SHELL_LIB_USAGE_ERROR
 fi
 
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
 if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
   RECONFIGURE="true"
 else

commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow 
Date:   Mon May 25 20:08:50 2009 -0400

Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+--
+Quick Guide To Patching This Package For The Impatient
+--
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit" 
+   (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.
+
+
+Guide To The X Strike Force Packages
+
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian

x11proto-fixes: Changes to 'debian-unstable'

2008-05-11 Thread Julien Cristau 
 debian/changelog |   10 +-
 debian/control   |8 +-
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|  107 ---
 debian/xsfbs/xsfbs.sh|7 -
 5 files changed, 29 insertions(+), 253 deletions(-)

New commits:
commit c1acdce87bf201282af658f74c87ac046c1f36a5
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 18:22:56 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 87c9533..92fc50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
+x11proto-fixes (1:4.0-3) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
@@ -15,7 +15,7 @@ x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
   * Update the long description.
   * Add URL in debian/copyright.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:08:17 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 11 May 2008 18:22:51 +0200
 
 x11proto-fixes (4.0-2) unstable; urgency=low
 

commit d90073592b524b99914a8f2cdb2a5c225441478a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun May 11 18:20:57 2008 +0200

debian/control updates

* Use Vcs-* instead of XS-Vcs-*.
* Remove Branden from Uploaders with his permission.
* Add myself to Uploaders.
* Bump Standards-Version to 3.7.3.

diff --git a/debian/changelog b/debian/changelog
index 545fbbe..87c9533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Install the protocol description and the upstream changelog.
   * Update debian/copyright.
-  * Add XS-Vcs-*, remove obsolete CVS info from the description.
-  * Remove Fabio from Uploaders with his permission.
+  * Add Vcs-*, remove obsolete CVS info from the description.
+  * Remove Branden and Fabio from Uploaders with their permission.
+  * Add myself to Uploaders.
+  * Bump Standards-Version to 3.7.3.
 
   [ Brice Goglin ]
   * Update the long description.
diff --git a/debian/control b/debian/control
index 56ef764..5db15e8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,11 @@ Source: x11proto-fixes
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Andres Salomon <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 
 Package: x11proto-fixes-dev
 Architecture: all

commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Sun Apr 13 03:12:18 2008 +0200

Remove xsfbs-autoreconf.mk

It has never been used, and that doesn't look likely to change.

diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or .
-
-# The idea behind this is storing changes produced by autoreconf as a 
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after 
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFIL

x11proto-fixes: Changes to 'debian-unstable'

2007-08-13 Thread Brice Goglin 
 debian/changelog |6 +-
 debian/control   |8 ++--
 debian/copyright |3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit ec3b684dbecd2f6df6c7a32f49440ee6216a35fd
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Aug 14 00:27:35 2007 +0200

Various fixed in debian/control and copyright

diff --git a/debian/changelog b/debian/changelog
index 18603a1..545fbbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
   * Add XS-Vcs-*, remove obsolete CVS info from the description.
   * Remove Fabio from Uploaders with his permission.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 04 May 2007 11:28:07 +0200
+  [ Brice Goglin ]
+  * Update the long description.
+  * Add URL in debian/copyright.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 14 Aug 2007 00:08:17 +0200
 
 x11proto-fixes (4.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 76a572e..56ef764 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,13 @@ Conflicts: libxfixes-dev (<< 6.8.2-16)
 Replaces: libxfixes-dev (<< 6.8.2-16)
 Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Fixes extension wire protocol
- This package provides the wire protocol for the Fixes extension, which 
contains
- a few small extensions to the X protocol, including a Region type.
+ This package provides development headers describing the wire protocol
+ for the Fixes extension, which contains a few small extensions to the
+ X protocol, including a Region type.
  .
  More information about X.Org can be found at:
+ http://www.X.org>
  http://xorg.freedesktop.org>
  http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org fixesproto proto module.
diff --git a/debian/copyright b/debian/copyright
index 9c3f259..4628843 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/proto/
+
 $Id$
 
 Copyright © 2001,2003 Keith Packard


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

x11proto-fixes: Changes to 'debian-unstable'

2007-05-04 Thread Julien Cristau 
 .gitignore   |   11 
 AUTHORS  |1 
 COPYING  |2 
 ChangeLog|  139 +
 INSTALL  |8 
 Makefile.am  |   29 +
 README   |   10 
 configure.ac |   27 +
 debian/changelog |9 
 debian/control   |7 
 debian/copyright |   19 
 debian/rules |4 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ++
 debian/xsfbs/xsfbs.mk|  379 
 debian/xsfbs/xsfbs.sh|  907 +++
 fixesproto.pc.in |4 
 fixesproto.txt   |  564 
 xfixesproto.h|4 
 xfixeswire.h |4 
 19 files changed, 2255 insertions(+), 23 deletions(-)

New commits:
commit edcb2b789efb7875266eaefb7b609efe2deeb311
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri May 4 11:29:37 2007 +0200

Misc packaging fixes

* Install the protocol description and the upstream changelog.
* Update debian/copyright.
* Add XS-Vcs-*, remove obsolete CVS info from the description.
* Remove Fabio from Uploaders with his permission.

diff --git a/debian/changelog b/debian/changelog
index 6a983a5..18603a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 11:33:46 +0300
+  [ Julien Cristau ]
+  * Install the protocol description and the upstream changelog.
+  * Update debian/copyright.
+  * Add XS-Vcs-*, remove obsolete CVS info from the description.
+  * Remove Fabio from Uploaders with his permission.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 04 May 2007 11:28:07 +0200
 
 x11proto-fixes (4.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 04dfecb..76a572e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: x11proto-fixes
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Andres Salomon <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 4.0.0)
 Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-fixes
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-fixes.git
 
 Package: x11proto-fixes-dev
 Architecture: all
@@ -19,6 +21,3 @@ Description: X11 Fixes extension wire protocol
  More information about X.Org can be found at:
  http://xorg.freedesktop.org>
  http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'proto/Fixes' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg
diff --git a/debian/copyright b/debian/copyright
index 4ee13ed..9c3f259 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,3 +20,22 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
+Copyright © 2006 Sun Microsystems
+
+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, and that the name of Sun Microsystems not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Sun Microsystems makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/debian/rules b/debian/rules
index 04e933b..618388e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,10 +70,10 @@ binary-indep: build install
dh_testdir
dh_testroot
 
-   dh_installdocs
+   dh_installdocs fixesproto.txt
dh_installman
dh_install --sourcedir=debian/tmp --list-missing
-   dh_installchangelogs
+   dh_installchangelogs ChangeLog
dh_link

x11proto-fixes: Changes to 'debian-unstable'

2007-05-04 Thread Timo Aaltonen 
 debian/changelog |6 ++
 1 files changed, 6 insertions(+)

New commits:
commit 96f1c8118602739a8308e73d3d95cec10e7e2941
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Fri May 4 11:35:04 2007 +0300

Bump the epoch so that this can be synced to Ubuntu in the future.

diff --git a/debian/changelog b/debian/changelog
index 5bc5574..6a983a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-fixes (1:4.0-3) UNRELEASED; urgency=low
+
+  * Bump the epoch so that this can be synced to Ubuntu in the future.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 11:33:46 +0300
+
 x11proto-fixes (4.0-2) unstable; urgency=low
 
   [ Drew Parsons ]


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

x11proto-fixes: Changes to 'debian-unstable'

2007-01-14 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit ffc3dc61e1cbb64c5a928f73af54ba980a77315d
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit 8c39e48f9438ff6f58d21247d1cfc8ec1cf261a3
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Sep 18 21:41:33 2006 +

* Prepare changelog for upload to unstable. It'll be staged to gluck first,
  then uploaded once the porters have had a crack at extra drivers

commit ca9598334067ff9052a86e8c2586018e7f0d45ae
Author: Drew Parsons <[EMAIL PROTECTED]>
Date:   Mon Sep 18 07:18:12 2006 +

Sync x11proto-fixes with xfixes 4 from experimental.

commit b5ae9db688fd5516837c0e9a9ce330772ff0657c
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Aug 27 23:55:36 2006 +

Rename the protocol dirs to match the debian package names, like the other 
packages in the repo

commit 330ee8824b17b8bbbe59570ef6cbc31e21a0f304
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Mar 24 02:44:27 2006 +

Prepare protocol headers for upload to unstable. Tags to follow.

commit 652e29ddab56ac76ad2d99be4f8fd5d9b398eb9e
Author: Michel Dänzer <[EMAIL PROTECTED]>
Date:   Thu Feb 9 16:08:24 2006 +

Add epoch to versioned Pre-Depends on x11-common to make upgrades from
monolithic x11-common work.

commit 9da057beb71d9833e2a8861da55cdc5fc0193f0f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Jan 23 02:45:38 2006 +

Set protocol headers to be uploaded to experimental

commit 8aedfc5c4a8ffa6fd55c40336ec8b2028d61ff2d
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Dec 30 19:37:27 2005 +

Update proto headers to 7.0 with packaging

commit 4214edd037bbb3e25ca6ec44bac19d2aa87f9ab3
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Dec 30 00:24:15 2005 +

Vendor drop of proto and lib for 7.0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]