xorg-server: Changes to 'debian-experimental'

2016-11-16 Thread Andreas Boll 
 configure.ac   |6 +++---
 debian/changelog   |3 ++-
 dix/dispatch.c |2 +-
 hw/xfree86/dri2/pci_ids/i965_pci_ids.h |   32 +---
 hw/xwayland/xwayland-shm.c |   10 ++
 include/dixstruct.h|2 +-
 6 files changed, 34 insertions(+), 21 deletions(-)

New commits:
commit 20489c89c893fca4b614350901249039b0e1e5d3
Author: Andreas Boll 
Date:   Wed Nov 16 14:29:17 2016 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 696cd2f..9d6b1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.18.99.902-2) UNRELEASED; urgency=medium
+xorg-server (2:1.19.0-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
 
  -- Andreas Boll   Mon, 07 Nov 2016 14:55:16 +0100

commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c
Author: Keith Packard 
Date:   Tue Nov 15 08:12:05 2016 -0800

Bump version to 1.19.0

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 395df80..f7ab48c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-10-28"
-RELEASE_NAME="Shigoku"
+AC_INIT([xorg-server], 1.19.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-11-15"
+RELEASE_NAME="Cioppino"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit ea8efb3a997e15d27d362762e6c85d59487f9864
Author: Keith Packard 
Date:   Wed Nov 2 13:25:33 2016 -0700

dix: Make sure client is not in output_pending chain after closed (RH 
1382444)

I think it is possible that output could get queued to a client during
CloseDownClient. After it is removed from the pending queue, active
grabs are released, the client is awoken if sleeping and any work
queue entries related to the client are processed.

To fix this, move the call removing it from the output_pending chain
until after clientGone has been set and then check clientGone in
output_pending_mark.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444
Signed-off-by: Keith Packard 
Reviewed-by: Hans de Goede 

diff --git a/dix/dispatch.c b/dix/dispatch.c
index e111377..3d0fe26 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3406,7 +3406,6 @@ CloseDownClient(ClientPtr client)
 UngrabServer(client);
 }
 mark_client_not_ready(client);
-xorg_list_del(>output_pending);
 BITCLEAR(grabWaiters, client->index);
 DeleteClientFromAnySelections(client);
 ReleaseActiveGrabs(client);
@@ -3435,6 +3434,7 @@ CloseDownClient(ClientPtr client)
 if (ClientIsAsleep(client))
 ClientSignal(client);
 ProcessWorkQueueZombies();
+output_pending_clear(client);
 CloseDownConnection(client);
 
 /* If the client made it to the Running stage, nClients has
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 3b578f8..d71b0ac 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -159,7 +159,7 @@ extern struct xorg_list output_pending_clients;
 static inline void
 output_pending_mark(ClientPtr client)
 {
-if (xorg_list_is_empty(>output_pending))
+if (!client->clientGone && xorg_list_is_empty(>output_pending))
 xorg_list_append(>output_pending, _pending_clients);
 }
 

commit 7513da40a656317ad3aa101651d29373de99c798
Author: Timo Aaltonen 
Date:   Wed Nov 2 17:18:11 2016 +0200

dri2: Sync i965_pci_ids.h from mesa

Import changes from these mesa commits:
85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as 
Kabylake.
bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
d1ab544bb883d04 i965/chv: Display proper branding
20e8ee36627f874 i965/skl: Update Skylake renderer strings
644c8a515192d28 i965/skl: Add two missing device IDs

Reviewed-by: Adam Jackson 
Signed-off-by: Timo Aaltonen 

diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h 
b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
index 5139e27..1566afd 100644
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
@@ -112,6 +112,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
 CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
 CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")

xorg-server: Changes to 'debian-experimental'

2016-11-07 Thread Andreas Boll 
 debian/changelog |6 ++
 debian/rules |1 +
 2 files changed, 7 insertions(+)

New commits:
commit bdcb4df61e74f395f108e3cbbb9104564d1e30cc
Author: Andreas Boll 
Date:   Mon Nov 7 14:55:35 2016 +0100

rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.

diff --git a/debian/changelog b/debian/changelog
index b86d1e5..696cd2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.99.902-2) UNRELEASED; urgency=medium
+
+  * rules: Explicitly disable glamor on hurd. Should fix FTBFS on hurd.
+
+ -- Andreas Boll   Mon, 07 Nov 2016 14:55:16 +0100
+
 xorg-server (2:1.18.99.902-1) experimental; urgency=medium
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 1f8c783..3515c84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,7 @@ endif
 
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2
+   dri += --disable-glamor
xshmfence = --disable-xshmfence
 else
dri = --enable-dri --enable-dri2

xorg-server: Changes to 'debian-experimental'

2016-11-05 Thread Emilio Pozuelo Monfort 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a939b81ca348fb246ea162ff0a19c4abbe85e67c
Author: Emilio Pozuelo Monfort 
Date:   Sat Nov 5 19:57:04 2016 +0100

Release to experimental

diff --git a/debian/changelog b/debian/changelog
index d1e079a..b86d1e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.99.902-1) experimental; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream release candidate 1.
@@ -16,7 +16,7 @@ xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
   * control: Bump x11proto-core-dev requirement.
   * control: Add wayland-protocols build-dep on linux for Xwayland.
 
- -- Timo Aaltonen   Wed, 28 Sep 2016 13:47:51 +0300
+ -- Emilio Pozuelo Monfort   Sat, 05 Nov 2016 19:56:43 +0100
 
 xorg-server (2:1.18.4-2) unstable; urgency=medium

xorg-server: Changes to 'debian-experimental'

2016-11-05 Thread Emilio Pozuelo Monfort 
Rebased ref, commits from common ancestor:
commit c83165930e925480c88279334c8c421ce0dafe0c
Author: Emilio Pozuelo Monfort 
Date:   Tue Nov 1 22:15:42 2016 +0100

control: Add wayland-protocols build-dep

diff --git a/debian/changelog b/debian/changelog
index 2958161..d1e079a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
   * New upstream release candidate 2.
   * rules: Drop aiglx enable/disable flags, removed upstream.
   * control: Bump x11proto-core-dev requirement.
+  * control: Add wayland-protocols build-dep on linux for Xwayland.
 
  -- Timo Aaltonen   Wed, 28 Sep 2016 13:47:51 +0300
 
diff --git a/debian/control b/debian/control
index aa13ed0..9e544af 100644
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,7 @@ Build-Depends:
  libbsd-dev [kfreebsd-any],
 # xwayland
  libwayland-dev [linux-any],
+ wayland-protocols (>= 1.1) [linux-any],
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 # systemd-daemon

commit 6b936b2d760878920a26ea9926304ec30aa4d881
Author: Emilio Pozuelo Monfort 
Date:   Tue Nov 1 22:14:06 2016 +0100

control: Bump x11proto-core-dev requirement

diff --git a/debian/changelog b/debian/changelog
index d135906..2958161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
   [ Emilio Pozuelo Monfort ]
   * New upstream release candidate 2.
   * rules: Drop aiglx enable/disable flags, removed upstream.
+  * control: Bump x11proto-core-dev requirement.
 
  -- Timo Aaltonen   Wed, 28 Sep 2016 13:47:51 +0300
 
diff --git a/debian/control b/debian/control
index 4e80924..aa13ed0 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  xfonts-utils (>= 1:7.5+1),
  x11proto-bigreqs-dev (>= 1:1.1.0),
  x11proto-composite-dev (>= 1:0.4),
- x11proto-core-dev (>= 7.0.28),
+ x11proto-core-dev (>= 7.0.31),
  x11proto-damage-dev (>= 1.1),
  x11proto-fixes-dev (>= 1:5.0),
  x11proto-fonts-dev (>= 2.1.3),
@@ -197,7 +197,7 @@ Package: xserver-xorg-dev
 Architecture: any
 Depends:
  libpixman-1-dev (>= 0.27.2),
- x11proto-core-dev (>= 7.0.28),
+ x11proto-core-dev (>= 7.0.31),
  x11proto-input-dev (>= 2.3),
  x11proto-xext-dev (>= 7.2.99.901),
  x11proto-video-dev,

commit dfd3105141990efd47e7aa1b2c1ce72c2d05afb7
Author: Emilio Pozuelo Monfort 
Date:   Tue Nov 1 22:11:43 2016 +0100

rules: Drop aiglx enable/disable flags, removed upstream

diff --git a/debian/changelog b/debian/changelog
index 3f733d1..d135906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release candidate 2.
+  * rules: Drop aiglx enable/disable flags, removed upstream.
 
  -- Timo Aaltonen   Wed, 28 Sep 2016 13:47:51 +0300
 
diff --git a/debian/rules b/debian/rules
index 3f76e07..1f8c783 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,7 +147,6 @@ confflags += \
 
 confflags_main = \

--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins"
 \
-   --enable-aiglx \
--enable-composite \
--enable-record \
--enable-xv \
@@ -181,7 +180,6 @@ confflags_main = \
 
 confflags_udeb = \
--with-default-font-path="built-ins" \
-   --disable-aiglx \
--disable-composite \
--disable-record \
--disable-xv \

commit 49cd2937b2c706d0eef8c90088abaeb7a10f3af5
Author: Emilio Pozuelo Monfort 
Date:   Tue Nov 1 22:10:58 2016 +0100

New upstream release candidate

diff --git a/debian/changelog b/debian/changelog
index 0374207..3f733d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.99.902-1) UNRELEASED; urgency=medium
 
-  * New upstream release candidate.
+  [ Timo Aaltonen ]
+  * New upstream release candidate 1.
   * control: Bump libxfont-dev build-dependency.
   * patches:
 - refreshed
@@ -9,6 +10,9 @@ xorg-server (2:1.18.99.901-1) UNRELEASED; urgency=medium
   * serverminver: Bumped.
   * watch: Fix a typo.
 
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release candidate 2.
+
  -- Timo Aaltonen   Wed, 28 Sep 2016 13:47:51 +0300
 
 xorg-server (2:1.18.4-2) unstable; urgency=medium

commit 512e75a23b7f6339593c3ae6942f0c420a975fd3
Author: Keith Packard 
Date:   Fri Oct 28 09:32:42 2016 -0700

Bump to 1.18.99.902 (1.19 RC2)

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 25168cc..395df80 100644
--- a/configure.ac
+++

xorg-server: Changes to 'debian-experimental'

2016-09-28 Thread Timo Aaltonen 
 ChangeLog |162271 
--
 Xext/Makefile.am  |7 
 Xext/geext.c  |   22 
 Xext/panoramiXprocs.c |4 
 Xext/saver.c  |2 
 Xext/security.c   |2 
 Xext/shape.c  |1 
 Xext/shm.c|   25 
 Xext/sleepuntil.c |   17 
 Xext/sync.c   |   45 
 Xext/vidmode.c| 2151 
 Xext/xace.c   |   38 
 Xext/xace.h   |   12 
 Xext/xf86bigfont.c|   10 
 Xext/xres.c   |   96 
 Xext/xselinux_hooks.c |   18 
 Xext/xvdisp.c |3 
 Xext/xvmain.c |   11 
 Xext/xvmc.c   |   17 
 Xi/exevents.c |   11 
 Xi/extinit.c  |   17 
 Xi/xiproperty.c   |8 
 Xi/xiquerypointer.c   |4 
 autogen.sh|3 
 composite/compalloc.c |4 
 composite/compext.c   |   29 
 config/config.c   |4 
 config/dbus-core.c|   18 
 config/hal.c  |4 
 config/udev.c |   57 
 config/wscons.c   |2 
 configure.ac  |  190 
 damageext/damageext.c |   23 
 debian/changelog  |  100 
 debian/control|   19 
 debian/local/xvfb-run.1   |2 
 debian/patches/02_kbsd-input-devd.diff|   60 
 debian/patches/03_static-nettle.diff  |8 
 debian/patches/05_Revert-Unload-submodules.diff   |8 
 debian/patches/06_use-intel-only-on-pre-gen4.diff |   30 
 debian/patches/08_xfree86_fix_ia64_inx_outx.diff  |   66 
 debian/patches/add_support_new_libsystemd.patch   |   11 
 debian/patches/series |3 
 debian/rules  |2 
 debian/serverminver   |6 
 debian/watch  |2 
 debian/xserver-xorg-core.NEWS |   14 
 debian/xserver-xorg-core.bug.script   |4 
 debian/xserver-xorg-legacy.config |2 
 debian/xserver-xorg-legacy.postinst   |2 
 debian/xserver-xorg-legacy.postrm |2 
 dix/cursor.c  |   23 
 dix/devices.c |   49 
 dix/dispatch.c|  210 
 dix/dixfonts.c|  326 
 dix/dixutils.c|   67 
 dix/enterleave.c  |   20 
 dix/events.c  |   17 
 dix/getevents.c   |   29 
 dix/inpututils.c  |4 
 dix/main.c|   19 
 dix/pixmap.c  |   28 
 dix/privates.c|9 
 dix/property.c|   14 
 dix/ptrveloc.c|   52 
 dix/selection.c   |3 
 dix/touch.c   |   92 
 dix/window.c  |  158 
 doc/Xinput.xml|8 
 doc/Xserver-spec.xml  |   59 
 dri3/dri3_request.c   |   12 
 dri3/dri3int.h|   26 
 exa/exa.c |   10 
 exa/exa_glyphs.c  |8 
 exa/exa_render.c  |3 
 glamor/Makefile.am|6 
 glamor/glamor.c   |  131 
 glamor/glamor.h   |   45 
 glamor/glamor_composite_glyphs.c  |   31 
 glamor/glamor_compositerects.c|   18 
 glamor/glamor_copy.c  |   66 
 glamor/glamor_core.c  |  190 
 glamor/glamor_dash.c  |9 
 glamor/glamor_egl.c   |  327

xorg-server: Changes to 'debian-experimental'

2015-12-22 Thread Emilio Pozuelo Monfort 
 debian/changelog |5 +
 debian/control   |1 +
 2 files changed, 6 insertions(+)

New commits:
commit 03209b64a0bfcd0d76bf7438f9a33502081b8a05
Author: Emilio Pozuelo Monfort 
Date:   Tue Dec 22 16:44:46 2015 +0100

Let xserver-xorg-dev depend on libxfont-dev

diff --git a/debian/changelog b/debian/changelog
index decde27..df2e086 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * Enable systemd socket activation support (Closes: #803254)
 
+  [ Emilio Pozuelo Monfort ]
+  * Let xserver-xorg-dev depend on libxfont-dev, as dixfont.h needs
+fontutil.h.
+
  -- Laurent Bigonville   Sat, 05 Dec 2015 20:26:53 +0100
 
 xorg-server (2:1.18.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index f58a7b3..cce4d7a 100644
--- a/debian/control
+++ b/debian/control
@@ -213,6 +213,7 @@ Depends:
  x11proto-xf86bigfont-dev (>= 1.2.0),
  x11proto-dri3-dev,
  x11proto-present-dev,
+ libxfont-dev,
  libxkbfile-dev,
  libpciaccess-dev,
  mesa-common-dev,

xorg-server: Changes to 'debian-experimental'

2015-12-05 Thread Laurent Bigonville 
 debian/changelog|6 ++
 debian/control  |2 ++
 debian/patches/add_support_new_libsystemd.patch |   11 +++
 debian/patches/series   |1 +
 debian/rules|   16 ++--
 5 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 336d09cee7d7e8b1a1e4ea136911fb2ee416e35f
Author: Laurent Bigonville 
Date:   Sat Dec 5 20:27:27 2015 +0100

Enable systemd socket activation support (Closes: #803254)

diff --git a/debian/changelog b/debian/changelog
index 09f1c95..decde27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.18.0-2) UNRELEASED; urgency=medium
+
+  * Enable systemd socket activation support (Closes: #803254)
+
+ -- Laurent Bigonville   Sat, 05 Dec 2015 20:26:53 +0100
+
 xorg-server (2:1.18.0-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 16c1496..f58a7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,6 +98,8 @@ Build-Depends:
  libwayland-dev [linux-any],
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
+# systemd-daemon
+  libsystemd-dev [linux-any],
 Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
diff --git a/debian/patches/add_support_new_libsystemd.patch 
b/debian/patches/add_support_new_libsystemd.patch
new file mode 100644
index 000..d642b60
--- /dev/null
+++ b/debian/patches/add_support_new_libsystemd.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
 b/configure.ac
+@@ -849,7 +849,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes;
+   AC_MSG_ERROR([systemd support requested but no library has been 
found])
+   fi
+   AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is 
available])
+-  REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
++  REQUIRED_LIBS="$REQUIRED_LIBS libsystemd"
+ fi
+ AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2c8af94..d0ff25a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 #08_xfree86_fix_ia64_inx_outx.diff
+add_support_new_libsystemd.patch
diff --git a/debian/rules b/debian/rules
index fe1469a..9013e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,15 @@ endif
 
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-   selinux = --enable-xselinux
-   wayland = --enable-xwayland
-   logind  = --enable-systemd-logind
+   selinux= --enable-xselinux
+   wayland= --enable-xwayland
+   logind = --enable-systemd-logind
+   systemd-daemon = --with-systemd-daemon
 else
-   selinux = --disable-xselinux
-   wayland = --disable-xwayland
-   logind  = --disable-systemd-logind
+   selinux= --disable-xselinux
+   wayland= --disable-xwayland
+   logind = --disable-systemd-logind
+   systemd-daemon = --without-systemd-daemon
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -165,6 +167,7 @@ confflags_main = \
--enable-xfree86-utils \
$(wayland) \
$(logind) \
+   $(systemd-daemon) \
--enable-suid-wrapper \
--enable-dmx \
--enable-xvfb \
@@ -198,6 +201,7 @@ confflags_udeb = \
--disable-xfree86-utils \
--disable-xwayland \
--disable-systemd-logind \
+   --without-systemd-daemon \
--disable-suid-wrapper \
--disable-dmx \
--disable-xvfb \

xorg-server: Changes to 'debian-experimental'

2015-11-11 Thread Julien Cristau 
 debian/changelog |5 +++--
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 30ad9c3f778833344e49f5a0455514955a10a947
Author: Julien Cristau 
Date:   Tue Nov 10 22:40:56 2015 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 937a1ac..09f1c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.0-1) experimental; urgency=medium
 
   * New upstream release.
 - drop xext-fix-udeb-build.diff, merged upstream
   * Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.
 
- -- Julien Cristau   Mon, 09 Nov 2015 22:21:51 +0100
+ -- Julien Cristau   Tue, 10 Nov 2015 22:40:43 +0100
 
 xorg-server (2:1.17.99.902-1) experimental; urgency=medium
 

commit 90a629cf3f1ab5a201fb1ceb46a6c7b7ad91ec26
Author: Julien Cristau 
Date:   Tue Nov 10 22:40:08 2015 +0100

Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.

diff --git a/debian/changelog b/debian/changelog
index 3117629..937a1ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 - drop xext-fix-udeb-build.diff, merged upstream
+  * Extend libgbm-dev build-dep to kfreebsd-any as well as linux-any.
 
  -- Julien Cristau   Mon, 09 Nov 2015 22:21:51 +0100
 
diff --git a/debian/control b/debian/control
index 1faa02a..16c1496 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Build-Depends:
 # glamor
  libepoxy-dev [linux-any kfreebsd-any],
  libegl1-mesa-dev [linux-any kfreebsd-any],
- libgbm-dev [linux-any],
+ libgbm-dev (>= 10.2) [linux-any kfreebsd-any],
 # XCB bits for Xephyr
  libxcb1-dev,
  libxcb-shape0-dev,

xorg-server: Changes to 'debian-experimental'

2015-11-09 Thread Julien Cristau 
 ChangeLog|  218 ++
 Xext/xace.h  |2 
 configure.ac |6 
 debian/changelog |7 
 debian/patches/series|1 
 debian/patches/xext-fix-udeb-build.diff  |   37 ---
 exa/Makefile.am  |4 
 hw/xfree86/Makefile.am   |2 
 hw/xfree86/common/xf86vmode.c|  222 ---
 hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h   |   28 ++
 hw/xfree86/drivers/modesetting/drmmode_display.c |   22 +-
 hw/xfree86/exa/Makefile.am   |3 
 hw/xfree86/loader/Makefile.am|2 
 hw/xfree86/man/Xorg.man  |   60 --
 man/Xserver.man  |   13 +
 os/WaitFor.c |1 
 present/present.c|   27 +-
 test/Makefile.am |2 
 18 files changed, 310 insertions(+), 347 deletions(-)

New commits:
commit 8ac961a9ecd80db129d79ce5ee3afee28cb39026
Author: Julien Cristau 
Date:   Mon Nov 9 22:23:20 2015 +0100

One dropped patch

diff --git a/debian/changelog b/debian/changelog
index a20a372..3117629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.18.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- drop xext-fix-udeb-build.diff, merged upstream
 
  -- Julien Cristau   Mon, 09 Nov 2015 22:21:51 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index ea13f87..2c8af94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 #08_xfree86_fix_ia64_inx_outx.diff
-xext-fix-udeb-build.diff
diff --git a/debian/patches/xext-fix-udeb-build.diff 
b/debian/patches/xext-fix-udeb-build.diff
deleted file mode 100644
index dd41201..000
--- a/debian/patches/xext-fix-udeb-build.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From aaa1928f80c6b3cae614182248a41f92f7f865af Mon Sep 17 00:00:00 2001
-From: Julien Cristau 
-Date: Tue, 27 Oct 2015 13:02:18 +0100
-Subject: [PATCH xserver] Xext: fix build with --disable-xace
-
-Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
-
-Signed-off-by: Julien Cristau 
-Cc: Andrew Eikum 
-Cc: Peter Hutterer 

- Xext/xace.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Xext/xace.h b/Xext/xace.h
-index 3303f76..6a8d0c4 100644
 a/Xext/xace.h
-+++ b/Xext/xace.h
-@@ -112,6 +112,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
- 
- #ifdef __GNUC__
- #define XaceHook(args...) Success
-+#define XaceHookIsSet(args...) 0
- #define XaceHookDispatch(args...) Success
- #define XaceHookPropertyAccess(args...) Success
- #define XaceHookSelectionAccess(args...) Success
-@@ -119,6 +120,7 @@ extern _X_EXPORT void XaceCensorImage(ClientPtr client,
- #define XaceCensorImage(args...) { ; }
- #else
- #define XaceHook(...) Success
-+#define XaceHookIsSet(...) 0
- #define XaceHookDispatch(...) Success
- #define XaceHookPropertyAccess(...) Success
- #define XaceHookSelectionAccess(...) Success
--- 
-2.6.1
-

commit 690d52a8996c36f5eaf4122cdffaf8cbbf2984d9
Author: Julien Cristau 
Date:   Mon Nov 9 22:22:42 2015 +0100

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 25db34c..e37f173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,221 @@
+commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
+Author: Adam Jackson 
+Date:   Mon Nov 9 16:00:26 2015 -0500
+
+xserver 1.18.0
+
+Signed-off-by: Adam Jackson 
+
+commit 2203735887ab548b3ee004400d1b89149aae412c
+Author: Axel Davy 
+Date:   Wed Nov 4 18:42:42 2015 +0100
+
+present: Fix Async swap logic
+
+According to the spec, PresentOptionAsync should only
+trigger a different behaviour when the target msc has been reached.
+
+In this case if the driver is able to do async swaps, we use
+them to avoid a screen copy.
+
+When the target msc hasn't been reached yet, we want to use sync swaps.
+
+v2: Fix indentation and simplify checks for Async flips
+
+Signed-off-by: Axel Davy 
+Reviewed-by: Michel Dänzer 
+
+commit 3f35909acba117dc8934920d788c7ce612bce444
+Author: Jammy Zhou 
+Date:   Wed Oct 28 18:39:10 2015 +0800
+
+present: Execute right away if target_msc equals current_msc
+
+It is according to the protocol:
+
+"If 'options' contains PresentOptionAsync, and the 'target-msc'
+is less than or equal to the current msc for 'window', then
+the operation will be performed

xorg-server: Changes to 'debian-experimental'

2015-10-29 Thread Julien Cristau 
 ChangeLog| 6474 ++-
 Xext/geext.c |   10 
 Xext/geint.h |5 
 Xext/hashtable.c |4 
 Xext/panoramiX.c |   10 
 Xext/panoramiXprocs.c|   21 
 Xext/saver.c |2 
 Xext/security.c  |   24 
 Xext/shape.c |2 
 Xext/sync.c  |4 
 Xext/xace.c  |   28 
 Xext/xace.h  |3 
 Xext/xcmisc.c|2 
 Xext/xf86bigfont.c   |4 
 Xext/xres.c  |   10 
 Xext/xselinux_hooks.c|9 
 Xext/xselinux_label.c|2 
 Xext/xtest.c |2 
 Xext/xvmain.c|   84 
 Xi/exevents.c|   21 
 Xi/getprop.c |2 
 Xi/xichangehierarchy.c   |6 
 Xi/xiproperty.c  |8 
 Xi/xiquerypointer.c  |4 
 autogen.sh   |8 
 composite/compinit.c |   35 
 composite/compwindow.c   |2 
 config/10-evdev.conf |   40 
 config/Makefile.am   |4 
 config/config.c  |3 
 configure.ac |  135 
 dbe/dbe.c|   14 
 dbe/midbe.c  |2 
 debian/changelog |   38 
 debian/control   |   14 
 debian/patches/02_kbsd-input-devd.diff   |   14 
 debian/patches/03_static-nettle.diff |2 
 debian/patches/05_Revert-Unload-submodules.diff  |2 
 debian/patches/series|2 
 debian/patches/xext-fix-udeb-build.diff  |   37 
 debian/patches/xorg-wrapper-envp.diff|   24 
 debian/rules |3 
 debian/serverminver  |6 
 debian/xserver-xorg-core.NEWS|   17 
 dev/null |binary
 dix/Xserver.d|5 
 dix/atom.c   |   10 
 dix/colormap.c   |  434 -
 dix/cursor.c |8 
 dix/devices.c|   10 
 dix/dispatch.c   |   20 
 dix/dixfonts.c   |   51 
 dix/enterleave.c |4 
 dix/enterleave.h |2 
 dix/events.c |   12 
 dix/extension.c  |6 
 dix/getevents.c  |   78 
 dix/glyphcurs.c  |4 
 dix/grabs.c  |8 
 dix/inpututils.c |   78 
 dix/main.c   |5 
 dix/pixmap.c |  180 
 dix/privates.c   |9 
 dix/property.c   |   10 
 dix/protocol.txt |  302 -
 dix/region.c |2 
 dix/resource.c   |   44 
 dix/touch.c  |   10 
 dix/window.c |   18 
 doc/Xinput.xml   |   24 
 doc/Xserver-spec.xml |9 
 doc/c-extensions |2 
 doc/smartsched   |6 
 dri3/dri3.c  |3 
 dri3/dri3_event.c|  163 
 dri3/dri3_priv.h |2 
 exa/exa_accel.c  |8 
 exa/exa_glyphs.c |4 
 exa/exa_migration_mixed.c|4 
 exa/exa_render.c |2 
 fb/fb.h  |5 
 fb/fbcopy.c  |2 
 fb/fbpict.c  |   15 
 glamor/Makefile.am   |2 
 glamor/glamor.c  |  462 -
 glamor/glamor.h

xorg-server: Changes to 'debian-experimental'

2015-10-29 Thread Julien Cristau 
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1de609e8f2926de49d4fff6ccf634cc34cc1c063
Author: Julien Cristau 
Date:   Thu Oct 29 09:59:08 2015 +

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 7d53038..eaf4d2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xorg-server (2:1.17.99.902-1) UNRELEASED; urgency=medium
+xorg-server (2:1.17.99.902-1) experimental; urgency=medium
 
+  * Team upload.
   * New upstream release candidate.
   * Bump x11proto-core and x11proto-randr dependencies per configure.ac.
   * Stop passing deleted options to configure.
   * Bump serverminver (video ABI 20.0, input ABI 22.1).
 
- -- Julien Cristau   Wed, 28 Oct 2015 19:02:38 +
+ -- Julien Cristau   Thu, 29 Oct 2015 09:58:55 +
 
 xorg-server (2:1.17.3-2) unstable; urgency=medium

xorg-server: Changes to 'debian-experimental'

2015-10-08 Thread Laurent Bigonville 
 debian/changelog |8 ++--
 debian/control   |3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b85977a295721064c5e4eee3e6762c27af16d3ea
Author: Laurent Bigonville 
Date:   Tue Oct 6 09:06:36 2015 +0200

Release to unstable

diff --git a/debian/changelog b/debian/changelog
index d72d138..0b56c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
+xorg-server (2:1.17.2-3) unstable; urgency=medium
 
+  * Team upload.
   [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
 xserver-xorg-legacy package (Closes: #797661)
@@ -14,7 +15,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville   Tue, 06 Oct 2015 09:05:48 +0200
+ -- Laurent Bigonville   Tue, 06 Oct 2015 09:06:22 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 

commit 2abffe87662e3d8d023bc576051214ddb38e7832
Author: Laurent Bigonville 
Date:   Tue Oct 6 09:06:05 2015 +0200

Bump Standards-Version to 3.9.6 (no further changes)

diff --git a/debian/changelog b/debian/changelog
index 97b77a8..d72d138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 xserver-xorg-legacy package (Closes: #797661)
   * Add a Breaks against systemd (<< 226-4~), before that version logind was
 restarted on upgrade which makes the X server crash (See #798097)
+  * Bump Standards-Version to 3.9.6 (no further changes)
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
@@ -13,7 +14,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville   Tue, 06 Oct 2015 08:49:08 +0200
+ -- Laurent Bigonville   Tue, 06 Oct 2015 09:05:48 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 4eb9539..2f3b6a3 100644
--- a/debian/control
+++ b/debian/control
@@ -98,7 +98,7 @@ Build-Depends:
  libwayland-dev [linux-any],
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/debian/xorg.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 Homepage: http://www.x.org/

commit 9b44e1815d3580b80ae61b19fd9392608f0183fe
Author: Laurent Bigonville 
Date:   Tue Oct 6 08:53:37 2015 +0200

Add a Breaks against systemd (<< 226-4~), before that version logind was 
restarted on upgrade which makes the X server crash (See #798097)

diff --git a/debian/changelog b/debian/changelog
index e35fa2d..97b77a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
 xserver-xorg-legacy package (Closes: #797661)
+  * Add a Breaks against systemd (<< 226-4~), before that version logind was
+restarted on upgrade which makes the X server crash (See #798097)
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
@@ -11,7 +13,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * Only reset environment in the Xorg wrapper if we didn't drop privileges.
 
- -- Laurent Bigonville   Sat, 22 Aug 2015 16:29:11 +0200
+ -- Laurent Bigonville   Tue, 06 Oct 2015 08:49:08 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index eb6f745..4eb9539 100644
--- a/debian/control
+++ b/debian/control
@@ -145,6 +145,7 @@ Breaks:
  libgl1-mesa-dri (<< 7.10.2-4),
  libgl1-mesa-dri-experimental (<< 7.10.2-4),
  xserver-xorg (<< 1:7.7+10~),
+ systemd (<< 226-4~),
 Replaces:
  xserver-xorg-video-modesetting,
  xserver-xorg (<< 1:7.7+10~),

xorg-server: Changes to 'debian-experimental'

2015-09-02 Thread Laurent Bigonville 
 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 425d762dc494b8dd83dbfcc30cd1681d59a61f27
Author: Laurent Bigonville 
Date:   Wed Sep 2 10:23:29 2015 +0200

Add Closes statement

diff --git a/debian/changelog b/debian/changelog
index 417b174..31e5fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
-xserver-xorg-legacy package
+xserver-xorg-legacy package (Closes: #797661)
 
  -- Laurent Bigonville   Sat, 22 Aug 2015 16:29:11 +0200

xorg-server: Changes to 'debian-experimental'

2015-09-02 Thread Andreas Boll 
 debian/changelog |5 +
 debian/control   |5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 721e7aaf1c84e176f3bd03871013e0cc259e1860
Author: Andreas Boll 
Date:   Wed Sep 2 10:51:47 2015 +0200

Add upstream url.

diff --git a/debian/changelog b/debian/changelog
index 151ca1d..82e7b25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
   [ Andreas Boll ]
   * Update Vcs-* fields.
+  * Add upstream url.
 
  -- Laurent Bigonville   Sat, 22 Aug 2015 16:29:11 +0200
 
diff --git a/debian/control b/debian/control
index e972671..be6388b 100644
--- a/debian/control
+++ b/debian/control
@@ -101,6 +101,7 @@ Build-Depends:
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
+Homepage: http://www.x.org/
 
 Package: xserver-xorg-core
 Architecture: any

commit cad883ae7f3aa1d22a3de84d200c5fce7f96f1e2
Author: Andreas Boll 
Date:   Wed Sep 2 10:43:46 2015 +0200

Update Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index 31e5fb1..151ca1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
 
+  [ Laurent Bigonville ]
   * Move Xorg.wrap.1 man page from the xserver-xorg-core to
 xserver-xorg-legacy package (Closes: #797661)
 
+  [ Andreas Boll ]
+  * Update Vcs-* fields.
+
  -- Laurent Bigonville   Sat, 22 Aug 2015 16:29:11 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index a837aeb..e972671 100644
--- a/debian/control
+++ b/debian/control
@@ -99,8 +99,8 @@ Build-Depends:
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 
 Package: xserver-xorg-core
 Architecture: any

xorg-server: Changes to 'debian-experimental'

2015-09-02 Thread Julien Cristau 
 debian/changelog  |3 +++
 debian/patches/xorg-wrapper-envp.diff |   15 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit b57a76cfb9801786cc922e34ec1bd9e42802e472
Author: Julien Cristau 
Date:   Wed Sep 2 11:55:29 2015 +0200

Only reset environment in the Xorg wrapper if we didn't drop privileges.

diff --git a/debian/changelog b/debian/changelog
index 82e7b25..e35fa2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
   * Update Vcs-* fields.
   * Add upstream url.
 
+  [ Julien Cristau ]
+  * Only reset environment in the Xorg wrapper if we didn't drop privileges.
+
  -- Laurent Bigonville   Sat, 22 Aug 2015 16:29:11 +0200
 
 xorg-server (2:1.17.2-2) experimental; urgency=medium
diff --git a/debian/patches/xorg-wrapper-envp.diff 
b/debian/patches/xorg-wrapper-envp.diff
index 6e427f4..47fa90e 100644
--- a/debian/patches/xorg-wrapper-envp.diff
+++ b/debian/patches/xorg-wrapper-envp.diff
@@ -1,7 +1,7 @@
-diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
-index 22e97ad..10e6fe8 100644
 a/hw/xfree86/xorg-wrapper.c
-+++ b/hw/xfree86/xorg-wrapper.c
+Index: xorg-server/hw/xfree86/xorg-wrapper.c
+===
+--- xorg-server.orig/hw/xfree86/xorg-wrapper.c
 xorg-server/hw/xfree86/xorg-wrapper.c
 @@ -190,6 +190,7 @@ int main(int argc, char *argv[])
  int total_cards = 0;
  int allowed = CONSOLE_ONLY;
@@ -10,12 +10,15 @@ index 22e97ad..10e6fe8 100644
  
  progname = argv[0];
  
-@@ -265,7 +266,7 @@ int main(int argc, char *argv[])
+@@ -265,7 +266,10 @@ int main(int argc, char *argv[])
  }
  
  argv[0] = buf;
 -(void) execv(argv[0], argv);
-+(void) execve(argv[0], argv, envp);
++if (getuid() == geteuid())
++(void) execv(argv[0], argv);
++else
++(void) execve(argv[0], argv, envp);
  fprintf(stderr, "%s: Failed to execute %s: %s\n",
  progname, buf, strerror(errno));
  exit(1);

xorg-server: Changes to 'debian-experimental'

2015-09-02 Thread Andreas Boll 
 debian/control |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a047d592f91a98b18f6ae17779e17c4461e9bbd
Author: Andreas Boll 
Date:   Wed Sep 2 14:16:47 2015 +0200

Use https for Vcs-* fields.

diff --git a/debian/control b/debian/control
index be6388b..eb6f745 100644
--- a/debian/control
+++ b/debian/control
@@ -99,8 +99,8 @@ Build-Depends:
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 Standards-Version: 3.9.2
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/xserver/xorg-server.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/debian/xorg.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
 Homepage: http://www.x.org/
 
 Package: xserver-xorg-core

xorg-server: Changes to 'debian-experimental'

2015-08-23 Thread Laurent Bigonville 
 debian/changelog   |7 +++
 debian/control |2 ++
 debian/xserver-xorg-core.install   |2 --
 debian/xserver-xorg-legacy.install |2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cc1e94cb5a7e7172974be98103f0af4170c8dc22
Author: Laurent Bigonville bi...@bigon.be
Date:   Sat Aug 22 16:30:03 2015 +0200

Move Xorg.wrap.1 man page from the xserver-xorg-core to xserver-xorg-legacy 
package

diff --git a/debian/changelog b/debian/changelog
index eb80147..417b174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-3) UNRELEASED; urgency=medium
+
+  * Move Xorg.wrap.1 man page from the xserver-xorg-core to
+xserver-xorg-legacy package
+
+ -- Laurent Bigonville bi...@debian.org  Sat, 22 Aug 2015 16:29:11 +0200
+
 xorg-server (2:1.17.2-2) experimental; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index ca9e18e..a837aeb 100644
--- a/debian/control
+++ b/debian/control
@@ -398,8 +398,10 @@ Depends:
  ${misc:Depends},
 Breaks:
  x11-common ( 1:7.7+10~),
+ xserver-xorg-core ( 2:1.17.2-3~),
 Replaces:
  x11-common ( 1:7.7+10~),
+ xserver-xorg-core ( 2:1.17.2-3~),
 Description: setuid root Xorg server wrapper
  This package provides a wrapper for the Xorg X server, which is
  necessary for legacy drivers and non-Linux kernels.
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 856b615..e16f9d6 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -2,11 +2,9 @@ main/usr/lib/xorg/modules  usr/lib/xorg
 main/usr/bin/Xorg  usr/bin
 main/usr/bin/X usr/bin
 main/usr/share/man/man1/Xorg.1 usr/share/man/man1
-main/usr/share/man/man1/Xorg.wrap.1usr/share/man/man1
 main/usr/share/man/man4usr/share/man/
 main/usr/share/man/man5/xorg.conf.5usr/share/man/man5
 main/usr/share/man/man5/xorg.conf.d.5  usr/share/man/man5
-main/usr/share/man/man5/Xwrapper.config.5  usr/share/man/man5
 main/usr/bin/cvt   usr/bin
 main/usr/bin/gtf   usr/bin
 main/usr/share/man/man1/cvt.1  usr/share/man/man1
diff --git a/debian/xserver-xorg-legacy.install 
b/debian/xserver-xorg-legacy.install
index 5f3eb87..44b995e 100644
--- a/debian/xserver-xorg-legacy.install
+++ b/debian/xserver-xorg-legacy.install
@@ -1 +1,3 @@
 main/usr/lib/xorg/Xorg.wrap usr/lib/xorg
+main/usr/share/man/man1/Xorg.wrap.1usr/share/man/man1
+main/usr/share/man/man5/Xwrapper.config.5  usr/share/man/man5

xorg-server: Changes to 'debian-experimental'

2015-08-20 Thread Julien Cristau 
 Xext/shm.c   |   10 +-
 configure.ac |   10 +-
 debian/changelog |   45 +
 debian/control   |   22 
 debian/patches/series|1 
 debian/patches/xorg-wrapper-envp.diff|   21 
 debian/po/POTFILES.in|1 
 debian/po/ar.po  |   62 
 debian/po/ast.po |   64 +
 debian/po/be.po  |   58 
 debian/po/bg.po  |   80 
 debian/po/bn.po  |   60 
 debian/po/bs.po  |   70 ++
 debian/po/ca.po  |   79 
 debian/po/cs.po  |   79 
 debian/po/da.po  |   98 
 debian/po/de.po  |   78 
 debian/po/dz.po  |   73 +++
 debian/po/el.po  |   84 +
 debian/po/eo.po  |   61 
 debian/po/es.po  |   88 ++
 debian/po/eu.po  |   82 
 debian/po/fi.po  |   62 
 debian/po/fr.po  |   87 ++
 debian/po/gl.po  |   68 ++
 debian/po/gu.po  |   59 
 debian/po/he.po  |   61 
 debian/po/hr.po  |   56 +++
 debian/po/hu.po  |   56 +++
 debian/po/id.po  |   74 +++
 debian/po/it.po  |   85 +
 debian/po/ja.po  |   81 
 debian/po/kk.po  |   55 +++
 debian/po/km.po  |   70 ++
 debian/po/ko.po  |   58 
 debian/po/ku.po  |   56 +++
 debian/po/lt.po  |   71 ++
 debian/po/ml.po  |   70 ++
 debian/po/mr.po  |   60 
 debian/po/nb.po  |   63 +
 debian/po/ne.po  |   63 +
 debian/po/nl.po  |   82 
 debian/po/nn.po  |   70 ++
 debian/po/pl.po  |   66 +
 debian/po/pothead.in |   30 ++
 debian/po/pt.po  |   67 +
 debian/po/pt_BR.po   |   85 +
 debian/po/ro.po  |   84 +
 debian/po/ru.po  |   87 ++
 debian/po/sk.po  |   65 +
 debian/po/sq.po  |   66 +
 debian/po/sr.po  |   60 
 debian/po/s...@latin.po|   61 
 debian/po/sv.po  |   88 ++
 debian/po/ta.po  |   70 ++
 debian/po/templates.pot  |   53 ++
 debian/po/th.po  |   59 
 debian/po/tr.po  |   83 +
 debian/po/vi.po  |   62 
 debian/po/wo.po  |   61 
 debian/po/zh_CN.po   |   81 
 debian/po/zh_TW.po   |   74 +++
 debian/rules |   11 ++
 debian/upstream/signing-key.asc  |   41 
 debian/xserver-xorg-core.install |7 +
 debian/xserver-xorg-legacy.config|   87 ++
 debian/xserver-xorg-legacy.install   |1 
 debian/xserver-xorg-legacy.postinst  |   77 +++
 debian/xserver-xorg-legacy.postrm|   36 +++
 debian/xserver-xorg-legacy.templates |   22 
 dix/devices.c|3 
 dix/events.c

xorg-server: Changes to 'debian-experimental'

2015-05-04 Thread Julien Cristau 
 debian/changelog |9 +
 debian/rules |   17 +
 2 files changed, 26 insertions(+)

New commits:
commit 86c1c140a80018181aa1fec45a63323def0100d5
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 4 22:14:20 2015 +0200

Fix typo in changelog

diff --git a/debian/changelog b/debian/changelog
index 7c465b3..d40249f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xorg-server (2:1.17.1-2) experimental; urgency=medium
 
-  * Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
+  * Disable libdrm support on hurd and in the kfreebsd udeb build, so we don't
 try building the modesetting driver without libdrm.  We should probably
 revisit this later and ship modesetting_drv.so in d-i, but this should do
 for now.

commit 6a5211b8744a55e5ade7c0ad7826b4de31c78fc6
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 4 22:13:49 2015 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 3ea0e66..7c465b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.17.1-2) UNRELEASED; urgency=medium
+xorg-server (2:1.17.1-2) experimental; urgency=medium
 
   * Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
 try building the modesetting driver without libdrm.  We should probably
 revisit this later and ship modesetting_drv.so in d-i, but this should do
 for now.
 
- -- Julien Cristau jcris...@debian.org  Mon, 04 May 2015 21:39:19 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 04 May 2015 22:04:01 +0200
 
 xorg-server (2:1.17.1-1) experimental; urgency=medium
 

commit cbf49e0f21ba8b663d8b5432310b9ccdd6695089
Author: Julien Cristau jcris...@debian.org
Date:   Mon May 4 21:42:49 2015 +0200

Disable libdrm support on hurd and in the udev build

Otherwise we try building the modesetting driver without libdrm.
We should probably revisit this later and ship modesetting_drv.so in
d-i, but this should do for now.

diff --git a/debian/changelog b/debian/changelog
index d1a4d51..3ea0e66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.17.1-2) UNRELEASED; urgency=medium
+
+  * Disable libdrm support on hurd and in the kfreebsd udev build, so we don't
+try building the modesetting driver without libdrm.  We should probably
+revisit this later and ship modesetting_drv.so in d-i, but this should do
+for now.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 04 May 2015 21:39:19 +0200
+
 xorg-server (2:1.17.1-1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
diff --git a/debian/rules b/debian/rules
index 080fd7e..09a824f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,21 @@ else # hurd
config_backend += --disable-config-udev
 endif
 
+# linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c)
+#even in udeb
+# kfreebsd: libdrm for dri in main build
+# hurd: no libdrm
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+   libdrm_main = --enable-libdrm
+   libdrm_udeb = --enable-libdrm
+else ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+   libdrm_main = --enable-libdrm
+   libdrm_udeb = --disable-libdrm
+else # hurd
+   libdrm_main = --disable-libdrm
+   libdrm_udeb = --disable-libdrm
+endif
+
 vars = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+pie 
DEB_LDFLAGS_MAINT_APPEND=-Wl,-Bsymbolic 
DEB_CPPFLAGS_MAINT_APPEND=-DPRE_RELEASE=0 $(cppflags) dpkg-buildflags 
--export=configure) LIBS=$(libs)
 
 ifneq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
@@ -141,6 +156,7 @@ confflags_main = \
--enable-xdm-auth-1 \
--enable-glx \
$(dri) \
+   $(libdrm_main) \
--enable-present \
--enable-xinerama \
--enable-xf86vidmode \
@@ -173,6 +189,7 @@ confflags_udeb = \
--disable-glx \
--disable-dri \
--disable-dri2 \
+   $(libdrm_udeb) \
--disable-xinerama \
--disable-xf86vidmode \
--disable-xace \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ypmlj-0004oy...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2015-05-03 Thread Julien Cristau 
 debian/changelog |   11 ---
 debian/compat|2 +-
 debian/control   |   11 +++
 debian/copyright |   27 ++-
 debian/rules |6 --
 5 files changed, 46 insertions(+), 11 deletions(-)

New commits:
commit 48ebc7c8aace3c822a91dbd02ba55021b3da4141
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 3 18:00:45 2015 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 379ece1..d1a4d51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium
+xorg-server (2:1.17.1-1) experimental; urgency=medium
 
   [ Maarten Lankhorst ]
   * New upstream release 1.17.1.
@@ -13,7 +13,7 @@ xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 9.
   * Update debian/copyright from upstream COPYING.
 
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 11 Dec 2014 
15:49:13 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 03 May 2015 18:00:32 +0200
 
 xorg-server (2:1.16.4-1) unstable; urgency=high
 

commit 7ff2d28ad35f50ea6921bfca8c414c3dc5911443
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 3 18:00:30 2015 +0200

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index 240055a..379ece1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Bump debhelper compat level to 9.
+  * Update debian/copyright from upstream COPYING.
 
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com  Thu, 11 Dec 2014 
15:49:13 +0100
 
diff --git a/debian/copyright b/debian/copyright
index cd9e80a..abf13c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ possible, and insert their name to this list.  Please sort by 
surname
 for people, and by the full name for other entities (e.g.  Juliusz
 Chroboczek sorts before Intel Corporation sorts before Daniel Stone).
 
+Copyright © 2011 Dave Airlie
 Copyright © 2000-2001 Juliusz Chroboczek
 Copyright © 1998 Egbert Eich
 Copyright © 2006-2007 Intel Corporation
@@ -20,6 +21,7 @@ Copyright © 1999 Keith Packard
 Copyright © 2007-2009 Red Hat, Inc.
 Copyright © 2005-2008 Daniel Stone
 Copyright © 2006-2009 Simon Thum
+Copyright © 2003-2008, 2013 Geert Uytterhoeven
 Copyright © 2006 Luc Verhaegen
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -144,6 +146,29 @@ used in advertising or otherwise to promote the sale, use 
or other dealings
 in this Software without prior written authorization from the X Consortium.
 
 
+Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+
+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, sub license, 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 WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 Copyright © 1999-2000 SuSE, Inc.
 Copyright © 2007 Red Hat, Inc.
 
@@ -1788,7 +1813,7 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE 
USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 
-Copyright (c) 1989, 1990, 1993, 1994
+Copyright (c) 1987, 1990, 1993
  The Regents of the University of California.  All rights reserved.
 
 This code is derived from software contributed to Berkeley by

commit 34e459bc800d67f220565074f30889a9fa317ad4
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 3 10:07:35 2015 +0200

Bump debhelper compat level to 9.

diff --git a/debian/changelog b/debian/changelog
index 6be49f5..240055a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium
 
+  [ Maarten Lankhorst ]
   * New upstream release 1.17.1.
   * Enable the modesetting driver from xorg-server.
   * Drop upstreamed patches:
@@ -8,6 +9,9 @@ xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium
 - Is this patch still needed because it seems to be handled now?
   * Bump video abi to 19.
 
+  [ Julien Cristau ]
+  * Bump debhelper compat level to 9.
+
  -- Maarten Lankhorst maarten.lankho...@ubuntu.com

xorg-server: Changes to 'debian-experimental'

2015-02-11 Thread Maarten Bernardus Lankhorst 
 ChangeLog| 2126 +++
 Xi/exevents.c|5 
 config/udev.c|   30 
 configure.ac |8 
 debian/changelog |   16 
 devbook.am   |   10 
 dix/dispatch.c   |2 
 dix/getevents.c  |6 
 doc/Makefile.am  |2 
 doc/filter-xmlto.sh  |   21 
 glamor/glamor.c  |   41 
 glamor/glamor.h  |2 
 glamor/glamor_egl.c  |   12 
 glamor/glamor_fbo.c  |4 
 glamor/glamor_priv.h |2 
 glamor/glamor_xv.c   |   26 
 glx/glxcmds.c|   71 
 hw/kdrive/ephyr/ephyr.c  |   10 
 hw/kdrive/ephyr/ephyr.h  |1 
 hw/kdrive/ephyr/hostx.c  |   11 
 hw/kdrive/ephyr/hostx.h  |2 
 hw/xfree86/Makefile.am   |2 
 hw/xfree86/Xorg.sh.in|4 
 hw/xfree86/common/xf86AutoConfig.c   |1 
 hw/xfree86/dri2/dri2.c   |9 
 hw/xfree86/drivers/modesetting/Makefile.am   |3 
 hw/xfree86/drivers/modesetting/dri2.c|2 
 hw/xfree86/drivers/modesetting/driver.c  |   94 -
 hw/xfree86/drivers/modesetting/driver.h  |   14 
 hw/xfree86/drivers/modesetting/drmmode_display.c |  491 +++--
 hw/xfree86/drivers/modesetting/drmmode_display.h |   32 
 hw/xfree86/drivers/modesetting/dumb_bo.c |  134 +
 hw/xfree86/drivers/modesetting/dumb_bo.h |   45 
 hw/xfree86/drivers/modesetting/present.c |  228 ++
 hw/xfree86/drivers/modesetting/vblank.c  |   37 
 hw/xfree86/man/Xorg.wrap.man |2 
 hw/xfree86/os-support/solaris/sun_init.c |   33 
 hw/xfree86/os-support/xf86_OSlib.h   |5 
 hw/xfree86/xorg-wrapper.c|   10 
 hw/xnest/Keyboard.c  |9 
 hw/xwayland/Makefile.am  |1 
 hw/xwayland/xwayland-glamor.c|3 
 hw/xwayland/xwayland-input.c |7 
 hw/xwayland/xwayland.c   |2 
 include/regionstr.h  |2 
 mi/mipointer.c   |4 
 os/WaitFor.c |   41 
 os/osinit.c  |6 
 os/xsha1.c   |   25 
 present/present.c|   15 
 randr/rroutput.c |7 
 randr/rrscreen.c |   22 
 randr/rrxinerama.c   |   12 
 xkb/xkb.c|  100 -
 54 files changed, 2260 insertions(+), 1550 deletions(-)

New commits:
commit 844389319f72ed964479b09c353b2f8f73a9dde8
Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
Date:   Wed Feb 11 11:17:51 2015 +0100

bump version to 1.17.1

diff --git a/ChangeLog b/ChangeLog
index e613918..3983221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,739 +1,1240 @@
-commit 27017380f96d7cec79ce8d618ea0ec389fa716a9
-Merge: 91651e7 9b037af
-Author: Maarten Lankhorst maarten.lankho...@ubuntu.com
-Date:   Thu Dec 11 15:47:29 2014 +0100
+commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Feb 10 14:43:34 2015 -0800
 
-Merge branch 'upstream-unstable' into upstream-experimental
+Release 1.17.1
+
+Signed-off-by: Keith Packard kei...@keithp.com
 
-commit 91651e7c15892aa846fc406fbb13b37f094dd3f0
-Author: Michel Dänzer michel.daen...@amd.com
-Date:   Wed Dec 10 16:21:44 2014 +0900
+commit f160e722672dbb2b5215870b47bcc51461d96ff1
+Author: Olivier Fourdan ofour...@redhat.com
+Date:   Fri Jan 16 08:44:45 2015 +0100
 
-glamor: Reinstate glamor_(egl_)destroy_textured_pixmap
+xkb: Check strings length against request size
 
-They are part of the ABI.
+Ensure that the given strings length in an XkbSetGeometry request remain
+within the limits of the size of the request.
 
-Signed-off-by: Michel Dänzer michel.daen...@amd.com
-Reviewed-by: Keith Packard kei...@keithp.com
-Signed-off-by: Keith Packard kei...@keithp.com
+Signed-off-by: Olivier Fourdan ofour...@redhat.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)
 
-commit c1455f76c6b1aa4ecaacb2221a687244285aa44b
-Author: Neil

xorg-server: Changes to 'debian-experimental'

2014-12-11 Thread Maarten Bernardus Lankhorst 
 COPYING |  
 24 
 ChangeLog   | 
9268 ++
 Xext/dpms.c |  
 10 
 Xext/dpmsstubs.c|  
 10 
 Xext/panoramiX.c|  
  2 
 Xext/panoramiX.h|  
  2 
 Xext/panoramiXprocs.c   |  
 16 
 Xext/saver.c|  
 16 
 Xext/security.c |  
  5 
 Xext/shm.c  |  
 21 
 Xext/sync.c |  
  2 
 Xext/syncsrv.h  |  
  8 
 Xext/xcmisc.c   |  
  1 
 Xext/xres.c |  
 12 
 Xext/xvdisp.c   |  
126 
 Xext/xvdix.h|  
 45 
 Xext/xvmain.c   |  
164 
 Xi/chgdctl.c|  
  8 
 Xi/chgfctl.c|  
  2 
 Xi/sendexev.c   |  
  3 
 Xi/xiallowev.c  |  
  2 
 Xi/xichangecursor.c |  
  2 
 Xi/xichangehierarchy.c  |  
 35 
 Xi/xigetclientpointer.c |  
  1 
 Xi/xigrabdev.c  |  
  9 
 Xi/xipassivegrab.c  |  
 12 
 Xi/xiproperty.c |  
 14 
 Xi/xiquerydevice.c  |  
  1 
 Xi/xiquerypointer.c |  
  2 
 Xi/xiselectev.c |  
  8 
 Xi/xisetclientpointer.c |  
  3 
 Xi/xisetdevfocus.c  |  
  4 
 Xi/xiwarppointer.c  |  
  2 
 composite/compalloc.c   |  
  8 
 composite/compext.c |  
  7 
 composite/compinit.c|  
 25 
 composite/compint.h |  
  3 
 composite/compoverlay.c |  
  4 
 composite/compwindow.c  |  
  7 
 config/config.c |  
129 
 config/udev.c   |  
 17 
 configure.ac|  
124 
 dbe/dbe.c   |  
 33 
 dbe/dbestruct.h |  
 12 
 dbe/midbe.c |  
 14 
 dbe/midbe.h |  
  8 
 debian/changelog|  
 83 
 debian/control  |  
  6 
 debian/patches/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff |  
 68 
 debian/patches/series   |  
  3 
 debian/rules|  
  5 
 debian/serverminver |  
  4 
 debian/upstream/signing-key.asc |  
281 
 debian/watch|  
  1 
 dix/atom.c  |  
  8 
 dix/colormap.c  |  
 34 
 dix/cursor.c|  
  8 
 dix/devices.c   |  
 63

xorg-server: Changes to 'debian-experimental'

2014-06-17 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 6a0759f7130634559c74a31de83819d7fd592ae5
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jun 17 21:40:50 2014 +0200

Make xserver-common Multi-Arch: foreign (closes: #693922)

diff --git a/debian/changelog b/debian/changelog
index 372e7a1..97c4d84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.903-4) UNRELEASED; urgency=medium
+
+  * Make xserver-common Multi-Arch: foreign (closes: #693922)
+
+ -- Julien Cristau jcris...@debian.org  Tue, 17 Jun 2014 21:40:19 +0200
+
 xorg-server (2:1.15.99.903-3) experimental; urgency=medium
 
   * Set shared memory dir to /dev/shm (closes: #747894).
diff --git a/debian/control b/debian/control
index 77cdf84..7aa502b 100644
--- a/debian/control
+++ b/debian/control
@@ -339,6 +339,7 @@ Description: Xorg - the X.Org X server (debugging symbols)
 
 Package: xserver-common
 Architecture: all
+Multi-Arch: foreign
 Depends:
  x11-common,
  xkb-data,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wwzrg-00018c...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2014-06-05 Thread Julien Cristau 
 .gitignore   |1 
 ChangeLog| 1984 +++
 Xext/xres.c  |4 
 Xext/xselinux_hooks.c|4 
 Xi/exevents.c|   20 
 composite/compwindow.c   |1 
 config/10-quirks.conf|   16 
 config/config.c  |6 
 config/dbus-core.c   |4 
 configure.ac |   16 
 debian/changelog |   12 
 debian/control   |3 
 debian/patches/02_kbsd-input-devd.diff   |6 
 debian/patches/03_static-nettle.diff |2 
 debian/patches/04_wayland_scanner.diff   |   28 
 debian/patches/08_xfree86_fix_ia64_inx_outx.diff |8 
 debian/patches/series|1 
 debian/rules |3 
 debian/serverminver  |4 
 dix/devices.c|   12 
 dix/dixfonts.c   |2 
 dix/dixutils.c   |   25 
 dix/events.c |8 
 fb/fbpict.c  |2 
 fb/fbscreen.c|2 
 glamor/Makefile.am   |6 
 glamor/glamor.c  |   25 
 glamor/glamor.h  |3 
 glamor/glamor_context.h  |9 
 glamor/glamor_copyarea.c |   18 
 glamor/glamor_core.c |   11 
 glamor/glamor_egl.c  |   61 
 glamor/glamor_fbo.c  |   42 
 glamor/glamor_fill.c |   13 
 glamor/glamor_font.c |7 
 glamor/glamor_getimage.c |   96 -
 glamor/glamor_glx.c  |   26 
 glamor/glamor_glyphblt.c |   10 
 glamor/glamor_glyphs.c   |3 
 glamor/glamor_gradient.c |   24 
 glamor/glamor_image.c|  180 ++
 glamor/glamor_pixmap.c   |   22 
 glamor/glamor_points.c   |5 
 glamor/glamor_priv.h |   31 
 glamor/glamor_putimage.c |  161 -
 glamor/glamor_rects.c|4 
 glamor/glamor_render.c   |   64 
 glamor/glamor_segment.c  |   11 
 glamor/glamor_spans.c|   10 
 glamor/glamor_text.c |   46 
 glamor/glamor_tile.c |   13 
 glamor/glamor_transfer.c |6 
 glamor/glamor_trapezoid.c|   20 
 glamor/glamor_utils.h|   13 
 glamor/glamor_vbo.c  |   17 
 glamor/glamor_xv.c   |7 
 glx/glxcmds.c|   22 
 glx/glxdri2.c|  124 +
 glx/glxdriswrast.c   |   10 
 glx/glxext.c |   48 
 glx/glxserver.h  |1 
 hw/dmx/config/xdmxconfig.c   |3 
 hw/dmx/dmxfont.c |2 
 hw/dmx/glxProxy/glxcmds.c|2 
 hw/kdrive/linux/linux.c  |7 
 hw/kdrive/src/kdrive.c   |9 
 hw/xfree86/.gitignore|1 
 hw/xfree86/common/compiler.h |   10 
 hw/xfree86/common/xf86Bus.c  |4 
 hw/xfree86/common/xf86Config.c   |   36 
 hw/xfree86/common/xf86Module.h   |2 
 hw/xfree86/common/xf86Xinput.c   |9 
 hw/xfree86/common/xf86platformBus.c  |3 
 hw/xfree86/dri/dri.c |   14 
 hw/xfree86/dri2/dri2.c   |   29 
 hw/xfree86/int10/stub.c  |2 
 hw/xfree86/int10/xf86x86emu.c|1 
 hw/xfree86/loader/loadmod.c  |6 
 hw/xfree86/man/Makefile.am   |2 
 hw/xfree86/man/Xorg.wrap.man |4 
 hw/xfree86/man/Xwrapper.config.man   |2 
 hw/xfree86/man/xorg.conf.man |   24 
 hw/xfree86/modes/xf86Crtc.h  |8 
 hw/xfree86/modes/xf86Cursors.c   |   56 
 hw/xfree86/modes/xf86RandR12.c   |7

xorg-server: Changes to 'debian-experimental'

2014-06-05 Thread Julien Cristau 
 debian/changelog|6 ++
 debian/control  |   13 +
 debian/rules|5 -
 debian/xwayland.install |1 +
 4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 50b416bdf6c8c0b0dfb20fccfce1593156a067bb
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 22:10:56 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index d113ad6..d77febc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.903-2) experimental; urgency=medium
 
   * Enable xwayland for the main build on linux (closes: #747950).
 
- -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 21:26:21 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 21:58:45 +0200
 
 xorg-server (2:1.15.99.903-1) experimental; urgency=medium
 

commit d20afdd4966699247849bb0fd0c1a24f6784
Author: Julien Cristau jcris...@debian.org
Date:   Thu Jun 5 21:32:33 2014 +0200

Enable xwayland for the main build on linux (closes: #747950).

diff --git a/debian/changelog b/debian/changelog
index 755c8e0..d113ad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.903-2) UNRELEASED; urgency=medium
+
+  * Enable xwayland for the main build on linux (closes: #747950).
+
+ -- Julien Cristau jcris...@debian.org  Thu, 05 Jun 2014 21:26:21 +0200
+
 xorg-server (2:1.15.99.903-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/control b/debian/control
index 5d15562..77cdf84 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,8 @@ Build-Depends:
  x11-xkb-utils,
 # getpeereid()
  libbsd-dev [kfreebsd-any],
+# xwayland
+ libwayland-dev [linux-any],
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
@@ -362,3 +364,14 @@ Description: Xorg X server - source files
  .
  Unless you are building a software product using X server sources,
  you probably want xserver-xorg and/or xserver-xorg-core instead.
+
+Package: xwayland
+Architecture: linux-any
+Depends:
+ xserver-common (= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: Xwayland X server
+ This package provides an X server running on top of wayland, using wayland
+ input devices for input and forwarding either the root window or individual
+ top-level windows as wayland surfaces.
diff --git a/debian/rules b/debian/rules
index 673dbc9..5309815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,8 +45,10 @@ endif
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
selinux = --enable-xselinux
+   wayland = --enable-xwayland
 else
selinux = --disable-xselinux
+   wayland = --disable-xwayland
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -109,7 +111,6 @@ confflags += \
 --enable-xorg \
 --disable-linux-acpi \
 --disable-linux-apm \
---disable-xwayland \
 --disable-xquartz \
 --disable-xwin \
 --disable-xfake \
@@ -137,6 +138,7 @@ confflags_main = \
--enable-xace \
$(selinux) \
--enable-xfree86-utils \
+   $(wayland) \
--enable-dmx \
--enable-xvfb \
--enable-xnest \
@@ -168,6 +170,7 @@ confflags_udeb = \
--disable-xace \
--disable-xselinux \
--disable-xfree86-utils \
+   --disable-xwayland \
--disable-dmx \
--disable-xvfb \
--disable-xnest \
diff --git a/debian/xwayland.install b/debian/xwayland.install
new file mode 100644
index 000..4e62413
--- /dev/null
+++ b/debian/xwayland.install
@@ -0,0 +1 @@
+main/usr/bin/Xwayland usr/bin


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wse0t-0008ox...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2014-04-23 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/control   |3 +++
 debian/rules |9 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit b8ef40d8922c76c6efc62fa3055cca1968f7a1de
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 23 20:29:52 2014 +0200

Enable glamor.

diff --git a/debian/changelog b/debian/changelog
index 0f9b7da..9b4b6e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.15.99.902-2) UNRELEASED; urgency=medium
 
   * Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
+  * Enable glamor.
 
  -- Julien Cristau jcris...@debian.org  Wed, 23 Apr 2014 20:28:34 +0200
 
diff --git a/debian/control b/debian/control
index dcb80ea..15468fe 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,9 @@ Build-Depends:
  libxv-dev,
  libxinerama-dev,
  libxshmfence-dev (= 1.1) [!hurd-i386],
+# glamor
+ libepoxy-dev [linux-any kfreebsd-any],
+ libgbm-dev [linux-any],
 # XCB bits for Xephyr
  libxcb1-dev,
  libxcb-shape0-dev,
diff --git a/debian/rules b/debian/rules
index 98f5d96..9020090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2 --disable-dri3
 else
dri = --enable-dri --enable-dri2 --enable-dri3
+   dri += --enable-glamor
 endif
 
 config_backend = --disable-config-dbus --disable-config-hal

commit 225637e49835a0c6024ba58bfa358ef00af902fa
Author: Julien Cristau jcris...@debian.org
Date:   Wed Apr 23 20:29:13 2014 +0200

Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.

diff --git a/debian/changelog b/debian/changelog
index e70fbd9..0f9b7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.99.902-2) UNRELEASED; urgency=medium
+
+  * Enable dri3 on kfreebsd, now xtrans 1.3.3 supports fd passing.
+
+ -- Julien Cristau jcris...@debian.org  Wed, 23 Apr 2014 20:28:34 +0200
+
 xorg-server (2:1.15.99.902-1) experimental; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/rules b/debian/rules
index 2836310..98f5d96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,13 +52,7 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2 --disable-dri3
 else
-   dri = --enable-dri --enable-dri2
-ifeq ($(DEB_HOST_ARCH_OS), linux)
-   dri += --enable-dri3
-else
-   # disable dri3 on kbsd until xtrans fd passing is enabled
-   dri += --disable-dri3
-endif
+   dri = --enable-dri --enable-dri2 --enable-dri3
 endif
 
 config_backend = --disable-config-dbus --disable-config-hal


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wd3bi-t1...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2014-04-15 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f0e3a9efda01975f8d5687de28b06af2f8a0eda
Author: Julien Cristau jcris...@debian.org
Date:   Tue Apr 15 08:35:49 2014 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 14e75c0..e70fbd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.15.99.902-1) UNRELEASED; urgency=medium
+xorg-server (2:1.15.99.902-1) experimental; urgency=medium
 
   * New upstream snapshot.
 + fix Xephyr -screen (closes: #742028)
@@ -7,7 +7,7 @@ xorg-server (2:1.15.99.902-1) UNRELEASED; urgency=medium
   * Bump xtrans requirement to 1.3.3.
   * Bump xproto and fontsproto requirements.
 
- -- Julien Cristau jcris...@debian.org  Sun, 13 Apr 2014 17:18:44 +0200
+ -- Julien Cristau jcris...@debian.org  Tue, 15 Apr 2014 08:35:26 +0200
 
 xorg-server (2:1.15.0.901-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wzxil-00050z...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2014-01-06 Thread Julien Cristau 
 debian/changelog  |   12 
 debian/compat |2 +-
 debian/control|   14 ++
 debian/rules  |   18 ++
 debian/xorg-server-source.install |1 +
 5 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit 03f5cf60f42012a57c23e2b615a0cc545a682112
Author: Yaroslav Halchenko deb...@onerussian.com
Date:   Tue Jan 7 00:58:30 2014 +0100

Add xorg-server-source binary package

Provides a tarball with original (patched, autoreconfed) sources of the
xserver for use by vnc implementations (closes: #730552)

diff --git a/debian/changelog b/debian/changelog
index 665527a..14a9f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * Bump debhelper compat level to 7.
 
+  [ Yaroslav Halchenko ]
+  * Adding xorg-server-source binary package to provide a tarball with
+original (patched, autoreconfed) sources of the xserver (Closes:
+#730552)
+
  -- Julien Cristau jcris...@debian.org  Tue, 07 Jan 2014 00:51:53 +0100
 
 xorg-server (2:1.15.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 94a88f7..aaad746 100644
--- a/debian/control
+++ b/debian/control
@@ -341,3 +341,17 @@ Recommends:
 Replaces: xserver-xorg-core ( 2:1.5.2)
 Description: common files used by various X servers
  This package provides files necessary for all X.Org based X servers.
+
+Package: xorg-server-source
+Architecture: all
+Depends:
+ ${misc:Depends},
+Description: Xorg X server - source files
+ This package provides original Debian (with Debian patches already
+ applied, and autotools files updated) sources for the X.Org ('Xorg')
+ X server shipped in a tarball.  This enables other projects re-using
+ X server codebase (e.g. VNC servers) to (re-)use officially
+ Debian-supported version of the X xserver for their builds.
+ .
+ Unless you are building a software product using X server sources,
+ you probably want xserver-xorg and/or xserver-xorg-core instead.
diff --git a/debian/rules b/debian/rules
index c81c554..bf5f14b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,6 +192,16 @@ $(STAMP_DIR)/autoreconf: $(STAMP_DIR)/stampdir 
$(QUILT_STAMPFN)
autoreconf -vfi
$@
 
+$(STAMP_DIR)/build-source: $(STAMP_DIR)/autoreconf
+   mkdir -p build-source
+   tar \
+   --owner=0 --group=0 \
+--transform 's,^,xorg-server/,' \
+--exclude=stampdir --exclude=debian \
+--exclude=build-* --exclude=autom4te.cache \
+-cf - * | xz  build-source/xorg-server.tar.xz
+   $@
+
 $(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf
dh_testdir
mkdir -p build-$*
@@ -224,7 +234,7 @@ build: $(STAMP_DIR)/build-udeb
 build: $(STAMP_DIR)/tests-udeb
 endif
 build-arch: build
-build-indep: build
+build-indep: $(STAMP_DIR)/build-source build
 
 clean: unpatch
dh_testdir
@@ -357,7 +367,7 @@ endif
 
 
 # Build architecture-independent files here
-binary-indep: build install
+binary-indep: build-indep install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i
dh_installdocs -i
diff --git a/debian/xorg-server-source.install 
b/debian/xorg-server-source.install
new file mode 100644
index 000..712189c
--- /dev/null
+++ b/debian/xorg-server-source.install
@@ -0,0 +1 @@
+build-source/xorg-server.tar.* usr/src

commit cccd71746577278f6dc66572425b1728e4c1d4b2
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jan 7 00:55:37 2014 +0100

Stop using dh_install --sourcedir=debian/tmp

No longer necessary in v7

diff --git a/debian/rules b/debian/rules
index 89c54aa..c81c554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -325,7 +325,7 @@ binary-arch: build install
 
dh_installdocs -s
dh_installchangelogs -s
-   dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp 
--list-missing
+   dh_install $(DH_INSTALL_OPTIONS) -s --list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/pkgconfig 
pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
@@ -359,7 +359,7 @@ endif
 # Build architecture-independent files here
 binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
-   dh_install -i --sourcedir=debian/tmp
+   dh_install -i
dh_installdocs -i
dh_installchangelogs -i ChangeLog
 

commit a8d100ba5a22ef64a7ed5b7c1a7d85390310486e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jan 7 00:52:20 2014 +0100

Bump debhelper compat level to 7.

diff --git a/debian/changelog b/debian/changelog
index 089309f..665527a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.15.0-2) UNRELEASED; urgency=medium
+
+  *

xorg-server: Changes to 'debian-experimental'

2013-12-14 Thread Julien Cristau 
 debian/changelog |5 +++--
 debian/rules |8 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 370606acf2e5be14b5b05ee5de499212da8a5934
Author: Julien Cristau jcris...@debian.org
Date:   Sat Dec 14 18:16:26 2013 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 61159df..0809f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.99.904-2) UNRELEASED; urgency=medium
+xorg-server (2:1.14.99.904-2) experimental; urgency=medium
 
   * Pass VERBOSE=1 to make check to make debugging test failures possible.
   * Disable dri3 on kfreebsd.  xtrans doesn't enable fd passing there yet.
 
- -- Julien Cristau jcris...@debian.org  Thu, 12 Dec 2013 18:35:21 +0100
+ -- Julien Cristau jcris...@debian.org  Sat, 14 Dec 2013 18:16:17 +0100
 
 xorg-server (2:1.14.99.904-1) experimental; urgency=low
 

commit ce9a79990e68d68181aabcadaf9adb354d0752d9
Author: Julien Cristau jcris...@debian.org
Date:   Sat Dec 14 18:12:05 2013 +0100

Disable dri3 on kfreebsd.

xtrans doesn't enable fd passing there yet.

diff --git a/debian/changelog b/debian/changelog
index b7298df..61159df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.14.99.904-2) UNRELEASED; urgency=medium
 
   * Pass VERBOSE=1 to make check to make debugging test failures possible.
+  * Disable dri3 on kfreebsd.  xtrans doesn't enable fd passing there yet.
 
  -- Julien Cristau jcris...@debian.org  Thu, 12 Dec 2013 18:35:21 +0100
 
diff --git a/debian/rules b/debian/rules
index d76059d..89c54aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,13 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
dri = --disable-dri --disable-dri2 --disable-dri3
 else
-   dri = --enable-dri --enable-dri2 --enable-dri3
+   dri = --enable-dri --enable-dri2
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+   dri += --enable-dri3
+else
+   # disable dri3 on kbsd until xtrans fd passing is enabled
+   dri += --disable-dri3
+endif
 endif
 
 config_backend = --disable-config-dbus


-- 
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/e1vrt5p-0001pq...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2013-12-12 Thread Julien Cristau 
 debian/changelog |8 ++--
 debian/control   |2 +-
 debian/rules |5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 1f420d78fd147d9e1bc927dd98b158883e896ec3
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 12 12:11:31 2013 +0100

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 08e4028..8218b18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,18 @@
-xorg-server (2:1.14.99.904-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.99.904-1) experimental; urgency=low
 
   [ Julien Cristau ]
   * New upstream release candidate.
+  * Update (build-)dependencies:
+- bump x11proto-xext-dev, x11proto-gl-dev, xtrans-dev, libgl1-mesa-dev
+- add x11proto-present-dev, x11proto-dri3-dev, libxshmfence-dev
+  * Enable dri3 (on !hurd) and present extensions.
   * Point to http://www.debian.org/support instead of the uploader's email
 address in the Xorg log.
 
   [ Maarten Lankhorst ]
   * Disable xorg-server's linux acpi and apm support.  Can only cause bugs.
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Nov 2013 16:43:13 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 12 Dec 2013 12:11:14 +0100
 
 xorg-server (2:1.14.99.3-1) experimental; urgency=low
 

commit f48ca0e472ec5f7ecff18980263e7ca8793e911c
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 12 08:05:48 2013 +0100

Explicitly enable dri3 on !hurd, and present everywhere

dri3 needs libxshmfence, which doesn't work on hurd (lack of
PTHREAD_PROCESS_SHARED support).

diff --git a/debian/control b/debian/control
index 7112b51..94a88f7 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,7 @@ Build-Depends:
  libxfixes-dev (= 1:3.0.0),
  libxv-dev,
  libxinerama-dev,
- libxshmfence-dev (= 1.1),
+ libxshmfence-dev (= 1.1) [!hurd-i386],
 # XCB bits for Xephyr
  libxcb1-dev,
  libxcb-shape0-dev,
diff --git a/debian/rules b/debian/rules
index 741834e..dd8fe09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,9 +50,9 @@ else
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS), hurd)
-   dri = --disable-dri --disable-dri2
+   dri = --disable-dri --disable-dri2 --disable-dri3
 else
-   dri = --enable-dri --enable-dri2
+   dri = --enable-dri --enable-dri2 --enable-dri3
 endif
 
 config_backend = --disable-config-dbus
@@ -131,6 +131,7 @@ confflags_main = \
--enable-xdm-auth-1 \
--enable-glx \
$(dri) \
+   --enable-present \
--enable-xinerama \
--enable-xf86vidmode \
--enable-xace \


-- 
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/e1vr4hh-0003ax...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2013-12-12 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/rules |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit bc34e4fab1f8685faea26601a9f76d98f8f26244
Author: Julien Cristau jcris...@debian.org
Date:   Thu Dec 12 18:35:51 2013 +0100

Pass VERBOSE=1 to make check to make debugging test failures possible.

diff --git a/debian/changelog b/debian/changelog
index 8218b18..b7298df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.99.904-2) UNRELEASED; urgency=medium
+
+  * Pass VERBOSE=1 to make check to make debugging test failures possible.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 12 Dec 2013 18:35:21 +0100
+
 xorg-server (2:1.14.99.904-1) experimental; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index dd8fe09..d76059d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,7 +207,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/configure-%
$@
 
 $(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-%
-   cd build-$*  $(MAKE) check
+   cd build-$*  $(MAKE) check VERBOSE=1
$@
 
 build: abibumpcheck


-- 
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/e1vrab2-00038w...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2013-12-02 Thread Maarten Lankhorst 
 ChangeLog   |  324 
 Xext/sync.c |2 
 configure.ac|   37 ++---
 debian/changelog|2 
 debian/rules|2 
 exa/Makefile.am |4 
 glx/glxdri2.c   |4 
 hw/kdrive/ephyr/ephyr.c |9 +
 hw/kdrive/ephyr/hostx.c |4 
 hw/kdrive/src/kdrive.c  |3 
 hw/kdrive/src/kdrive.h  |1 
 hw/kdrive/src/kinput.c  |   10 -
 hw/xfree86/Makefile.am  |   11 -
 hw/xfree86/modes/xf86Crtc.c |3 
 hw/xnest/GCOps.c|1 
 include/input.h |   12 -
 mi/mieq.c   |2 
 miext/sync/Makefile.am  |3 
 miext/sync/misync.h |2 
 miext/sync/misyncfd.c   |   99 +
 miext/sync/misyncfd.h   |   45 ++
 miext/sync/misyncshm.c  |   21 +-
 miext/sync/misyncshm.h  |2 
 present/present.c   |   52 +--
 present/present_event.c |2 
 present/present_fake.c  |2 
 present/present_fence.c |   29 +++
 present/present_priv.h  |   17 ++
 present/present_screen.c|2 
 test/Makefile.am|4 
 30 files changed, 631 insertions(+), 80 deletions(-)

New commits:
commit e29f8177c0b72665334fc5fe8637de0b525785c0
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Dec 2 12:57:11 2013 +0100

disable xorg-servers linux acpi and apm support

Can only cause bugs.

diff --git a/debian/rules b/debian/rules
index 3d1168d..741834e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,6 +108,8 @@ confflags += \
 --enable-dpms \
 $(config_backend) \
 --enable-xorg \
+--disable-linux-acpi \
+--disable-linux-apm \
 --disable-xquartz \
 --disable-xwin \
 --disable-xfake \

commit 6ba8ab142ddec34b36cfb0f41f661ffb2b151120
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Mon Dec 2 10:48:56 2013 +0100

bump changelog

diff --git a/ChangeLog b/ChangeLog
index 9752e3b..547da14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,327 @@
+commit 80481267662c8687e73081237913fa561e7a6561
+Author: Keith Packard kei...@keithp.com
+Date:   Sat Nov 23 22:22:37 2013 -0800
+
+Bump release to 1.14.99.903 (1.15 RC3)
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit f1604002a32b7f098c2a16b4a8649c694af570c8
+Author: Keith Packard kei...@keithp.com
+Date:   Mon Nov 18 22:36:17 2013 -0800
+
+miext: Ensure xshmfence is only called when driver supports it
+
+This provides a place for drivers to insert their own FD-based
+SyncFence implementations, and prevents applications from using DRI3
+SyncFence creation functions unless the driver has some support for
+them.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Tested-by: Fredrik Höglund fred...@kde.org
+
+commit 037566c57caff93fd7717f385d4b532b81f19c77
+Author: Keith Packard kei...@keithp.com
+Date:   Mon Nov 18 22:33:27 2013 -0800
+
+Xext: Recover from miSyncInitFenceFromFD failure without crashing
+
+miSyncDestroyFence must not be called unless miSyncInitFence has been
+invoked, so if miSyncInitFenceFromFD fails, we must free the fence
+manually.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Tested-by: Fredrik Höglund fred...@kde.org
+
+commit e7000534a456fdf9cd4eaada3193846c8525f740
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date:   Sat Oct 5 08:47:03 2013 +0100
+
+glx/glxdri2: Unwrap EnterVT/LeaveVT upon CloseScreen
+
+In a similar spirit to
+
+commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
+Author: Keith Packard kei...@keithp.com
+Date:   Mon Jul 12 16:01:34 2010 -0700
+
+Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
+
+we need to unwrap our pScrn-EnterVT/LeaveVT hooks around server
+regeneration or else we cause an infinite recursion on the next VT
+switch afterwards.
+
+Bugzilla: 
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1235516
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+Reviewed-by: Keith Packard kei...@keithp.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 6d5883bd7e5b765f8f0548501b825d9e56840799
+Author: Keith Packard kei...@keithp.com
+Date:   Sat Nov 23 16:19:46 2013 -0800
+
+xnest: Ignore GetImage() error in xnestGetImage() (v3)
+
+(I found an amended version of this patch and applied the difference
+here - keithp)
+
+v3: Don't call Xsync before restoring error handler as any errors
+generated by XGetImage() should be processed when this call
+returns as suggested by Jamey Sharp ja...@minilop.net
+
+Signed-off-by: Egbert Eich e...@freedesktop.org
+Reviewed-by: Jamey Sharp ja...@minilop.net
+
+commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
+Author: Keith Packard

xorg-server: Changes to 'debian-experimental'

2013-11-24 Thread Julien Cristau 
 ChangeLog  | 1144 
 Makefile.am|   12 
 Xext/shm.c |  214 
 Xext/shmint.h  |   24 
 Xext/sync.c|   51 
 Xext/syncsrv.h |   13 
 Xext/xvdisp.c  |   13 
 Xi/exevents.c  |2 
 configure.ac   |  233 
 debian/changelog   |6 
 debian/control |   18 
 debian/patches/series  |1 
 debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch |   30 
 debian/serverminver|2 
 dix/region.c   |   15 
 dri3/Makefile.am   |   13 
 dri3/dri3.c|   87 
 dri3/dri3.h|   65 
 dri3/dri3_event.c  |  163 
 dri3/dri3_priv.h   |   80 
 dri3/dri3_request.c|  394 
 dri3/dri3_screen.c |   80 
 dri3/dri3int.h |   26 
 glx/Makefile.am|   18 
 glx/createcontext.c|4 
 glx/dispatch.h |19816 
--
 glx/extension_string.c |5 
 glx/extension_string.h |1 
 glx/glapi.c|  504 
 glx/glapi.h|  135 
 glx/glapi_gentable.c   |10058 -
 glx/glapitable.h   | 1016 
 glx/glprocs.h  | 3534 -
 glx/glthread.h |  234 
 glx/glxcmds.c  |   36 
 glx/glxcmdsswap.c  |4 
 glx/glxcontext.h   |   10 
 glx/glxdri.c   | 1172 
 glx/glxdri2.c  |   15 
 glx/glxdricommon.c |   67 
 glx/glxdriswrast.c |4 
 glx/glxext.c   |   46 
 glx/glxext.h   |   16 
 glx/glxserver.h|5 
 glx/glxstubs.c |   50 
 glx/indirect_dispatch.c| 3236 -
 glx/indirect_dispatch.h|  602 
 glx/indirect_dispatch_swap.c   | 4016 --
 glx/indirect_program.c |   49 
 glx/indirect_reqsize.c |   77 
 glx/indirect_reqsize.h |   47 
 glx/indirect_size.h|   12 
 glx/indirect_size_get.c|  204 
 glx/indirect_size_get.h|   16 
 glx/indirect_table.c   |  468 
 glx/indirect_texture_compression.c |   27 
 glx/indirect_util.c|7 
 glx/render2.c  |   69 
 glx/render2swap.c  |   69 
 glx/renderpix.c|   26 
 glx/renderpixswap.c|   26 
 glx/single2.c  |   18 
 glx/single2swap.c  |   16 
 glx/singlepix.c|   87 
 glx/singlepixswap.c|   88 
 glx/singlesize.c

xorg-server: Changes to 'debian-experimental'

2013-11-24 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/rules |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 842ac3db05f3a47e6470eb9851d3bfd4949b110d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Nov 24 17:13:20 2013 +0100

Stop putting people's email address in the X log

Point to http://www.debian.org/support instead of the uploader's email
address in the Xorg log.

diff --git a/debian/changelog b/debian/changelog
index d729c5f..0adde4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg-server (2:1.14.99.902-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+  * Point to http://www.debian.org/support instead of the uploader's email
+address in the Xorg log.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Nov 2013 16:43:13 +0100
 
diff --git a/debian/rules b/debian/rules
index 22cdd77..3d1168d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,10 +79,10 @@ endif
 INSTALL=/usr/bin/install
 
 VENDOR = $(shell lsb_release -i -s)
+SUPPORT = http://www.debian.org/support
 
 SOURCE_NAME:=  xorg-server
 SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / 
{print $$2}')
-BUILDER:= $(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / 
{print $$2}')
 
 # disable-static is so we don't get libfoo.a for modules.  now if only we could
 # kill the .las.
@@ -95,7 +95,7 @@ confflags += \
 $(config_tests) \
 --with-int10=x86emu \
 --with-os-vendor=$(VENDOR) \
---with-builderstring=$(SOURCE_NAME) $(SOURCE_VERSION) 
($(BUILDER)) \
+--with-builderstring=$(SOURCE_NAME) $(SOURCE_VERSION) 
($(SUPPORT)) \
 --with-xkb-path=/usr/share/X11/xkb \
 --with-xkb-output=/var/lib/xkb \
 --disable-install-libxf86config \


-- 
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/e1vkcjr-0001wb...@moszumanska.debian.org

xorg-server: Changes to 'debian-experimental'

2013-10-21 Thread Julien Cristau 
 .dir-locals.el |1 
 COPYING|1 
 ChangeLog  | 5208 
+-
 Makefile.am|2 
 Xext/panoramiX.c   |   20 
 Xext/saver.c   |6 
 Xext/security.c|   11 
 Xext/sync.c|  134 
 Xext/xvdisp.c  |8 
 Xext/xvmain.c  |4 
 Xi/chgdctl.c   |6 
 Xi/exevents.c  |   29 
 Xi/extinit.c   |2 
 Xi/grabdev.c   |5 
 Xi/setdval.c   |3 
 Xi/setmode.c   |4 
 Xi/xiallowev.c |2 
 Xi/xibarriers.c|   12 
 Xi/xibarriers.h|4 
 composite/compalloc.c  |4 
 composite/compext.c|7 
 config/10-quirks.conf  |   54 
 config/Makefile.am |4 
 config/non-seat0.conf.multi-seat   |   18 
 config/udev.c  |4 
 configure.ac   |   37 
 damageext/damageext.c  |   42 
 dbe/Makefile.am|3 
 dbe/dbe.c  |   81 
 dbe/dbestruct.h|   21 
 dbe/midbe.c|  126 
 dbe/midbestr.h |   75 
 debian/changelog   |   47 
 debian/control |   33 
 debian/patches/02_improve-posix-saved-ids-check.diff   |   65 
 debian/patches/04_hashtabletest-s390x.diff |   27 
 debian/patches/10_Include-missing-selection-h.diff |   20 
 debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch  |   42 
 debian/patches/series  |6 
 debian/patches/xfree86-Bump-to-video-ABI-15-and-input-ABI-20.patch |   30 
 debian/patches/xfree86-hurd-include-hurd.h.patch   |   53 
 debian/rules   |   12 
 debian/serverminver|6 
 debian/xserver-xfbdev.install  |1 
 dix/Makefile.am|3 
 dix/cursor.c   |6 
 dix/devices.c  |   48 
 dix/dispatch.c |  112 
 dix/dixfonts.c |5 
 dix/dixutils.c |8 
 dix/events.c   |  123 
 dix/getevents.c|   46 
 dix/globals.c  |1 
 dix/inpututils.c   |   30 
 dix/main.c |   12 
 dix/pixmap.c   |1 
 dix/privates.c |1 
 dix/ptrveloc.c |5 
 dix/registry.c |   25 
 dix/stubmain.c |   35 
 dix/window.c   |   15 
 exa/Makefile.am|2 
 exa/exa_classic.c  |1 
 exa/exa_migration_mixed.c  |   12 
 exa/exa_mixed.c|   13 
 fb/fb.h

xorg-server: Changes to 'debian-experimental'

2013-10-21 Thread Julien Cristau 
 debian/changelog   |3 +
 debian/patches/13_debian_add_xkbpath_env_variable.diff |   27 -
 2 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit a2beac4df0a11ae50acd5d31ef0a7bc9e157d46e
Author: Julien Cristau jcris...@debian.org
Date:   Mon Oct 21 22:11:44 2013 +0200

Delete old patch 13_debian_add_xkbpath_env_variable.diff.

It's not been applied since 1.6, and nobody seems to have noticed, so
clearly it's not needed.

diff --git a/debian/changelog b/debian/changelog
index 2f6dc10..bdbf088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
   * Stop building Xfbdev.
   * Reduce noise from dh_install --list-missing by deleting some files from the
 udeb build after make install.
+  * Delete old patch 13_debian_add_xkbpath_env_variable.diff.  It's not been
+applied since 1.6, and nobody seems to have noticed, so clearly it's not
+needed.
 
  -- Julien Cristau jcris...@debian.org  Mon, 21 Oct 2013 20:25:02 +0200
 
diff --git a/debian/patches/13_debian_add_xkbpath_env_variable.diff 
b/debian/patches/13_debian_add_xkbpath_env_variable.diff
deleted file mode 100644
index bd6ca5b..000
--- a/debian/patches/13_debian_add_xkbpath_env_variable.diff
+++ /dev/null
@@ -1,27 +0,0 @@
 xorg-server.orig/xkb/xkbInit.c
-+++ xorg-server/xkb/xkbInit.c
-@@ -805,6 +805,14 @@
- extern unsigned char  XkbDfltAccessXOptions;
- 
- int
-+xkbInitGlobals()
-+{
-+char * xkbpath= getenv(XKBPATH);
-+if (xkbpath!=NULL)
-+  XkbBaseDirectory= xkbpath;
-+}
-+
-+int
- XkbProcessArguments(int argc,char *argv[],int i)
- {
- if (strcmp(argv[i],-kb)==0) {
 xorg-server.orig/os/utils.c
-+++ xorg-server/os/utils.c
-@@ -685,6 +685,7 @@
-  */
- void InitGlobals(void)
- {
-+xkbInitGlobals();
- ddxInitGlobals();
- }
- 


-- 
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/e1vylpz-0001wa...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-10-21 Thread Julien Cristau 
 debian/changelog |9 -
 debian/control   |1 -
 debian/rules |5 +++--
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 1db4f64f98f5586635ced39eb81f8a016129874b
Author: Julien Cristau jcris...@debian.org
Date:   Mon Oct 21 23:46:39 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index fae465b..6f8be69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.99.3-1) experimental; urgency=low
 
   * New upstream snapshot.
   * Drop patches applied upstream:
@@ -18,7 +18,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
   * Run abibumpcheck on build instead of clean so it's done on a patched tree.
   * Remove Drew and Cyril from Uploaders.
 
- -- Julien Cristau jcris...@debian.org  Mon, 21 Oct 2013 20:25:02 +0200
+ -- Julien Cristau jcris...@debian.org  Mon, 21 Oct 2013 23:46:34 +0200
 
 xorg-server (2:1.14.3-4) unstable; urgency=high
 

commit 45e4378c5c107026d0dd793f8d4f81a873bdfb37
Author: Julien Cristau jcris...@debian.org
Date:   Mon Oct 21 23:46:24 2013 +0200

Remove Drew and Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index c9b91dc..fae465b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
   * Reduce noise from dh_install --list-missing by deleting some files from the
 udeb build after make install.
   * Run abibumpcheck on build instead of clean so it's done on a patched tree.
+  * Remove Drew and Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Mon, 21 Oct 2013 20:25:02 +0200
 
diff --git a/debian/control b/debian/control
index 4ae4c81..e661228 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xorg-server
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Drew Parsons dpars...@debian.org, Cyril Brulebois 
k...@debian.org
 # all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
 # server, and common dependencies for the DIX.
 # x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.

commit 6c609aa062afaf42af5981d2fbe1f395cc4510e6
Author: Julien Cristau jcris...@debian.org
Date:   Mon Oct 21 23:30:18 2013 +0200

Run abibumpcheck on build instead of clean so it's done on a patched tree.

diff --git a/debian/changelog b/debian/changelog
index bdbf088..c9b91dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,7 @@ xorg-server (2:1.14.99.3-1) UNRELEASED; urgency=low
   * Stop building Xfbdev.
   * Reduce noise from dh_install --list-missing by deleting some files from the
 udeb build after make install.
-  * Delete old patch 13_debian_add_xkbpath_env_variable.diff.  It's not been
-applied since 1.6, and nobody seems to have noticed, so clearly it's not
-needed.
+  * Run abibumpcheck on build instead of clean so it's done on a patched tree.
 
  -- Julien Cristau jcris...@debian.org  Mon, 21 Oct 2013 20:25:02 +0200
 
diff --git a/debian/rules b/debian/rules
index f4e2ccc..22cdd77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,6 +207,7 @@ $(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-%
cd build-$*  $(MAKE) check
$@
 
+build: abibumpcheck
 build: $(STAMP_DIR)/build-main
 build: $(STAMP_DIR)/tests-main
 ifeq ($(udeb), yes)
@@ -216,7 +217,7 @@ endif
 build-arch: build
 build-indep: build
 
-clean: unpatch abibumpcheck
+clean: unpatch
dh_testdir
rm -rf $(STAMP_DIR)
rm -f config.cache config.log config.status
@@ -294,7 +295,7 @@ SERVERMINVER = debian/serverminver
 serverminver = $(shell head -1 $(SERVERMINVER))
 
 .PHONY: abibumpcheck
-abibumpcheck: debian/serverminver
+abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
@echo Checking for the need of an ABI bump
# Build an updated version of the file:
head -1 $(SERVERMINVER)  $(SERVERMINVER).new


-- 
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/e1vynzl-000134...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-09-19 Thread Julien Cristau 
 debian/changelog  |6 -
 debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch |   42 +++
 debian/patches/series |2 
 debian/patches/xfree86-hurd-include-hurd.h.patch  |   53 ++
 4 files changed, 101 insertions(+), 2 deletions(-)

New commits:
commit 4cf9fe0f18eb88e85eb01ca0e3a26c5f16ebef2d
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 20 00:21:49 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index 7201546..112b9cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-2) experimental; urgency=low
 
   * Delete test-driver on clean.
   * Add a couple patches to fix FTBFS on hurd (closes: #720736).  Thanks, Pino
 Toscano!
 
- -- Julien Cristau jcris...@debian.org  Mon, 16 Sep 2013 01:22:24 +0200
+ -- Julien Cristau jcris...@debian.org  Fri, 20 Sep 2013 00:21:41 +0200
 
 xorg-server (2:1.14.3-1) experimental; urgency=low
 

commit e9e6da833df164266653fc4f7585536281bab847
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 20 00:09:09 2013 +0200

Add a couple patches to fix FTBFS on hurd (closes: #720736).

Thanks, Pino Toscano!

diff --git a/debian/changelog b/debian/changelog
index c232113..7201546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
 
   * Delete test-driver on clean.
+  * Add a couple patches to fix FTBFS on hurd (closes: #720736).  Thanks, Pino
+Toscano!
 
  -- Julien Cristau jcris...@debian.org  Mon, 16 Sep 2013 01:22:24 +0200
 
diff --git a/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch 
b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
new file mode 100644
index 000..70b1862
--- /dev/null
+++ b/debian/patches/os-move-arpa-inet.h-for-any-win32-system.patch
@@ -0,0 +1,42 @@
+From 006b123a801afab44a9e1a3d6e2ff5e1c6415362 Mon Sep 17 00:00:00 2001
+From: Pino Toscano toscano.p...@tiscali.it
+Date: Wed, 28 Aug 2013 17:15:03 +0200
+Subject: [PATCH] os: move arpa/inet.h for any !win32 system
+
+It is needed in IPv6 configurations (for inet_pton) also when
+SIOCGIFCONF is not defined.
+
+Signed-off-by: Pino Toscano toscano.p...@tiscali.it
+---
+ os/access.c |8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/os/access.c b/os/access.c
+index 88a44d9..6d991b3 100644
+--- a/os/access.c
 b/os/access.c
+@@ -163,6 +163,10 @@ SOFTWARE.
+ /* #endif */
+ #endif
+ 
++#if defined(IPv6)  defined(AF_INET6)
++#include arpa/inet.h
++#endif
++
+ #endif  /* WIN32 */
+ 
+ #define X_INCLUDE_NETDB_H
+@@ -461,10 +465,6 @@ DefineSelf(int fd)
+ #endif
+ 
+ #if defined(IPv6)  defined(AF_INET6)
+-#include arpa/inet.h
+-#endif
+-
+-#if defined(IPv6)  defined(AF_INET6)
+ static void
+ in6_fillscopeid(struct sockaddr_in6 *sin6)
+ {
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c42a991..a032067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
 08_xfree86_fix_ia64_inx_outx.diff
 10_Include-missing-selection-h.diff
+os-move-arpa-inet.h-for-any-win32-system.patch
+xfree86-hurd-include-hurd.h.patch
diff --git a/debian/patches/xfree86-hurd-include-hurd.h.patch 
b/debian/patches/xfree86-hurd-include-hurd.h.patch
new file mode 100644
index 000..b36602d
--- /dev/null
+++ b/debian/patches/xfree86-hurd-include-hurd.h.patch
@@ -0,0 +1,53 @@
+From ef6a236cf9b795017c9c8c4447a6735fa04bb061 Mon Sep 17 00:00:00 2001
+From: Pino Toscano toscano.p...@tiscali.it
+Date: Wed, 28 Aug 2013 17:04:48 +0200
+Subject: [PATCH] xfree86/hurd: include hurd.h
+
+Needed for using get_privileged_port.
+
+Signed-off-by: Pino Toscano toscano.p...@tiscali.it
+---
+ hw/xfree86/os-support/hurd/hurd_init.c  |1 +
+ hw/xfree86/os-support/hurd/hurd_mmap.c  |1 +
+ hw/xfree86/os-support/hurd/hurd_video.c |1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_init.c 
b/hw/xfree86/os-support/hurd/hurd_init.c
+index 185b2b9..fe1a764 100644
+--- a/hw/xfree86/os-support/hurd/hurd_init.c
 b/hw/xfree86/os-support/hurd/hurd_init.c
+@@ -42,6 +42,7 @@
+ #include sys/file.h
+ #include assert.h
+ #include mach.h
++#include hurd.h
+ 
+ int
+ xf86ProcessArgument(int argc, char **argv, int i)
+diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c 
b/hw/xfree86/os-support/hurd/hurd_mmap.c
+index 6ac9efd..8e089ca 100644
+--- a/hw/xfree86/os-support/hurd/hurd_mmap.c
 b/hw/xfree86/os-support/hurd/hurd_mmap.c
+@@ -27,6 +27,7 @@
+ #includemach.h
+ #includedevice/device.h
+ #includemach/machine/mach_i386.h
++#include hurd.h
+ 
+ #include X11/X.h
+ 
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c 
b/hw/xfree86/os-support/hurd/hurd_video.c
+index

xorg-server: Changes to 'debian-experimental'

2013-09-15 Thread Michele Cane 
 ChangeLog  |  135 +
 Xi/xiqueryversion.c|   53 ++
 configure.ac   |6 -
 debian/changelog   |8 +-
 dix/getevents.c|2 
 dix/touch.c|3 
 hw/kdrive/src/kinput.c |2 
 include/inputstr.h |2 
 test/xi2/protocol-xiqueryversion.c |   60 
 9 files changed, 215 insertions(+), 56 deletions(-)

New commits:
commit 2ca352e25962fea04d0553ba94af46e86f9ae908
Author: Michele Cane michele.c...@gmail.com
Date:   Sun Sep 15 22:47:10 2013 +0200

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 800af89..fc7ffc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,138 @@
+commit 9acb64f54ee9dd2fe41afda159b919280850ad8e
+Author: Matt Dew mar...@osource.org
+Date:   Thu Sep 12 21:17:40 2013 -0600
+
+bump version from 1.14.2.902 to 1.14.3
+
+commit af1c57152e10cfa55843e6330cffc6a3c8c517d3
+Author: Chris Clayton chris2...@googlemail.com
+Date:   Wed Sep 4 15:42:04 2013 +1000
+
+kdrive: fix build error on gcc 4.8 for out-of-bounds array access
+
+I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
+of gcc-4.8:
+
+input.c:225:43: error: array subscript is above array bounds
+[-Werror=array-bounds]
+
+This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
+KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
+be beyond the end of the array.
+
+Signed-off-by: Chris Clayton chris2...@googlemail.com
+Reviewed-by: Keith Packard kei...@keithp.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 0e37fefea5e91dfdcd18ffd941daa7d05cc3180d
+Author: Matt Dew mar...@osource.org
+Date:   Thu Aug 22 17:43:51 2013 -0600
+
+bump rev number from 1.14.2.901 to 1.14.2.902
+
+commit 917c11ff97eb302d3c2d0565c8dd6d93101d6466
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Jul 30 15:31:24 2013 +0200
+
+test/xi2: fix protocol-xiqueryversion test
+
+The old code was broken and allowed setting client version = XIVersion,
+this was fixed in the previous patch, but updating the value for XIVersion
+broke the tests, so fix the tests too.
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit b6e5c4669e0db391966deb397e8c975ec7f0124d)
+
+commit 804836c53083fdb9f43be6f51740df5d12d57cb4
+Author: Maarten Lankhorst maarten.lankho...@canonical.com
+Date:   Tue Jul 30 14:45:21 2013 +0200
+
+Xi: Clamp XIClient maximal version to XIVersion
+
+Do not allow setting client version to an arbitrary value = XIVersion.
+Fixes a test error with test/xi2/protocol-xiqueryversion.c, introduced by
+commit 4360514d1c Xi: Allow clients to ask for 2.3 and then 2.2 without 
failing
+
+Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
+Reviewed-by: Keith Packard kei...@keithp.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 500e844a24962c9e70abb3d614f1973013b2de73)
+
+commit 7250c310b50c96709f2082e7752fc889557abc26
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Aug 13 10:50:25 2013 +1000
+
+Revert test: fix XIQueryVersion check for new behaviour
+
+This reverts commit cdcb708678c4785cd7b026b90e316691176e5244.
+
+commit cdcb708678c4785cd7b026b90e316691176e5244
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jul 30 08:03:12 2013 +1000
+
+test: fix XIQueryVersion check for new behaviour
+
+As of 4360514d1cc8e3132f93f56172d291074e8c770f, XIQueryVersion supports
+requesting versions 2.2+ in random order, only 2.0 and 2.1 are restricted.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit a5abf790183798ad8aa2c29c056df364cfbd)
+
+commit e6da18f67516dcee394cd0eff591a255b59fe544
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Jul 10 22:42:55 2013 -0700
+
+Xi: Allow clients to ask for 2.3 and then 2.2 without failing
+
+This allows different sub-systems within the same application to
+request different Xi versions without either getting old behaviour
+everywhere or simply failing with a BadValue.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 4360514d1cc8e3132f93f56172d291074e8c770f)
+
+commit 0857f3c72d0d1bf5eac52f084e9a1adf077e7397
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Jul 22 13:43:07 2013 +1000
+
+dix: set the valuator mask to ensure XI 1.x events have data
+
+XI 1.x only allows for first + num valuators, so if a device sends data for
+

xorg-server: Changes to 'debian-experimental'

2013-09-15 Thread Julien Cristau 
 debian/changelog |   10 --
 debian/rules |3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 29c4751f18e60504c5a1f294b5364e05a3953b6f
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 16 01:22:44 2013 +0200

Delete test-driver on clean.

diff --git a/debian/changelog b/debian/changelog
index afdacd3..c232113 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-2) UNRELEASED; urgency=low
+
+  * Delete test-driver on clean.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 16 Sep 2013 01:22:24 +0200
+
 xorg-server (2:1.14.3-1) experimental; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 0c3257f..c42d3ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,7 +219,6 @@ build-indep: build
 
 clean: unpatch abibumpcheck
dh_testdir
-
rm -rf $(STAMP_DIR)
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
@@ -231,7 +230,7 @@ clean: unpatch abibumpcheck
rm -f include/do-not-use-config.h.in
rm -f m4/lt*.m4 m4/libtool.m4
find -name Makefile.in -delete
-
+   rm -f test-driver
dh_clean
 
 install: build

commit dda35e75c1d9ce972d62c67a529a1d85b27e340f
Author: Julien Cristau jcris...@debian.org
Date:   Sun Sep 15 23:57:32 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index ca23988..afdacd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.3-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-1) experimental; urgency=low
 
   [ Julien Cristau ]
   * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.  That
@@ -8,7 +8,7 @@ xorg-server (2:1.14.3-1) UNRELEASED; urgency=low
   [ Michele Cane ]
   * New upstream release.
 
- -- Michele Cane michele.c...@gmail.com  Sun, 15 Sep 2013 22:46:06 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 15 Sep 2013 23:57:26 +0200
 
 xorg-server (2:1.14.2.901-2) experimental; 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/e1vllee-0003h9...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-08-13 Thread Julien Cristau 
 debian/changelog |8 
 debian/control   |1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e74ce3cf7ee92479861170dcc003da1e58010b2a
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jul 9 12:19:59 2011 +0200

Remove the Replaces: xdmx from xdmx-tools, that was before lenny.

[cherry-pick from the 2:1.10.3-1 package version]
Conflicts:
debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 9a468f3..c90609e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.14.2.901-3) UNRELEASED; urgency=low
+
+  * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.  That
+change was done in the 1.10.x timeframe and then lost when moving to
+1.11.x.
+
+ -- Julien Cristau jcris...@debian.org  Tue, 13 Aug 2013 19:48:22 +0200
+
 xorg-server (2:1.14.2.901-2) experimental; urgency=low
 
   * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
diff --git a/debian/control b/debian/control
index 9901864..f06251e 100644
--- a/debian/control
+++ b/debian/control
@@ -222,7 +222,6 @@ Depends:
  xdmx,
  ${shlibs:Depends},
  ${misc:Depends},
-Replaces: xdmx (= 2:1.1.1-10)
 Description: Distributed Multihead X tools
  This package provides a collection of tools used for administration of
  the Xdmx server; see the xdmx package for more information.


-- 
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/e1v9irf-0004j3...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-08-03 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7fa0c4c3109a4d599dc441ba43ade014de117277
Author: Julien Cristau jcris...@debian.org
Date:   Sat Aug 3 18:17:43 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index e705c9d..9a468f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
+xorg-server (2:1.14.2.901-2) experimental; urgency=low
 
   * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
 Require dpkg-dev 1.16.1.
@@ -6,7 +6,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
   * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
   * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
 
- -- Julien Cristau jcris...@debian.org  Sat, 27 Jul 2013 18:48:37 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 03 Aug 2013 18:17:30 +0200
 
 xorg-server (2:1.14.2.901-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
Archive: http://lists.debian.org/e1v5egq-0001m0...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-08-02 Thread Julien Cristau 
 debian/changelog |5 -
 debian/patches/02_improve-posix-saved-ids-check.diff |   65 +++
 debian/patches/02_kbsd-issetugid.diff|   57 
 debian/patches/03_kbsd-parser-include.diff   |   26 ---
 debian/patches/03_static-nettle.diff |   17 
 debian/patches/04_hashtabletest-s390x.diff   |   27 +++
 debian/patches/series|5 -
 7 files changed, 115 insertions(+), 87 deletions(-)

New commits:
commit c1cb0e67380f8d0c21929bd5e8e1dec0cb1c4bc0
Author: Julien Cristau jcris...@debian.org
Date:   Sat Aug 3 00:10:53 2013 +0200

Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).

diff --git a/debian/changelog b/debian/changelog
index 17a6253..e705c9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
 Require dpkg-dev 1.16.1.
   * Also improve POSIX_SAVED_IDS check to work on kbsd.
   * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
+  * Fix a test failure on 64bit big-endian (s390x, ppc64, sparc64).
 
  -- Julien Cristau jcris...@debian.org  Sat, 27 Jul 2013 18:48:37 +0200
 
diff --git a/debian/patches/04_hashtabletest-s390x.diff 
b/debian/patches/04_hashtabletest-s390x.diff
new file mode 100644
index 000..0401035
--- /dev/null
+++ b/debian/patches/04_hashtabletest-s390x.diff
@@ -0,0 +1,27 @@
+From 3562cb865b13d6f59e5c3b472d073ad6bbc06ceb Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Fri, 2 Aug 2013 23:40:55 +0200
+Subject: [PATCH] test: include dix-config.h in hashtabletest.c
+
+Missing _XSERVER64 define caused inconsistent sizeof(XID) between the
+test and hashtable code, leading to test failures on 64bit big endian
+archs like s390x or ppc64.
+---
+ test/hashtabletest.c |4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/hashtabletest.c b/test/hashtabletest.c
+index 64c7091..6af14a8 100644
+--- a/test/hashtabletest.c
 b/test/hashtabletest.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_DIX_CONFIG_H
++#include dix-config.h
++#endif
++
+ #include misc.h
+ #include stdlib.h
+ #include stdio.h
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 015811b..c42a991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 001_fedora_extramodes.patch
 02_improve-posix-saved-ids-check.diff
 03_static-nettle.diff
+04_hashtabletest-s390x.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
 08_xfree86_fix_ia64_inx_outx.diff

commit 73d2fba2c9c61d4e4f45089fece8e18a58d9becb
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 2 20:18:37 2013 +0200

Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).

diff --git a/debian/changelog b/debian/changelog
index 4318093..17a6253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
   * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
 Require dpkg-dev 1.16.1.
   * Also improve POSIX_SAVED_IDS check to work on kbsd.
+  * Link against libnettle.a, to unbreak the udeb (there's no libnettle udeb).
 
  -- Julien Cristau jcris...@debian.org  Sat, 27 Jul 2013 18:48:37 +0200
 
diff --git a/debian/patches/03_static-nettle.diff 
b/debian/patches/03_static-nettle.diff
new file mode 100644
index 000..4a48338
--- /dev/null
+++ b/debian/patches/03_static-nettle.diff
@@ -0,0 +1,17 @@
+Link against static libnettle
+
+There's no libnettle udeb.
+
+Index: xorg-server/configure.ac
+===
+--- xorg-server.orig/configure.ac  2013-08-02 20:15:25.471466837 +0200
 xorg-server/configure.ac   2013-08-02 20:17:12.875999417 +0200
+@@ -1433,7 +1433,7 @@
+ if test x$with_sha1 = xlibnettle; then
+   AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1],
+ [Use libnettle SHA1 functions])
+-  SHA1_LIBS=-lnettle
++  SHA1_LIBS=-l:libnettle.a
+ fi
+ AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+ if test x$with_sha1 = x  test x$HAVE_LIBGCRYPT = xyes; then
diff --git a/debian/patches/series b/debian/patches/series
index c85071a..015811b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
 02_improve-posix-saved-ids-check.diff
+03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
 08_xfree86_fix_ia64_inx_outx.diff

commit d816d729d2746a186ee1489ce4ddc3cdd211fa4b
Author: Julien Cristau jcris...@debian.org
Date:   Fri Aug 2 19:18:47 2013 +0200

Replace kbsd fix with a better one

issetugid is now declared by libc, and we can use _POSIX_SAVED_IDS

diff --git a/debian/changelog b/debian/changelog
index 6938725..4318093

xorg-server: Changes to 'debian-experimental'

2013-07-28 Thread Julien Cristau 
 debian/changelog   |9 
 debian/control |1 
 debian/patches/02_kbsd-issetugid.diff  |   57 +
 debian/patches/03_kbsd-parser-include.diff |   26 +
 debian/patches/series  |3 +
 debian/rules   |   23 ++-
 6 files changed, 100 insertions(+), 19 deletions(-)

New commits:
commit e8236644c6808ac7b21d99867c6a789ad445d9fc
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 27 20:13:48 2013 +0200

kfreebsd build fix

diff --git a/debian/changelog b/debian/changelog
index de97c37..6938725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.14.2.901-2) UNRELEASED; urgency=low
 
   * Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.
 Require dpkg-dev 1.16.1.
+  * Also add missing include and AC_CHECK_DECLS([issetugid]) for more kfreebsd
+fail.
 
  -- Julien Cristau jcris...@debian.org  Sat, 27 Jul 2013 18:48:37 +0200
 
diff --git a/debian/patches/02_kbsd-issetugid.diff 
b/debian/patches/02_kbsd-issetugid.diff
new file mode 100644
index 000..4ac82de
--- /dev/null
+++ b/debian/patches/02_kbsd-issetugid.diff
@@ -0,0 +1,57 @@
+From e3eef88873d47ee62df5d01eaf1577e7e71cefe5 Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Sat, 27 Jul 2013 20:01:50 +0200
+Subject: [PATCH 1/2] xfree86: Check for issetugid declaration
+
+Avoids 'implicit function declaration' build error on gnu/kfreebsd.
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+---
+ configure.ac |1 +
+ hw/xfree86/common/xf86Init.c |2 +-
+ include/xorg-config.h.in |4 
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6ecba4..a93e903 100644
+--- a/configure.ac
 b/configure.ac
+@@ -213,6 +213,7 @@ AC_CHECK_FUNC([dlopen], [],
+ AC_SUBST(DLOPEN_LIBS)
+ 
+ dnl Checks for library functions.
++AC_CHECK_DECLS([issetugid])
+ AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
+   getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
+   mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 91ec4c8..6caaa51 100644
+--- a/hw/xfree86/common/xf86Init.c
 b/hw/xfree86/common/xf86Init.c
+@@ -253,7 +253,7 @@ xf86PrivsElevated(void)
+ privsElevated = TRUE;
+ }
+ else {
+-#if defined(HAVE_ISSETUGID)
++#if defined(HAVE_ISSETUGID)  HAVE_DECL_ISSETUGID
+ privsElevated = issetugid();
+ #elif defined(HAVE_GETRESUID)
+ uid_t ruid, euid, suid;
+diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
+index a71b25d..d9e7ec5 100644
+--- a/include/xorg-config.h.in
 b/include/xorg-config.h.in
+@@ -130,6 +130,10 @@
+ /* Use libpciaccess */
+ #undef XSERVER_LIBPCIACCESS
+ 
++/* Define to 1 if you have the declaration of `issetugid', and to 0 if you
++   don't. */
++#undef HAVE_DECL_ISSETUGID
++
+ /* Have setugid */
+ #undef HAVE_ISSETUGID
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/03_kbsd-parser-include.diff 
b/debian/patches/03_kbsd-parser-include.diff
new file mode 100644
index 000..a03661b
--- /dev/null
+++ b/debian/patches/03_kbsd-parser-include.diff
@@ -0,0 +1,26 @@
+From d9079fc23e3cd7c78885ee9316be11878312d0de Mon Sep 17 00:00:00 2001
+From: Julien Cristau jcris...@debian.org
+Date: Sat, 27 Jul 2013 20:09:16 +0200
+Subject: [PATCH 2/2] xfree86: include os.h for FatalError
+
+Signed-off-by: Julien Cristau jcris...@debian.org
+---
+ hw/xfree86/parser/write.c |2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
+index 9c706a0..b525b11 100644
+--- a/hw/xfree86/parser/write.c
 b/hw/xfree86/parser/write.c
+@@ -67,6 +67,8 @@
+ 
+ #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
+ #define HAS_SAVED_IDS_AND_SETEUID
++#else
++#include os.h
+ #endif
+ #if defined(WIN32)
+ #define HAS_NO_UIDS
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index b231575..7dc7264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
 ## Patches with a number  100 are applied in debian.
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
-#13_debian_add_xkbpath_env_variable.diff
+02_kbsd-issetugid.diff
+03_kbsd-parser-include.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff
 08_xfree86_fix_ia64_inx_outx.diff

commit 1e2c8637ff648ed3fcd09e81289ac0cbca5c3d7f
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 27 18:51:09 2013 +0200

Use libbsd-overlay to get missing declarations on kfreebsd and fix FTBFS.

Require dpkg-dev 1.16.1 for dpkg-buildflags --export=configure.

diff --git a/debian/changelog b/debian/changelog
index 63f9c84..de97c37 100644
---

xorg-server: Changes to 'debian-experimental'

2013-07-28 Thread Julien Cristau 
 ChangeLog  |  621 +
 Xext/saver.c   |8 
 Xi/exevents.c  |  155 ++---
 Xi/ungrdevb.c  |2 
 Xi/ungrdevk.c  |2 
 Xi/xipassivegrab.c |2 
 configure.ac   |6 
 debian/changelog   |   52 +
 debian/control |   11 
 debian/patches/10_Include-missing-selection-h.diff |   20 
 debian/patches/series  |1 
 debian/rules   |6 
 dix/cursor.c   |   29 
 dix/devices.c  |4 
 dix/dispatch.c |3 
 dix/events.c   |  101 +--
 dix/grabs.c|   21 
 dix/main.c |3 
 dix/pixmap.c   |2 
 dix/touch.c|  114 +++
 dix/window.c   |   15 
 fb/fbpixmap.c  |1 
 glx/glxdri.c   |2 
 hw/xfree86/common/xf86platformBus.c|8 
 hw/xfree86/modes/xf86Crtc.c|   34 -
 hw/xfree86/modes/xf86Cursors.c |4 
 hw/xfree86/ramdac/xf86Cursor.c |   28 
 include/cursor.h   |4 
 include/dixgrabs.h |2 
 include/eventstr.h |1 
 include/input.h|2 
 include/inputstr.h |2 
 render/animcur.c   |3 
 xfixes/cursor.c|6 
 34 files changed, 1057 insertions(+), 218 deletions(-)

New commits:
commit 7b684f9fe7edafda652bf7c003332d5f66dd728b
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 27 13:18:50 2013 +0200

Upload to experimental

diff --git a/debian/changelog b/debian/changelog
index c264855..63f9c84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.14.2.901-1) experimental; urgency=low
 
   * New upstream release
 
@@ -29,7 +29,7 @@ xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
 d/rules.
   * Make build-deps match xserver-xorg-dev dependencies and configure checks.
 
- -- Julien Cristau jcris...@debian.org  Fri, 26 Jul 2013 14:05:51 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 27 Jul 2013 13:18:28 +0200
 
 xorg-server (2:1.12.4-6.1) unstable; urgency=low
 

commit d227ac876d909f0ace65ff6a39f93fec05e5135d
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 27 13:17:59 2013 +0200

Make build-deps match xserver-xorg-dev dependencies and configure checks.

diff --git a/debian/changelog b/debian/changelog
index eef11b2..c264855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xorg-server (2:1.14.2.901-1) UNRELEASED; urgency=low
   * Merge sid branch up to 2:1.12.4-6.1.
   * Drop old --disable-builddocs, --disable-xcalibrate configure options from
 d/rules.
+  * Make build-deps match xserver-xorg-dev dependencies and configure checks.
 
  -- Julien Cristau jcris...@debian.org  Fri, 26 Jul 2013 14:05:51 +0200
 
diff --git a/debian/control b/debian/control
index ee4b6ef..90aaa86 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends:
  x11proto-randr-dev (= 1.4.0),
  x11proto-record-dev (= 1.13.99.1),
  x11proto-render-dev (= 2:0.11),
- x11proto-resource-dev,
+ x11proto-resource-dev (= 1.2.0),
  x11proto-scrnsaver-dev,
  x11proto-video-dev,
  x11proto-xcmisc-dev (= 1.2.0),
@@ -162,22 +162,21 @@ Architecture: any
 Depends:
  libpixman-1-dev (= 0.27.2),
  x11proto-core-dev (= 7.0.22),
- x11proto-input-dev (= 2.2.99.1),
+ x11proto-input-dev (= 2.3),
  x11proto-xext-dev (= 7.1.99),
  x11proto-video-dev,
  x11proto-randr-dev (= 1.4.0),
  x11proto-render-dev (= 2:0.11),
  x11proto-dri2-dev (= 2.8),
- x11proto-gl-dev,
+ x11proto-gl-dev (= 1.4.16),
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
  x11proto-kb-dev,
  x11proto-xf86dri-dev,
- x11proto-resource-dev,
+ x11proto-resource-dev (= 1.2.0),
  x11proto-scrnsaver-dev,
  libxkbfile-dev,
  libpciaccess-dev,
- libpixman-1-dev (= 0.21.8),
  mesa-common-dev,
  ${misc:Depends},
 Description: Xorg X server - development files

commit 28b1774c24d03c2a28ac9ae4870b39418bc14a36
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 27 13:17:10 2013 +0200

Drop old unrecognized configure options from d/rules.

diff --git a/debian/changelog b/debian/changelog
index

xorg-server: Changes to 'debian-experimental'

2013-07-18 Thread Maarten Lankhorst 
 ChangeLog  |  476 +
 Xi/devbell.c   |3 
 Xi/exevents.c  |   42 +-
 Xi/extinit.c   |   36 +-
 Xi/xigrabdev.c |   15 
 configure.ac   |   14 
 debian/changelog   |2 
 dix/devices.c  |7 
 dix/eventconvert.c |   23 -
 dix/getevents.c|   15 
 dix/touch.c|4 
 glx/glxdri.c   |2 
 glx/glxdri2.c  |2 
 hw/kdrive/ephyr/ephyr.c|6 
 hw/kdrive/ephyr/hostx.c|6 
 hw/kdrive/ephyr/hostx.h|3 
 hw/xfree86/common/xf86.h   |1 
 hw/xfree86/common/xf86Events.c |   17 -
 hw/xfree86/common/xf86Init.c   |2 
 hw/xfree86/common/xf86Xinput.c |2 
 hw/xfree86/common/xf86platformBus.c|   19 +
 hw/xfree86/common/xf86platformBus.h|4 
 hw/xfree86/modes/xf86Crtc.c|5 
 hw/xfree86/os-support/linux/lnx_platform.c |   48 ++
 hw/xfree86/os-support/solaris/sun_init.c   |2 
 hw/xfree86/os-support/xf86_OSproc.h|3 
 include/dixstruct.h|2 
 include/eventstr.h |1 
 include/hotplug.h  |1 
 os/io.c|1 
 os/log.c   |  115 ++-
 test/signal-logging.c  |   95 +
 xkb/xkbInit.c  |3 
 33 files changed, 870 insertions(+), 107 deletions(-)

New commits:
commit f0b7e86a782cf763a9ce629892afeb4f487163e8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 16 09:34:42 2013 +0200

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index eda3cd5..3ce76d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,479 @@
+commit 2767d9a17d62aede7cabac589c3388078bdb6022
+Author: Matt Dew mar...@osource.org
+Date:   Tue Jun 25 09:49:08 2013 -0600
+
+Bump rev from  1.14.1.902  to 1.14.2
+
+commit 7dec1d38799d82923e3241f73c83aa1ad357f72b
+Author: Matt Dew mar...@osource.org
+Date:   Fri Jun 21 10:24:16 2013 -0600
+
+Revert dix: pre-scale x by the screen:device:resolution ratio
+
+This reverts commit 14d89b9a466b521b985bc95fc4994637367362a8.
+
+commit 187cb5a037a03ab1e7702da5eebb2e7d884c6186
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Apr 24 15:24:31 2013 -0700
+
+Only call xf86platformVTProbe() when it's defined
+
+Fixes build on non-udev systems, since XSERVER_PLATFORM_BUS is only
+defined in configure.ac if $CONFIG_UDEV_KMS is true.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Dave Airlie airl...@redhat.com
+
+commit 34259752340e287333fb03f3060c6db13d72f868
+Author: Matt Dew mar...@osource.org
+Date:   Thu Jun 13 16:25:26 2013 -0600
+
+Bump rev from 1.14.1.901 to 1.14.1.902
+
+commit 31e066546fd085725cc29e95867a04c70ce46ebc
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Apr 26 15:10:08 2013 +1000
+
+dix: fix device scaling to use a [min,max[ range.
+
+defmin/defmax are screen coords and thus use a min-inclusive, max-exclusive
+range. device axes ranges are inclusive, so bump the max up by one to get 
the
+scaling right.
+
+This fixes off-by-one coordinate errors if the coordinate matrix is used to
+bind the device to a fraction of the screen. It introduces an off-by-one
+scaling error in the device coordinate range, but since most devices have a
+higher resolution than the screen (e.g. a Wacom I4 has 5080 dpi) the effect
+of this should be limited.
+
+This error manifests when we have numScreens  1, as the scaling from
+desktop size back to screen size drops one device unit.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 756ab88d93542f0589c9bf46f40ccc57df64f0fd)
+
+commit 14d89b9a466b521b985bc95fc4994637367362a8
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Sat Mar 9 20:43:51 2013 +1000
+
+dix: pre-scale x by the screen:device:resolution ratio
+
+commit 61a99aff9d33728a0b67920254d2d4d79f80cf39
+dix: pre-scale relative events from abs devices to desktop ratio 
(#31636)
+
+added pre-scaling of relative coordinates coming from absolute devices to
+undo uneven scaling based on the screen dimensions.
+
+Devices have their own device width/height ratio as well (in a specific
+resolution) and this must be applied for relative devices as well to avoid
+scaling of the relative events into the device's ratio.
+
+e.g. a Wacom Intuos4 6x9 is in 16:10 format with equal

xorg-server: Changes to 'debian-experimental'

2013-04-22 Thread Timo Aaltonen 
 ChangeLog|   98 +++
 Xi/exevents.c|1 
 configure.ac |8 +-
 debian/changelog |5 -
 debian/control   |2 
 debian/patches/02_hide_panoramix_symbol.diff |   13 ---
 debian/patches/series|1 
 dix/touch.c  |3 
 hw/xfree86/os-support/shared/posix_tty.c |3 
 include/list.h   |2 
 xfixes/xfixesint.h   |2 
 11 files changed, 113 insertions(+), 25 deletions(-)

New commits:
commit 684d94d499a4f020be4e8b87a67e4a65c507ecfa
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Apr 22 10:37:11 2013 +0300

drop patch 02, upstream

diff --git a/debian/changelog b/debian/changelog
index 21f594d..f74663d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ xorg-server (2:1.14.1-1) UNRELEASED; urgency=low
 - 04_int10-fix-pci_device_read_rom-usage.diff
 - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
   * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
-  * Add patch to fix build failure of xserver-xorg-core-udeb.
-- 02_hide_panoramix_symbol.diff
 
   [ Timo Aaltonen ]
   * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
diff --git a/debian/patches/02_hide_panoramix_symbol.diff 
b/debian/patches/02_hide_panoramix_symbol.diff
deleted file mode 100644
index 60c25ed..000
--- a/debian/patches/02_hide_panoramix_symbol.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
-index 334c71f..309954d 100644
 a/xfixes/xfixesint.h
-+++ b/xfixes/xfixesint.h
-@@ -291,7 +291,7 @@ int
-  SProcXFixesDestroyPointerBarrier(ClientPtr client);
- 
- /* Xinerama */
--extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
-+_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) 
(ClientPtr);
- void PanoramiXFixesInit(void);
- void PanoramiXFixesReset(void);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 810051d..3c8c1a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 ## Patches with a number  100 are applied in debian.
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
-02_hide_panoramix_symbol.diff
 #13_debian_add_xkbpath_env_variable.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff

commit 67effc60b9e58ffabc3f63bdec60fc6ff8385d76
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Apr 22 10:34:52 2013 +0300

control: Bump inputproto build-dep to 2.3.

diff --git a/debian/changelog b/debian/changelog
index 65a6a0c..21f594d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xorg-server (2:1.14.1-1) UNRELEASED; urgency=low
   * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
   * Drop 09_EXA-Track...diff, upstream.
   * control: Mark xvfb as M-A: foreign.
+  * control: Bump inputproto build-dep to 2.3.
 
   [ Robert Hooker ]
   * Update to a newer git snapshot, 7fe5e6dfa5c1e71
diff --git a/debian/control b/debian/control
index 046959d..f2845e2 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Build-Depends:
  x11proto-xf86vidmode-dev (= 2.2.99.1),
  xtrans-dev (= 1.2.2),
  libxau-dev (= 1:1.0.5-2),
- x11proto-input-dev (= 2.2.99.1),
+ x11proto-input-dev (= 2.3),
  x11proto-dri2-dev (= 2.8),
  libxdmcp-dev (= 1:0.99.1),
  libxfont-dev (= 1:1.4.2),

commit 2949ba55e9f15e23393548cefae5cb0c95f113b6
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Mon Apr 22 10:27:56 2013 +0300

bump the changelogs

diff --git a/ChangeLog b/ChangeLog
index 6169721..eda3cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,101 @@
+commit f5796f98dadccf67c04f601178966614dd51a1b4
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Apr 17 16:12:00 2013 +1000
+
+xserver 1.14.1
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit aac2d9d09c73fa2b9d02d8446718aa6ccd7e894a
+Author: Dave Airlie airl...@gmail.com
+Date:   Wed Apr 10 16:09:01 2013 +1000
+
+xf86: fix flush input to work with Linux evdev devices.
+
+So when we VT switch back and attempt to flush the input devices,
+we don't succeed because evdev won't return part of an event,
+since we were only asking for 4 bytes, we'd only get -EINVAL back.
+
+This could later cause events to be flushed that we shouldn't have
+gotten.
+
+This is a fix for CVE-2013-1940.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f)
+
+commit 2eec013569f6daa952482ac5d9db8acc71fe01aa
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon

xorg-server: Changes to 'debian-experimental'

2013-03-06 Thread Maarten Lankhorst 
 ChangeLog   |  149 
 Xi/xibarriers.c |9 +-
 configure.ac|6 -
 debian/changelog|2 
 hw/xfree86/common/xf86DPMS.c|   45 +++---
 hw/xfree86/common/xf86platformBus.c |7 +
 hw/xfree86/modes/xf86Crtc.c |   18 +---
 hw/xfree86/modes/xf86RandR12.c  |   22 +
 hw/xquartz/GL/capabilities.c|4 
 m4/xorg-tls.m4  |2 
 os/log.c|3 
 os/strndup.c|4 
 randr/randrstr.h|6 +
 randr/rrprovider.c  |2 
 test/signal-logging.c   |8 +
 15 files changed, 252 insertions(+), 35 deletions(-)

New commits:
commit 546d012b6c5aa07f64fb09f53fd96335f6d5b711
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Mar 6 14:35:08 2013 +0100

bump changelogs

diff --git a/ChangeLog b/ChangeLog
index e428d98..6169721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,152 @@
+commit 103b77c59e3638a45179bf6d7908f5c738d2d872
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Mar 5 22:31:17 2013 -0800
+
+Version bumped to 1.14
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 6238bd68bd71323f8b4f1808f34dabe2ae447fe3
+Author: Aaron Plattner aplatt...@nvidia.com
+Date:   Tue Mar 5 13:04:46 2013 -0800
+
+DPMS: include GPU screens in DPMS code
+
+Otherwise, displays driven by GPU screens remain on all the time.
+
+Signed-off-by: Aaron Plattner aplatt...@nvidia.com
+Reviewed-by: Alex Deucher alexander.deuc...@amd.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit dd4ab8b572956f9457616869d6e383c8ed964c73
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Mar 5 10:14:29 2013 +1000
+
+Xi: force dtime to 0 on the first BarrierHit
+
+dtime to the previous event is 0 on the first BarrierHit event.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Jasper St. Pierre jstpie...@mecheye.net
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 604169af8b67afc74a292cdb9070a3a1f2d7c536
+Merge: 8f4640b 6ea59dc
+Author: Keith Packard kei...@keithp.com
+Date:   Mon Mar 4 21:09:59 2013 -0800
+
+Merge commit '6ea59dc2d8887102bfd8d7c838d2e7ab17645aec'
+
+commit 6ea59dc2d8887102bfd8d7c838d2e7ab17645aec
+Author: Jasper St. Pierre jstpie...@mecheye.net
+Date:   Sun Mar 3 04:50:55 2013 -0500
+
+xibarriers: Remove accidental use of the comma operator
+
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Jan 9 12:58:28 2013 +1000
+
+randr: cleanup provider properly
+
+So in the cold plug server shutdown case, we reap the resources
+before we call CloseScreen handlers, so the config-randr_provider
+is a dangling pointer when the xf86CrtcCloseScreen handler is called,
+
+however in the hot screen unplug case, we can't rely on automatically
+reaped resources, so we need to clean up the provider in the 
xf86CrtcCloseScreen
+case.
+
+This patch provides a cleanup callback from the randr provider removal
+into the DDX so it can cleanup properly, this then gets called by the 
automatic
+code for cold plug, or if hot unplug it gets called explicitly.
+
+Fixes a number of random server crashes on shutdown
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58174
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=891140
+
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 3ec35c45ca17f5ed6fd02c50fc49ae7b8d128dcb
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Jan 9 12:53:14 2013 +1000
+
+xf86: actually set the compat output in the failure case
+
+The previous fix for the previous fix, didn't fully work,
+
+If we don't set compat_output we end up doing derferences
+of arrays with -1, leading to valgrind warnings.
+
+Reviewed-by: Chris Wilson ch...@chris-wilson.co.uk
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit da8ee26023fc2868fe970471195a5f3c86fb574b
+Author: Dave Airlie airl...@redhat.com
+Date:   Wed Jan 9 12:51:45 2013 +1000
+
+xfree86/hotplug: cleanup properly if the screen fails to initialise
+
+Due to another bug, the modesetting/udl driver would fail to init properly
+on hotplug, when it did the code didn't clean up properly, and on removing
+the device the server could crash.
+
+Found in F18 testing.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+Reviewed-by: Aaron Plattner aplatt...@nvidia.com
+
+commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e

xorg-server: Changes to 'debian-experimental'

2013-02-15 Thread Timo Aaltonen 
 ChangeLog  |  446 +
 Xext/xtest.c   |   17 -
 Xi/exevents.c  |2 
 configure.ac   |6 
 debian/changelog   |2 
 dix/devices.c  |   46 ++-
 dix/events.c   |6 
 dix/getevents.c|   75 -
 dix/ptrveloc.c |   38 +-
 hw/dmx/config/xdmxconfig.c |3 
 hw/xfree86/common/xf86Events.c |4 
 hw/xfree86/common/xf86Module.h |2 
 hw/xfree86/common/xf86pciBus.c |   64 
 hw/xfree86/man/xorg.conf.man   |   11 
 hw/xfree86/os-support/linux/lnx_acpi.c |9 
 include/input.h|3 
 include/inputstr.h |8 
 include/list.h |2 
 include/misc.h |1 
 include/protocol-versions.h|2 
 os/log.c   |   21 +
 os/utils.c |   32 ++
 randr/randrstr.h   |2 
 randr/rrcrtc.c |5 
 test/signal-logging.c  |  200 +++---
 xkb/xkbActions.c   |  147 ++
 26 files changed, 915 insertions(+), 239 deletions(-)

New commits:
commit f3226a7f923ced291634087fd4d6ba33430a3d35
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Feb 15 09:57:32 2013 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index f010b72..e428d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,407 @@
+commit 955d434f4d755d00a24ae4068b9957765989d672
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Feb 13 21:39:37 2013 -0800
+
+Update to version 1.3.99.902 (1.14 RC2)
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 7115f6c709898a5124b67e19c61dc01334471358
+Author: Aaron Plattner aplatt...@nvidia.com
+Date:   Wed Jan 23 16:58:47 2013 -0800
+
+randr: unref the provider shared pixmap the appropriate number of times
+
+When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a 
refcnt
+of 1.  Then, PixmapShareToSlave bumps the refcnt to 2.  However, there's no
+corresponding PixmapUnshareFromSlave where the refcnt can be decreased 
again,
+and there's no convenient common place where the refcnt can be decremented 
when
+the slave pixmap is destroyed.
+
+Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap.
+
+Signed-off-by: Aaron Plattner aplatt...@nvidia.com
+Reviewed-by: Dave Airlie airl...@redhat.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit da92690107d90061205340d4cdc98b73b59db9b2
+Author: Aaron Plattner aplatt...@nvidia.com
+Date:   Mon Feb 11 14:31:56 2013 -0800
+
+xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup
+
+This is necessary when the input handler deletes itself from the
+list. Bug found by Maarten Lankhorst, this patch uses the list macros
+instead of open-coding the fix.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit d0a14877872b6a33172fb8c8f335792a28b9499b
+Author: Bryce Harrington br...@canonical.com
+Date:   Fri Feb 8 15:56:02 2013 -0800
+
+xfree86: Man page shouldn't say Device is mandatory anymore
+
+man xorg.conf states that the 'Device' identifier is required in the
+'Screen' section, yet current xserver defaults properly and boots up
+fine without it.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20742
+Signed-off-by: Bryce Harrington br...@canonical.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 5e91054aa070ea09b61325b7ec479d767b02730e
+Author: Bryce Harrington br...@canonical.com
+Date:   Fri Feb 8 15:56:01 2013 -0800
+
+xfree86: Use fbdev/vesa driver on Oaktrail, Medfield, CDV rather than 
-intel
+
+Instead of defaulting to -intel for Oaktrail, Medfield, and CDV chips,
+default to -fbdev.  For Poulsbo (only), attempt to use -psb if it's
+installed, and fallback to fbdev otherwise.  All other Intel chips
+should use -intel.
+
+This fixed an issue where -intel would load on these chips and cause a
+boot failure.  Newer -intel drivers avoid the boot hang, but it's still
+the wrong driver to load, so why take chances.
+
+The patch was originally created by Stefan Dirsch for OpenSUSE.  We have
+included it in our stable release (Ubuntu quantal 12.10) since
+December.
+
+ref:  https://bugzilla.novell.com/show_bug.cgi?id=772279
+ref:  https://bugs.launchpad.net/ubuntu/+bug/1069031
+Fixes:  https://bugs.freedesktop.org/show_bug.cgi?id=60514
+Signed-off-by: Bryce Harrington br...@canonical.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit

xorg-server: Changes to 'debian-experimental'

2013-02-15 Thread Timo Aaltonen 
 debian/serverminver |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e90e6b2c6e646703c909c2b0e33fbf8a1c45a5f1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Feb 15 20:48:16 2013 +0200

bump minor input abi

diff --git a/debian/serverminver b/debian/serverminver
index 2c9fb36..0f9556a 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
 2:1.13.99.901
 ABI_VIDEODRV_VERSION:14.1
-ABI_XINPUT_VERSION:19.0
+ABI_XINPUT_VERSION:19.1


-- 
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/e1u6rht-0005ef...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-02-07 Thread Timo Aaltonen 
 debian/changelog |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit a1765dbd44f13fc2d227a2579784cb97cd246956
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Feb 7 20:23:19 2013 +0200

merge changelog entries

diff --git a/debian/changelog b/debian/changelog
index fe9af99..b856914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,6 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * New upstream release
   * Bump minimum required abi, randr, dri2 and gl protos.
-
-  [ Timo Aaltonen ]
-  * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
-  * Remove 03_fix-panning.diff, upstream
-  * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
-  * Drop 09_EXA-Track...diff, upstream.
-  * control: Mark xvfb as M-A: foreign.
-
-  [ Maarten Lankhorst ]
   * Remove upstreamed patches.
 - 02_Add-libnettle-as-option-for-sha1.diff
 - 04_int10-fix-pci_device_read_rom-usage.diff
@@ -20,6 +11,13 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
   * Add patch to fix build failure of xserver-xorg-core-udeb.
 - 02_hide_panoramix_symbol.diff
 
+  [ Timo Aaltonen ]
+  * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
+  * Remove 03_fix-panning.diff, upstream
+  * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
+  * Drop 09_EXA-Track...diff, upstream.
+  * control: Mark xvfb as M-A: foreign.
+
   [ Robert Hooker ]
   * Update to a newer git snapshot, 7fe5e6dfa5c1e71
   * Bump input ABI version in serverminver


-- 
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/e1u3wci-00064p...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-02-06 Thread Timo Aaltonen 
 debian/changelog |1 +
 debian/control   |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 9e6bfe25d0f35e83953ec38df1f802577e02edb5
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jan 29 13:52:16 2013 +0200

control: Mark xvfb as M-A: foreign.

diff --git a/debian/changelog b/debian/changelog
index 510c85d..296f6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
   * Remove 03_fix-panning.diff, upstream
   * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
   * Drop 09_EXA-Track...diff, upstream.
+  * control: Mark xvfb as M-A: foreign.
 
   [ Maarten Lankhorst ]
   * Remove upstreamed patches.
diff --git a/debian/control b/debian/control
index f3544da..2e39428 100644
--- a/debian/control
+++ b/debian/control
@@ -259,6 +259,7 @@ Depends:
  ${misc:Depends},
 Recommends: xauth
 Provides: xserver
+Multi-Arch: foreign
 Description: Virtual Framebuffer 'fake' X server
  Xvfb provides an X server that can run on machines with no display hardware
  and no physical input devices. It emulates a dumb framebuffer using virtual


-- 
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/e1u3d1s-0005kd...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-02-06 Thread Timo Aaltonen 
 ChangeLog |  523 ++
 Xi/exevents.c |   38 --
 config/udev.c |2 
 debian/changelog  |5 
 debian/control|2 
 debian/serverminver   |2 
 dix/events.c  |   21 -
 dix/getevents.c   |8 
 dix/ptrveloc.c|2 
 dix/touch.c   |   38 +-
 hw/xfree86/common/xf86DGA.c   |   10 
 hw/xfree86/common/xf86Events.c|   10 
 hw/xfree86/common/xf86Module.h|2 
 hw/xfree86/common/xf86Option.c|2 
 hw/xwin/winSetAppUserModelID.c|1 
 hw/xwin/winblock.c|   32 +-
 hw/xwin/winconfig.c   |2 
 hw/xwin/winglobals.h  |4 
 hw/xwin/winkeybd.c|8 
 hw/xwin/winmultiwindowwm.c|  115 +++-
 hw/xwin/winmultiwindowwndproc.c   |   61 ++--
 hw/xwin/wintrayicon.c |2 
 hw/xwin/winwakeup.c   |4 
 hw/xwin/winwindow.h   |1 
 include/input.h   |4 
 include/inputstr.h|   22 -
 include/protocol-versions.h   |2 
 include/xwin-config.h.in  |3 
 mi/mieq.c |6 
 render/animcur.c  |3 
 test/xi2/protocol-xiwarppointer.c |2 
 xkb/xkbUtils.c|   10 
 32 files changed, 782 insertions(+), 165 deletions(-)

New commits:
commit d50475a92c11d8ab92bc5ba72754d0c7807fe4d4
Author: Robert Hooker sarv...@ubuntu.com
Date:   Wed Feb 6 15:01:54 2013 -0500

Bump libxi-dev requirement and ABI_XINPUT_VERSION.

diff --git a/debian/changelog b/debian/changelog
index 296f6c8..fe9af99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
   * Add patch to fix build failure of xserver-xorg-core-udeb.
 - 02_hide_panoramix_symbol.diff
 
+  [ Robert Hooker ]
+  * Update to a newer git snapshot, 7fe5e6dfa5c1e71
+  * Bump input ABI version in serverminver
+  * Bump libxi-dev build requirement to 2:1.6.99.1
+
  -- Robert Hooker sarv...@ubuntu.com  Wed, 22 Aug 2012 11:12:17 -0400
 
 xorg-server (2:1.12.4-4) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 2e39428..046959d 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Build-Depends:
  libxext-dev (= 1:0.99.1),
  libx11-dev (= 1:0.99.2),
  libxrender-dev (= 1:0.9.0),
- libxi-dev (= 2:1.2.99.1),
+ libxi-dev (= 2:1.6.99.1),
  x11proto-dmx-dev (= 1:2.2.99.1),
  libdmx-dev (= 1:1.0.1),
  libxpm-dev (= 1:3.5.3),
diff --git a/debian/serverminver b/debian/serverminver
index b3cde97..2c9fb36 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
 2:1.13.99.901
 ABI_VIDEODRV_VERSION:14.1
-ABI_XINPUT_VERSION:18.0
+ABI_XINPUT_VERSION:19.0

commit e8a18664634557b52f2e32557826d9472e31c26e
Author: Robert Hooker sarv...@ubuntu.com
Date:   Wed Feb 6 14:56:34 2013 -0500

Bump ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3a69859..f010b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,372 @@
+commit 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
+Author: Jasper St. Pierre jstpie...@mecheye.net
+Date:   Wed Jan 23 13:11:55 2013 -0500
+
+protocol-versions: Bump minor version of XI
+
+This was accidentally excluded when we added barriers.
+
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 70b127c9f1c53bdb42f078265e67f76b464deae2
+Author: Aaron Plattner aplatt...@nvidia.com
+Date:   Thu Jan 10 17:01:17 2013 -0800
+
+config/udev: fix removing GPU device format string mistake
+
+ udev.c: In function 'device_removed':
+ udev.c:270:9: warning: format '%d' expects argument of type 'int', but 
argument 3 has type 'const char *' [-Wformat]
+
+Signed-off-by: Aaron Plattner aplatt...@nvidia.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 605dfc6804a05ff2bda5692fec26c37344fd95cb
+Author: Dave Airlie airl...@gmail.com
+Date:   Tue Jan 22 07:39:53 2013 +1000
+
+xserver: fix build regression since 
91ab237358c6e33da854914d3de493a9cbea7637
+
+inputstr, double defines TouchListener typedef, maybe some gcc handles it,
+but not all.
+
+fixes tinderbox
+
+Reported-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Signed-off-by: Dave Airlie airl...@redhat.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362
+Merge: 591c062 d6dcde7
+Author: Keith Packard kei...@keithp.com
+Date:   Sun Jan 20 15:58:38 2013 -0800
+
+Merge remote-tracking branch 'jturney/xserver-next'
+
+commit 591c06277bb120ab9615633f2d28addbd3a2aa5f
+Merge: 6703a7c fa6ab7d
+Author: Keith Packard kei...@keithp.com
+Date:

xorg-server: Changes to 'debian-experimental'

2013-01-09 Thread Maarten Lankhorst 
 ChangeLog   | 
3851 --
 Xext/panoramiX.c|  
  2 
 Xext/saver.c|  
  2 
 Xext/shm.c  |  
 10 
 Xext/xace.c |  
 12 
 Xext/xf86bigfont.c  |  
 16 
 Xext/xres.c |  
  2 
 Xext/xtest.c|  
  2 
 Xi/Makefile.am  |  
  2 
 Xi/chgdctl.c|  
  8 
 Xi/exevents.c   |  
122 
 Xi/extinit.c|  
 47 
 Xi/gtmotion.c   |  
  2 
 Xi/xibarriers.c |  
916 ++
 Xi/xibarriers.h |  
 48 
 Xi/xichangehierarchy.c  |  
 16 
 Xi/xiproperty.c |  
  3 
 Xi/xiquerydevice.c  |  
  4 
 Xi/xiquerypointer.c |  
 17 
 Xi/xiselectev.c |  
 80 
 autogen.sh  |  
  4 
 configure.ac|  
 29 
 debian/changelog|  
  9 
 debian/control  |  
  8 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff |  
 85 
 debian/patches/04_int10-fix-pci_device_read_rom-usage.diff  |  
 43 
 debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff |  
 49 
 debian/patches/series   |  
  3 
 dix/colormap.c  |  
  8 
 dix/devices.c   |  
 12 
 dix/dispatch.c  |  
 25 
 dix/dixfonts.c  |  
  9 
 dix/enterleave.c|  
  5 
 dix/eventconvert.c  |  
 49 
 dix/events.c|  
 74 
 dix/getevents.c |  
147 
 dix/grabs.c |  
  7 
 dix/inpututils.c|  
 51 
 dix/touch.c |  
 65 
 dix/window.c|  
131 
 doc/c-extensions|  
 19 
 exa/exa.c   |  
  4 
 exa/exa_priv.h  |  
  1 
 fb/fb.h |  
  4 
 fb/fbblt.c  |  
 12 
 fb/fbbltone.c   |  
  8 
 fb/fbgc.c   |  
  4 
 fb/fbpict.c |  
153 
 fb/fbscreen.c   |  
  1 
 glx/glapi.c |  
  2 
 glx/glxdri.c|  
  2 
 glx/indirect_program.c  |  
  2 
 glx/indirect_texture_compression.c  |  
  4 
 glx/renderpixswap.c |  
 20 
 glx/singlepix.c |  
 18 
 glx/singlepixswap.c |  
 18 
 glx/xfont.c |  
  2 
 hw/dmx/config/Canvas.c  |  
  4

xorg-server: Changes to 'debian-experimental'

2013-01-09 Thread Maarten Lankhorst 
 debian/rules|2 +-
 debian/serverminver |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6d8bd2a39283a992d73a627b3c60915c557a1db8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 9 16:25:58 2013 +0100

fix sha1 implementation chosen with upstream patch

diff --git a/debian/rules b/debian/rules
index 3011a78..904a565 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ confflags_udeb = \
--disable-kdrive \
--disable-xephyr \
--disable-xfbdev \
-   --with-sha1=nettle \
+   --with-sha1=libnettle \
$(config_backend_udeb) \
$(void)
 

commit 53782a6a26ce1d59696b7f5e20de8c2bb2794843
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 9 16:17:11 2013 +0100

bump debian/serverminver

diff --git a/debian/serverminver b/debian/serverminver
index b6b99d6..b3cde97 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.12.99.901
-ABI_VIDEODRV_VERSION:13.1
+2:1.13.99.901
+ABI_VIDEODRV_VERSION:14.1
 ABI_XINPUT_VERSION:18.0


-- 
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/e1tsxmb-0007xy...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-01-09 Thread Maarten Lankhorst 
 debian/changelog |2 ++
 debian/patches/02_hide_panoramix_symbol.diff |   13 +
 debian/patches/series|1 +
 3 files changed, 16 insertions(+)

New commits:
commit 21e5991de4970790b30dd7a5886d68da6d7eca54
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jan 9 17:32:58 2013 +0100

Add patch to fix build failure of xserver-xorg-core-udeb.

02_hide_panoramix_symbol.diff

diff --git a/debian/changelog b/debian/changelog
index 3d36524..510c85d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xorg-server (2:1.13.99.901-1) UNRELEASED; urgency=low
 - 04_int10-fix-pci_device_read_rom-usage.diff
 - 07_Revert-kinput-allocate-enough-space-for-null-charact.diff
   * Bump x11proto-input-dev and libpixman-1-dev minimum versions.
+  * Add patch to fix build failure of xserver-xorg-core-udeb.
+- 02_hide_panoramix_symbol.diff
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 22 Aug 2012 11:12:17 -0400
 
diff --git a/debian/patches/02_hide_panoramix_symbol.diff 
b/debian/patches/02_hide_panoramix_symbol.diff
new file mode 100644
index 000..60c25ed
--- /dev/null
+++ b/debian/patches/02_hide_panoramix_symbol.diff
@@ -0,0 +1,13 @@
+diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
+index 334c71f..309954d 100644
+--- a/xfixes/xfixesint.h
 b/xfixes/xfixesint.h
+@@ -291,7 +291,7 @@ int
+  SProcXFixesDestroyPointerBarrier(ClientPtr client);
+ 
+ /* Xinerama */
+-extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
++_X_INTERNAL extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) 
(ClientPtr);
+ void PanoramiXFixesInit(void);
+ void PanoramiXFixesReset(void);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3c8c1a3..810051d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 ## Patches with a number  100 are applied in debian.
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
+02_hide_panoramix_symbol.diff
 #13_debian_add_xkbpath_env_variable.diff
 05_Revert-Unload-submodules.diff
 06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff


-- 
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/e1tt1un-0001yw...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2013-01-08 Thread Timo Aaltonen 
 ChangeLog  |   94 +
 configure.ac   |6 +-
 debian/changelog   |2 
 glx/glxdri2.c  |2 
 hw/vfb/InitOutput.c|   19 +
 hw/xquartz/darwin.c|   16 ---
 hw/xquartz/xpr/dri.c   |6 ++
 hw/xquartz/xpr/xprFrame.c  |   28 +
 hw/xquartz/xpr/xprScreen.c |5 ++
 mi/miinitext.c |9 ++--
 10 files changed, 172 insertions(+), 15 deletions(-)

New commits:
commit a658d3474bbb413d1dd51dae5b001dbe73794c3c
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Tue Jan 8 16:37:42 2013 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 8a45f13..e455b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,97 @@
+commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd
+Author: Matt Dew mar...@osource.org
+Date:   Thu Jan 3 23:36:00 2013 -0700
+
+version bump for 1.13.1.901 (rc1)
+
+commit 95780608df676473f501a6cd73248da9f7be82a0
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Tue Dec 18 00:41:08 2012 -0800
+
+EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel
+
+d785368e0e converted the other miinitext functions to use ARRAY_SIZE,
+and removed the sentinel, but missed EnableDisableExtensionError so
+passing an invalid extension name could cause the server to walk off
+the end off the list looking for a sentinel that wasn't there.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Dec 17 15:40:17 2012 +1000
+
+glx/dri2: initialise api to avoid indirect rendering failing randomly
+
+Running glxinfo under indirect rendering would randomly fail against the
+intel driver, as it would create a context with no attribs, and then the
+api value would be passed to the driver uninitialised.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+Reviewed-by: Keith Packard kei...@keithp.com
+Reviewed-by: Ian Romanick ian.d.roman...@intel.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b
+Author: Raphael Kubo da Costa raphael.kubo.da.co...@intel.com
+Date:   Fri Nov 16 19:51:58 2012 +0200
+
+vfb: Initialize the GLX extension again.
+
+This should fix a regression in the 1.13.0 release: commit
+5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86 removed a code path used by Xvfb
+and made it use the default one when initializing extensions. However, this
+meant the GLX extension was not initialized anymore since it is not part of
+the `staticExtensions' array.
+
+Since it is not possible to just add it to that array after commit
+aad428b8e21c77397c623b78706eb64b1fea77c9, adopt an approach similar to
+xwin's and xquartz's and initialize the extension from vfb's `InitOutput'.
+
+Signed-off-by: Raphael Kubo da Costa raphael.kubo.da.co...@intel.com
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+
+commit e348e4afc5323779b686ee8ff2f094359664c42e
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Tue Dec 18 01:29:12 2012 -0800
+
+XQuartz: Don't add the 15bit visual any more
+
+Mountain Lion only supports 32bit backing stores, so don't use 15bit 
visuals until libXplugin adapts
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+(cherry picked from commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847)
+
+commit 34fb39a960898f5a0bcc67f76f385ba8a91ea2ba
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Sep 20 21:11:21 2012 -0700
+
+XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+(cherry picked from commit f54987de97720200ee94eba1c7a737d4ad8c55c8)
+
+commit 06e2ecd0df9b81dd518ae6017ec42765520e2e93
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Sep 20 21:49:40 2012 -0700
+
+XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2
+
+rdar://problem/12338921
+http://bugs.winehq.org/show_bug.cgi?id=31751
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+(cherry picked from commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7)
+
+commit 92ecbf5f0f516aacb7f0034e3786c4454a07fe8d
+Author: Matt Dew mar...@osource.org
+Date:   Thu Dec 13 21:05:24 2012 -0700
+
+No changes from 1.13.0.902 (rc2)
+
+Bump version to 1.13.1
+
 commit ede07c1af35926c77c4e766cc02c00333b498460
 Author: Matt Dew mar...@osource.org
 Date:   Thu Dec 6 22:46:46 2012 -0700
diff --git a/debian/changelog b/debian/changelog
index 6dec1d0..79d828f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.13.1.901-1) UNRELEASED;

xorg-server: Changes to 'debian-experimental'

2012-12-07 Thread Maarten Lankhorst 
 ChangeLog   |  154 
 Xext/saver.c|2 
 Xi/xipassivegrab.c  |8 --
 configure.ac|6 -
 debian/changelog|5 -
 debian/serverminver |2 
 dix/window.c|2 
 hw/dmx/dmxcursor.c  |2 
 hw/xfree86/modes/xf86Crtc.c |7 +-
 include/xkbsrv.h|1 
 randr/randr.c   |2 
 xfixes/cursor.c |   12 ++-
 xkb/xkbAccessX.c|6 +
 13 files changed, 192 insertions(+), 17 deletions(-)

New commits:
commit fef80d8bab86e75d2eb202b33e11e2e17584b2f6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Dec 7 09:17:43 2012 +0100

Bump ABI_VIDEODRV_VERSION to 13.1

xf86UpdateDesktopDimensions is newly exported for nvidia blob

diff --git a/debian/serverminver b/debian/serverminver
index 41482e2..b6b99d6 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
 2:1.12.99.901
-ABI_VIDEODRV_VERSION:13.0
+ABI_VIDEODRV_VERSION:13.1
 ABI_XINPUT_VERSION:18.0

commit f5e11c2d708e819fcb1f131f1fe0e8cb20b8ee0e
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Fri Dec 7 09:07:18 2012 +0100

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 3fed06c..8a45f13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,157 @@
+commit ede07c1af35926c77c4e766cc02c00333b498460
+Author: Matt Dew mar...@osource.org
+Date:   Thu Dec 6 22:46:46 2012 -0700
+
+Bump version
+
+commit e2369dd404024415853108848c8d052e73e95461
+Merge: d71a17c 79220f4
+Author: Matt Dew mar...@osource.org
+Date:   Thu Dec 6 21:53:42 2012 -0700
+
+Merge branch 'server-1.13-branch' of 
git://people.freedesktop.org/~whot/xserver into server-1.13-branch
+
+commit 79220f4390127d9971cbcf378530bf36172ef35a
+Author: Daniel Martin consume.no...@gmail.com
+Date:   Wed Nov 7 11:31:01 2012 +0100
+
+Xi: Fix modifier swapping in XIPassiveGrabDevice
+
+XIPassiveGrabDevice uses a list of uint32_t as modifier sets.
+
+The ModifierInfo struct represents the current modifier states and is
+therefor used in XIQueryPointer and various events.
+
+Signed-off-by: Daniel Martin consume.no...@gmail.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87)
+
+commit 521f3fb566e67330a486874928a21ce201dba02b
+Author: Sybren van Elderen sowmes...@msn.com
+Date:   Tue Nov 27 19:27:10 2012 +0100
+
+hw/dmx: add update_desktop_dimensions() call
+
+The Xdmx server did not update the desktop dimensions when computing screen
+origins.
+
+Signed-off-by: Sybren van Elderen sowmes...@msn.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit 6e18599d691036eca6ff082c17727d9ffb926984)
+
+commit 73bd33b4d4e3df4a8097826695a8dbdc2fb5c920
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jun 26 10:30:35 2012 +1000
+
+xkb: fill in keycode and event type for slow keys enablement
+
+eventType is set for the type that triggered a XkbControlsNotify event.
+Technically, SlowKeys is triggered by a timer which doesn't have a matching
+core event type. So we used to use 0 here.
+
+Practically, the timer is triggered by a key press + hold and cancelled 
when
+the key is released before the timeout expires. So we might as well set
+KeyPress (keycode) in the ControlsNotify to give clients a chance to differ
+between timer-triggered SlowKeys and client-triggered ones.
+
+This is a chance in behaviour, though I suspect with little impact.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Acked-by: Daniel Stone dan...@fooishbar.org
+(cherry picked from commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384)
+
+commit 2def985466683cf3746c03f9ac318e5941d22f86
+Author: Jasper St. Pierre jstpie...@mecheye.net
+Date:   Tue Nov 20 14:50:41 2012 -0500
+
+cursor: Revise edge cases for the pointer moving towards barriers
+
+Since barriers block the invisible line between pixels, that means
+that we need to explicitly check the boundaries, or else we'll have
+a potential off-by-one error. This fixes issues when trying to move
+down or right across a barrier and having the pointer visibly bounce.
+
+Signed-off-by: Jasper St. Pierre jstpie...@mecheye.net
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit a51b2c3913fc8556f6bd1c76805d045fc424c4bb)
+
+commit 4a957c9e81233344da0b5b9388ca2d97eedde7d5
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Nov 15 14:00:57 2012 +1000
+
+When resetting device idle time, reset XIAll(Master)Devices too (#56649)
+

xorg-server: Changes to 'debian-experimental'

2012-11-23 Thread Timo Aaltonen 
 ChangeLog   |  
461 ++
 Xi/exevents.c   |  
 19 
 Xi/xiselectev.c |  
  9 
 config/udev.c   |  
  8 
 configure.ac|  
  6 
 debian/changelog|  
 24 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff |  
  9 
 debian/patches/05_Revert-Unload-submodules.diff |  
  7 
 debian/patches/07_Revert-kinput-allocate-enough-space-for-null-charact.diff |  
  7 
 debian/patches/08_xfree86_fix_ia64_inx_outx.diff|  
 64 +
 debian/patches/series   |  
  1 
 dix/devices.c   |  
  4 
 dix/events.c|  
 25 
 dix/getevents.c |  
  9 
 dix/touch.c |  
 32 
 exa/exa_priv.h  |  
  1 
 exa/exa_unaccel.c   |  
 16 
 hw/xfree86/common/Makefile.am   |  
  3 
 hw/xfree86/common/xf86.h|  
  4 
 hw/xfree86/common/xf86Bus.c |  
  4 
 hw/xfree86/common/xf86Helper.c  |  
  6 
 hw/xfree86/common/xf86Module.h  |  
  2 
 hw/xfree86/common/xf86platformBus.c |  
  6 
 hw/xfree86/dri2/dri2.c  |  
 74 -
 hw/xwin/InitOutput.c|  
  5 
 hw/xwin/Makefile.am |  
  3 
 hw/xwin/glx/Makefile.am |  
  3 
 include/input.h |  
  1 
 man/Xserver.man |  
  2 
 xkb/xkbAccessX.c|  
  2 
 30 files changed, 730 insertions(+), 87 deletions(-)

New commits:
commit 7d536cf2656eaeeb63e8fd29e2faf36d7cd18c23
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Nov 23 09:45:37 2012 +0200

Drop 09_EXA-Track...diff, upstream.

refresh other patches

diff --git a/debian/changelog b/debian/changelog
index 25d6597..23fcd94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.13.0.901-1) UNRELEASED; urgency=low
   * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
   * Remove 03_fix-panning.diff, upstream
   * Refresh 04_int10-fix-pci_device_read_rom-usage.diff.
+  * Drop 09_EXA-Track...diff, upstream.
 
  -- Robert Hooker sarv...@ubuntu.com  Wed, 22 Aug 2012 11:12:17 -0400
 
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff 
b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index fe5c641..49ddcf3 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -10,16 +10,16 @@ Signed-off-by: Julien Cristau jcris...@debian.org
 ---
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1339,7 +1339,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+@@ -1361,7 +1361,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
  
  # SHA1 hashing
  AC_ARG_WITH([sha1],
--
[AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],
-+
[AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|nettle],
+-
[AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI],
++
[AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI|nettle],
  [choose SHA1 implementation])])
  AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
  if test x$with_sha1 = x  test x$HAVE_SHA1_IN_LIBC = xyes; then
-@@ -1422,6 +1422,16 @@ if test x$with_sha1 = xlibcrypto; then
+@@ -1457,6 +1457,16 @@ if test x$with_sha1 = xlibcrypto; then
SHA1_CFLAGS=$OPENSSL_CFLAGS
fi
  fi
@@ -38,7 +38,7 @@ Signed-off-by: Julien Cristau jcris...@debian.org
AC_MSG_ERROR([No suitable SHA1 implementation found])
 --- a/include/dix-config.h.in
 +++ b/include/dix-config.h.in
-@@ -157,6 +157,9 @@
+@@ -160,6 +160,9 @@
  /* Define to use libsha1 for SHA1 */
  #undef HAVE_SHA1_IN_LIBSHA1
  
@@

xorg-server: Changes to 'debian-experimental'

2012-09-06 Thread Timo Aaltonen 
 ChangeLog   |  271 
 config/udev.c   |8 
 configure.ac|7 
 debian/changelog|9 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff |   22 -
 dix/dispatch.c  |4 
 dix/getevents.c |   18 +
 hw/xfree86/common/xf86Events.c  |   11 
 hw/xfree86/modes/xf86Crtc.c |2 
 hw/xquartz/bundle/Info.plist.cpp|4 
 include/dix-config.h.in |3 
 include/hotplug.h   |2 
 include/list.h  |   21 +
 include/misc.h  |1 
 mi/mipointer.c  |2 
 os/log.c|   50 ++
 os/utils.c  |   14 
 test/list.c |4 
 test/os.c   |2 
 test/signal-logging.c   |  210 +++-
 20 files changed, 606 insertions(+), 59 deletions(-)

New commits:
commit 02f3319f1168e6f9123c1e2afeab2372ef15123f
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Sep 6 12:18:11 2012 +0300

Refresh 02_Add-libnettle-as-option-for-sha1.diff.

diff --git a/debian/changelog b/debian/changelog
index 75f601c..2d29e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xorg-server (2:1.13.0-1) UNRELEASED; urgency=low
   [ Maarten Lankhorst ]
   * Bump minimum required abi, randr, dri2 and gl protos.
 
+  [ Timo Aaltonen ]
+  * Refresh 02_Add-libnettle-as-option-for-sha1.diff.
+
  -- Robert Hooker sarv...@ubuntu.com  Wed, 22 Aug 2012 11:12:17 -0400
 
 xorg-server (2:1.12.1.902-1) unstable; urgency=medium
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff 
b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index a3fc6f6..fc184f7 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -8,11 +8,9 @@ Signed-off-by: Cyril Brulebois k...@debian.org
 [jcristau: forward-ported from 1.7 to 1.8]
 Signed-off-by: Julien Cristau jcris...@debian.org
 ---
-Index: xorg-server/configure.ac
-===
 xorg-server.orig/configure.ac  2012-07-12 14:32:56.665990355 +0200
-+++ xorg-server/configure.ac   2012-07-12 14:33:23.040019369 +0200
-@@ -1359,7 +1359,7 @@
+--- a/configure.ac
 b/configure.ac
+@@ -1361,7 +1361,7 @@
  
  # SHA1 hashing
  AC_ARG_WITH([sha1],
@@ -21,7 +19,7 @@ Index: xorg-server/configure.ac
  [choose SHA1 implementation])])
  AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
  if test x$with_sha1 = x  test x$HAVE_SHA1_IN_LIBC = xyes; then
-@@ -1455,6 +1455,16 @@
+@@ -1457,6 +1457,16 @@
SHA1_CFLAGS=$OPENSSL_CFLAGS
fi
  fi
@@ -38,10 +36,8 @@ Index: xorg-server/configure.ac
  AC_MSG_CHECKING([for SHA1 implementation])
  if test x$with_sha1 = x; then
AC_MSG_ERROR([No suitable SHA1 implementation found])
-Index: xorg-server/include/dix-config.h.in
-===
 xorg-server.orig/include/dix-config.h.in   2012-07-12 13:52:16.0 
+0200
-+++ xorg-server/include/dix-config.h.in2012-07-12 14:33:01.499195672 
+0200
+--- a/include/dix-config.h.in
 b/include/dix-config.h.in
 @@ -160,6 +160,9 @@
  /* Define to use libsha1 for SHA1 */
  #undef HAVE_SHA1_IN_LIBSHA1
@@ -52,10 +48,8 @@ Index: xorg-server/include/dix-config.h.in
  /* Define to 1 if you have the `shmctl64' function. */
  #undef HAVE_SHMCTL64
  
-Index: xorg-server/os/xsha1.c
-===
 xorg-server.orig/os/xsha1.c2012-07-12 13:52:16.0 +0200
-+++ xorg-server/os/xsha1.c 2012-07-12 14:33:01.626295814 +0200
+--- a/os/xsha1.c
 b/os/xsha1.c
 @@ -190,6 +190,31 @@
  return 1;
  }

commit 526e43d8fa563d8aa01521e881ccab7129b6c64d
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Sep 6 09:20:55 2012 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 8f15c51..65ac4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,194 @@
+commit f0bad69edd57facd6cffde8cb0863d1a735e2492
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Sep 5 14:45:08 2012 -0700
+
+Version bumped to 1.13
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 856f80c8d7f22b979c72d9c70b70187df6004a03
+Merge: 0db936a b8ab93d
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Sep 5 11:02:58 2012 -0700
+
+Merge remote-tracking branch

xorg-server: Changes to 'debian-experimental'

2012-08-22 Thread Robert Hooker 
 ChangeLog |  175 ++
 configure.ac  |6 -
 debian/changelog  |   10 +
 dix/main.c|   18 +--
 fb/fbseg.c|   18 +--
 glx/glxscreens.c  |3 
 hw/xfree86/common/xf86Module.h|2 
 hw/xfree86/modes/xf86Crtc.c   |   11 +-
 hw/xquartz/X11Controller.m|   62 +++-
 hw/xquartz/console_redirect.c |   28 +++--
 hw/xquartz/mach-startup/bundle-main.c |   17 +++
 hw/xquartz/quartz.c   |1 
 render/filter.c   |5 
 13 files changed, 313 insertions(+), 43 deletions(-)

New commits:
commit e9663c06d28fb8f6e2aead126a0a35e6dffa6737
Author: Robert Hooker sarv...@ubuntu.com
Date:   Wed Aug 22 11:14:30 2012 -0400

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 84f361b..8f15c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,178 @@
+commit 6619f5c0e1086b57888ff7146e8ed5897b50d440
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Aug 21 13:46:34 2012 -0700
+
+Relase 1.12.99.905
+
+RC with updated ABI version numbers.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
+Author: Aaron Plattner aplatt...@nvidia.com
+Date:   Fri Aug 17 11:26:05 2012 -0700
+
+xfree86: Bump extension ABI to 7.0
+
+Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
+DevPrivateSetRec structures in the middle of the ScreenRec, which throws 
off
+extension modules trying to call things like pScreen-DestroyPixmap.
+
+Signed-off-by: Aaron Plattner aplatt...@nvidia.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit ac616d8ed5a634c6b32775eb7b071a13c575fd97
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Aug 16 19:09:42 2012 -0700
+
+XQuartz: Use asl_log_descriptor for children as well
+
+This change is #if'd out due to a bug in asl_log_descriptor, but
+it is left here as reference to be enabled in the future.
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+
+commit ad123071e54d890d36d1373f59b8a6eb4937e936
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Aug 16 13:02:28 2012 -0700
+
+XQuartz: Use asl_log_descriptor on Mountain Lion
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+
+commit 7c3d2e4828deb4e8ec38e8ef88d6f92b2d931033
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Aug 16 19:42:54 2012 -0700
+
+XQuartz: console_redirect: Properly zero-out the tail of the array on 
realloc()
+
+We forgot to multiply by sizeof(), so it wasn't fully zeroed out.
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+
+commit a32e01802ff1c938c0afe0cc007a273b9ada8610
+Author: Jeremy Huddleston Sequoia jerem...@apple.com
+Date:   Thu Aug 16 15:43:34 2012 -0700
+
+XQuartz: console_redirect: Set the correct location for reading into the 
buffer
+
+Prior to this change, it was possible that a large message would have some
+of its data prepended to subsequent messages due to our not incorrectly
+setting the location to write into the buffer.
+
+Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com
+
+commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734
+Merge: 16d8da5 99b94af
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Aug 15 13:29:17 2012 -0700
+
+Merge remote-tracking branch 'jeremyhu/master'
+
+commit 16d8da5ca99211bd180f532d78d7c5943d38c8ad
+Author: Paul Berry stereotype...@gmail.com
+Date:   Tue Jul 31 15:15:56 2012 -0700
+
+glx: Skip multisampled configs when matching pre-existing X visuals.
+
+In __glXScreenInit() we generate the set of GLX visuals in two steps:
+first we match each pre-existing X visual with a corresponding
+FBConfig, then we generate a new X visual to correspond to all the
+remaining FBConfigs.
+
+The first step is used for the two default 24-bit visuals (true color
+and direct color) and for the 32-bit visual.  If windowsystem
+multisampling is enabled in Mesa, we need to ensure that none of these
+three visuals gets matched to a multisampled config.
+
+Fixes a bug with windowsystem multisampling in gnome-shell.  If the X
+server happens to match up a multisampled FBConfig to the 32-bit
+visual, gnome-shell will try to use it to read pixels from
+alpha-blended windows (such as gnome-terminal), resulting in no window
+appearing on screen.
+
+Reviewed-by: Ian Romanick ian.d.roman...@intel.com
+Reviewed-by: Chad Versace chad.vers...@linux.intel.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 99b94af1ffbef7047f88e7d6c594242d172bec02
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Wed Aug 15 10:28:16 2012 -0700
+
+XQuartz: Fix build regression

xorg-server: Changes to 'debian-experimental'

2012-07-18 Thread Maarten Lankhorst 
 ChangeLog |  626 ++
 Xext/panoramiX.c  |5 
 Xext/sync.c   |4 
 Xext/xvmc.c   |8 
 configure.ac  |4 
 debian/changelog  |3 
 debian/patches/03_fix-disable-xv.diff |   15 
 debian/patches/series |1 
 dix/devices.c |   10 
 glx/glxdri2.c |   23 -
 glx/glxext.c  |3 
 glx/glxserver.h   |2 
 hw/xfree86/common/xf86.h  |2 
 hw/xfree86/common/xf86AutoConfig.c|1 
 hw/xfree86/common/xf86Extensions.h|8 
 hw/xfree86/dri2/dri2.c|   15 
 hw/xfree86/dri2/dri2.h|7 
 hw/xfree86/dri2/dri2ext.c |9 
 hw/xfree86/modes/xf86Crtc.c   |6 
 hw/xfree86/modes/xf86Modes.c  |   15 
 hw/xfree86/modes/xf86RandR12.c|2 
 hw/xfree86/sdksyms.sh |2 
 hw/xquartz/pseudoramiX.c  |4 
 hw/xquartz/xpr/dri.h  |3 
 hw/xwin/InitOutput.c  |   23 +
 hw/xwin/Makefile.am   |1 
 hw/xwin/README|  141 ---
 hw/xwin/man/XWin.man  |   26 -
 hw/xwin/win.h |2 
 hw/xwin/winblock.c|2 
 hw/xwin/winclipboard.h|7 
 hw/xwin/winclipboardinit.c|2 
 hw/xwin/winclipboardthread.c  |8 
 hw/xwin/winclipboardunicode.c |   65 ---
 hw/xwin/winclipboardwndproc.c |7 
 hw/xwin/winclipboardwrappers.c|   10 
 hw/xwin/winclipboardxevents.c |   14 
 hw/xwin/wincreatewnd.c|   93 +++--
 hw/xwin/windialogs.c  |8 
 hw/xwin/winerror.c|4 
 hw/xwin/winkeyhook.c  |   18 
 hw/xwin/winmonitors.c |5 
 hw/xwin/winmonitors.h |   29 +
 hw/xwin/winmultiwindowwm.c|   79 ++--
 hw/xwin/winprocarg.c  |   18 
 hw/xwin/winscrinit.c  |4 
 hw/xwin/winwndproc.c  |7 
 include/extinit.h |   32 -
 include/os.h  |   10 
 os/utils.c|   73 +++
 randr/rrprovider.c|   47 +-
 randr/rrproviderproperty.c|   78 ++--
 randr/rrscreen.c  |   21 -
 test/xtest.c  |3 
 xkb/ddxList.c |6 
 xkb/ddxLoad.c |   75 
 56 files changed, 1102 insertions(+), 594 deletions(-)

New commits:
commit bc18e7dd5d50066b406a2bca492a3790f81cdcd8
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 12:47:50 2012 +0200

Remove upstreamed build fix

diff --git a/debian/changelog b/debian/changelog
index fda7cad..eec1949 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ xorg-server (2:1.12.99.902-1) UNRELEASED; urgency=low
 
   * New upstream release snapshot (on the way to 1.13).
   * Bump minimum required abi, randr, dri2 and gl protos.
-  * Add fix for building udeb without xv
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Thu, 12 Jul 2012 
13:54:50 +0200
 
diff --git a/debian/patches/03_fix-disable-xv.diff 
b/debian/patches/03_fix-disable-xv.diff
deleted file mode 100644
index 6aa4a00..000
--- a/debian/patches/03_fix-disable-xv.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
-index c0398da..07372ad 100755
 a/hw/xfree86/sdksyms.sh
-+++ b/hw/xfree86/sdksyms.sh
-@@ -46,8 +46,10 @@ cat  sdksyms.c  EOF
- #include misyncstr.h
- 
- /* Xext/Makefile.am -- half is module, half is builtin */
-+#ifdef XV
- #include xvdix.h
- #include xvmcext.h
-+#endif
- #include geext.h
- #include geint.h
- #ifdef MITSHM
diff --git a/debian/patches/series b/debian/patches/series
index c38536c..aed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
 ## Ubuntu patches start with 100.
 001_fedora_extramodes.patch
 02_Add-libnettle-as-option-for-sha1.diff
-03_fix-disable-xv.diff
 #13_debian_add_xkbpath_env_variable.diff

commit ca7e3cd06e5cc6f8bec9e3d12dedb54c9c3009fc
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 12:45:27 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index ac7878f..37ece39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,629 @@
+commit 77de2994774e7be24a0bad521180628feb1027c6
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Jul 17 15:47:39 2012 -0700
+
+Bump to version 1.12.99.902
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d
+Merge: 6e438a0 6910280
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Jul 17 12:17:39 2012

xorg-server: Changes to 'debian-experimental'

2012-07-17 Thread Maarten Lankhorst 
 debian/control |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6115c088ad0259dddb1cac27cf42b6b4d8ebb0e7
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 17 12:12:13 2012 +0200

Require x11proto-xf86dri-dev

diff --git a/debian/control b/debian/control
index de93fce..41242cb 100644
--- a/debian/control
+++ b/debian/control
@@ -167,6 +167,7 @@ Depends:
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
  x11proto-kb-dev,
+ x11proto-xf86dri-dev,
  libxkbfile-dev,
  libpciaccess-dev,
  libpixman-1-dev (= 0.21.8),


-- 
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/e1sr4mt-00079l...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2012-07-17 Thread Maarten Lankhorst 
 debian/control |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 86b4f9e39c07fdc2974d313c3b30762cdb2b655a
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 17 14:19:27 2012 +0200

and add mesa-common-dev and x11proto-gl-dev to -dev requirements

diff --git a/debian/control b/debian/control
index 41242cb..882272d 100644
--- a/debian/control
+++ b/debian/control
@@ -164,6 +164,7 @@ Depends:
  x11proto-randr-dev (= 1.4.0),
  x11proto-render-dev (= 2:0.11),
  x11proto-dri2-dev (= 2.8),
+ x11proto-gl-dev,
  x11proto-fonts-dev,
  x11proto-xinerama-dev,
  x11proto-kb-dev,
@@ -171,6 +172,7 @@ Depends:
  libxkbfile-dev,
  libpciaccess-dev,
  libpixman-1-dev (= 0.21.8),
+ mesa-common-dev,
  ${misc:Depends},
 Description: Xorg X server - development files
  This package provides development files for the X.Org ('Xorg') X server.


-- 
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/e1sr6kk-0003bx...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2012-07-17 Thread Maarten Lankhorst 
 debian/control |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 98f8ae4675ccbab5e0da940fb1d51967c6a2847b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 17 15:20:39 2012 +0200

and add more missing x11proto

Sigh

diff --git a/debian/control b/debian/control
index 882272d..2f49ff0 100644
--- a/debian/control
+++ b/debian/control
@@ -169,6 +169,8 @@ Depends:
  x11proto-xinerama-dev,
  x11proto-kb-dev,
  x11proto-xf86dri-dev,
+ x11proto-resource-dev,
+ x11proto-scrnsaver-dev,
  libxkbfile-dev,
  libpciaccess-dev,
  libpixman-1-dev (= 0.21.8),


-- 
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/e1sr7hh-0006al...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2012-03-05 Thread Cyril Brulebois 
 ChangeLog  |  367 
 Xi/exevents.c  |  190 
 Xi/xiallowev.c |   81 
 configure.ac   |6 
 debian/changelog   |7 
 debian/control |4 
 dix/events.c   |   57 
 dix/getevents.c|   21 
 dix/inpututils.c   |3 
 dix/touch.c|   73 
 hw/xfree86/common/xf86Xinput.c |   10 
 hw/xfree86/dri2/dri2.c |   20 
 hw/xfree86/os-support/xf86_OSlib.h |2 
 hw/xfree86/parser/InputClass.c |   76 
 hw/xfree86/parser/xf86Parser.h |   20 
 hw/xquartz/GL/capabilities.c   |7 
 hw/xquartz/X11Application.m|   29 
 hw/xquartz/X11Controller.m |7 
 hw/xquartz/bundle/Makefile.am  |   82 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib   | 7549 
--
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/ca.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/ca.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib   | 3640 
 hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/cs.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/cs.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib   | 3617 
 hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/el.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib   | 7047 -
 hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib   |   18 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/he.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/he.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib   | 7312 +
 hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/hr.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/hr.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib   | 3533 
 hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/hu.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/hu.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib   | 3642 
 hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib   | 7482 -
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/ro.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/ro.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib   | 3485 
 hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/sk.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib   | 7022 -
 hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/th.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/th.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib   | 3758 
 hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib |binary

xorg-server: Changes to 'debian-experimental'

2012-02-01 Thread Cyril Brulebois 
 ChangeLog  | 1229 +
 Xext/shm.c |2 
 Xext/xace.c|4 
 Xi/exevents.c  |   20 
 Xi/xiproperty.c|2 
 configure.ac   |   15 
 debian/changelog   |8 
 debian/control |2 
 dix/dispatch.c |   14 
 dix/dixutils.c |   17 
 dix/enterleave.c   |9 
 dix/eventconvert.c |4 
 dix/events.c   |5 
 dix/getevents.c|   19 
 dix/grabs.c|3 
 dix/property.c |2 
 glx/glxscreens.c   |9 
 hw/xfree86/Makefile.am |2 
 hw/xfree86/common/compiler.h   |   19 
 hw/xfree86/common/xf86Xinput.c |   11 
 hw/xfree86/ddc/ddcProperty.c   |   47 -
 hw/xfree86/dixmods/Makefile.am |1 
 hw/xfree86/int10/helper_exec.c |2 
 hw/xfree86/loader/loadmod.c|3 
 hw/xfree86/man/xorg.conf.man   |8 
 hw/xfree86/os-support/linux/lnx_init.c |   19 
 hw/xfree86/sdksyms.sh  |1 
 hw/xfree86/vgahw/vgaHW.h   |8 
 hw/xfree86/xaa/Makefile.am |4 
 hw/xquartz/GL/indirect.c   |3 
 hw/xquartz/bundle/Info.plist.cpp   |8 
 hw/xwin/InitInput.c|6 
 hw/xwin/InitOutput.c   |   31 
 hw/xwin/Makefile.am|3 
 hw/xwin/man/XWin.man   |3 
 hw/xwin/win.h  |2 
 hw/xwin/winclipboard.h |3 
 hw/xwin/winclipboardthread.c   |   95 ++
 hw/xwin/winclipboardunicode.c  |4 
 hw/xwin/winclipboardwndproc.c  |   23 
 hw/xwin/winclipboardwrappers.c |  122 ---
 hw/xwin/winengine.c|   21 
 hw/xwin/winglobals.c   |2 
 hw/xwin/winkeybd.c |   95 +-
 hw/xwin/winkeybd.h |6 
 hw/xwin/winkeynames.h  |2 
 hw/xwin/winmouse.c |5 
 hw/xwin/winmultiwindowclass.h  |   10 
 hw/xwin/winmultiwindowwindow.c |2 
 hw/xwin/winmultiwindowwm.c |   84 +-
 hw/xwin/winmultiwindowwndproc.c|   25 
 hw/xwin/winnativegdi.c |7 
 hw/xwin/winpfbdd.c |6 
 hw/xwin/winprefs.c |   74 +
 hw/xwin/winprefslex.l  |   10 
 hw/xwin/winprocarg.c   |   15 
 hw/xwin/winrandr.c |2 
 hw/xwin/winshadgdi.c   |1 
 hw/xwin/winwin32rootless.c |4 
 hw/xwin/winwin32rootlesswindow.c   |3 
 hw/xwin/winwindow.h|   11 
 hw/xwin/winwndproc.c   |   12 
 include/exevents.h |2 
 include/inputstr.h |2 
 include/misc.h |3 
 mi/mibitblt.c  |2 
 os/backtrace.c |   14 
 os/client.c|   43 +
 os/connection.c|2 
 os/io.c|2 
 os/osdep.h |4 
 render/animcur.c   |3 
 test/Makefile.am   |   57 +
 test/ddxstubs.c|   91 ++
 xkb/xkbActions.c   |2 
 75 files changed, 1954 insertions(+), 462 deletions(-)

New commits:
commit a955fc8b649dc7ffe4b13967af1ec142e416368e
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 2 03:15:04 2012 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index b87332f..7a2167b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.11.99.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.11.99.902-1) experimental; urgency=low
 
   * New upstream release candidate (1.12 RC2):
 - Fix FTBFS on ia64 and mips*.
   * Bump x11proto-input-dev build-dep.
 
- -- Cyril Brulebois k...@debian.org  Mon, 30 Jan 2012 21:48:07 +0100
+ -- Cyril Brulebois k...@debian.org  Thu, 02 Feb 2012 03:15:00 +0100
 
 xorg-server (2:1.11.99.901-1) experimental; urgency=low
 

commit e8f11f9ae7dceacdcb0e5e1fed1028d77410ffb0
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 2 02:00:23 2012 +0100

Bump x11proto-input-dev build-dep.

diff --git a/debian/changelog b/debian/changelog
index b2eaa7a..b87332f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.11.99.902-1) UNRELEASED; urgency=low
 
   * New upstream release candidate (1.12 RC2):
 - Fix FTBFS on ia64 and mips*.
+  * Bump x11proto-input-dev build-dep.
 
  -- Cyril Brulebois k...@debian.org  Mon, 30 Jan

xorg-server: Changes to 'debian-experimental'

2011-12-29 Thread Cyril Brulebois 
 ChangeLog   | 1031 +
 Xi/exevents.c   |  951 +
 Xi/extinit.c|   26 
 Xi/xiallowev.c  |   53 
 Xi/xipassivegrab.c  |   27 
 Xi/xiquerydevice.c  |   39 
 Xi/xiquerydevice.h  |1 
 Xi/xiselectev.c |   48 
 configure.ac|   14 
 debian/changelog|8 
 debian/control  |4 
 debian/serverminver |4 
 dix/Makefile.am |1 
 dix/devices.c   |   87 
 dix/eventconvert.c  |   63 
 dix/events.c|   69 
 dix/getevents.c |  352 
 dix/grabs.c |3 
 dix/inpututils.c|7 
 dix/touch.c |  982 +
 dix/window.c|9 
 glx/Makefile.am |3 
 glx/clientinfo.c|   48 
 glx/createcontext.c |   38 
 glx/dispatch.h  |16553 
 glx/glapi.c |6 
 glx/glapi_gentable.c| 5265 ++
 glx/glapioffsets.h  | 1174 --
 glx/glapitable.h|  883 +
 glx/glprocs.h   | 2841 +++--
 glx/glxdri2.c   |2 
 glx/glxext.h|2 
 glx/indirect_dispatch.c |   76 
 glx/indirect_dispatch.h | 2035 +--
 glx/indirect_dispatch_swap.c|   82 
 glx/indirect_program.c  |1 
 glx/indirect_reqsize.c  |   16 
 glx/indirect_reqsize.h  |  169 
 glx/indirect_size.h |   87 
 glx/indirect_size_get.c |  145 
 glx/indirect_size_get.h |  113 
 glx/indirect_table.c|  215 
 glx/swap_interval.c |1 
 hw/dmx/examples/Makefile.am |   56 
 hw/kdrive/linux/keyboard.c  |6 
 hw/kdrive/linux/ms.c|4 
 hw/kdrive/linux/ps2.c   |4 
 hw/xfree86/common/xf86Module.h  |2 
 hw/xfree86/common/xf86Xinput.c  |   24 
 hw/xfree86/common/xf86Xinput.h  |3 
 hw/xfree86/dri2/dri2.c  |   36 
 hw/xfree86/dri2/dri2.h  |3 
 hw/xfree86/dri2/dri2ext.c   |4 
 hw/xfree86/man/xorg.conf.man|2 
 hw/xquartz/mach-startup/Makefile.am |7 
 include/dix.h   |7 
 include/events.h|1 
 include/eventstr.h  |   30 
 include/exevents.h  |   12 
 include/input.h |   87 
 include/inputstr.h  |   55 
 include/misc.h  |4 
 include/protocol-versions.h |2 
 mi/mieq.c   |   37 
 os/client.c |   69 
 test/Makefile.am|3 
 test/input.c|   17 
 test/touch.c|  270 
 test/xi2/protocol-eventconvert.c|  104 
 test/xi2/protocol-xipassivegrabdevice.c |2 
 test/xi2/protocol-xiselectevents.c  |   38 
 71 files changed, 24776 insertions(+), 9647 deletions(-)

New commits:
commit 1cf15289733d049dbc0fd9da99b9ca476306068a
Author: Cyril Brulebois k...@debian.org
Date:   Fri Dec 30 00:01:41 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 6f30465..86d7357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.11.99.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.11.99.901-1) experimental; urgency=low
 
   * New upstream release candidate (1.12 RC1).
   * Bump input ABI and serverminver again.
   * Bump x11proto-input-dev build-dep/dep.
 
- -- Cyril Brulebois k...@debian.org  Thu, 29 Dec 2011 22:58:06 +0100
+ -- Cyril Brulebois k...@debian.org  Fri, 30 Dec 2011 00:01:35 +0100
 
 xorg-server (2:1.11.99.2-1) experimental; urgency=low
 

commit f2db4ca445d3c8dd2e1bb6875713f2206ff81c13
Author: Cyril Brulebois k...@debian.org
Date:   Thu Dec 29 23:47:39 2011 +0100

Bump x11proto-input-dev build-dep/dep.

diff --git a/debian/changelog b/debian/changelog
index 12e6c20..6f30465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.11.99.901-1) UNRELEASED; urgency=low
 
   * New upstream release candidate (1.12 RC1).
   * Bump input ABI and serverminver again.
+  * Bump x11proto-input-dev build-dep/dep.
 
  -- Cyril Brulebois k...@debian.org  Thu, 29 Dec 2011 22:58:06 +0100
 
diff --git a/debian/control b/debian/control
index

xorg-server: Changes to 'debian-experimental'

2011-12-20 Thread Cyril Brulebois 
 debian/changelog|5 +++--
 debian/serverminver |4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ebce2c4fea5d826898fff2816c3ef1a3180a9b13
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 20 11:40:00 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 0685b68..53ed7a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.11.99.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.11.99.2-1) experimental; urgency=low
 
   * New upstream snapshot.
   * Bump input ABI and serverminver again.
 
- -- Cyril Brulebois k...@debian.org  Tue, 20 Dec 2011 00:37:02 +0100
+ -- Cyril Brulebois k...@debian.org  Tue, 20 Dec 2011 11:39:51 +0100
 
 xorg-server (2:1.11.99.1-1) experimental; urgency=low
 

commit 601ca719ce27f3bca21a1d5393852a8a54fd4c1c
Author: Cyril Brulebois k...@debian.org
Date:   Tue Dec 20 11:27:33 2011 +0100

Bump input ABI and serverminver again.

diff --git a/debian/changelog b/debian/changelog
index 759d23a..0685b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.11.99.2-1) UNRELEASED; urgency=low
 
   * New upstream snapshot.
+  * Bump input ABI and serverminver again.
 
  -- Cyril Brulebois k...@debian.org  Tue, 20 Dec 2011 00:37:02 +0100
 
diff --git a/debian/serverminver b/debian/serverminver
index c2492bd..3ce9542 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.11.99.1
+2:1.11.99.2
 ABI_VIDEODRV_VERSION:12.0
-ABI_XINPUT_VERSION:14.0
+ABI_XINPUT_VERSION:15.0


-- 
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/e1rd0ge-0001bk...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2011-12-19 Thread Cyril Brulebois 
 ChangeLog   | 2307 
 Xext/saver.c|3 
 Xext/security.c |   13 
 Xext/shm.c  |2 
 Xext/sync.c |4 
 Xext/syncsrv.h  |4 
 Xext/xres.c |4 
 Xext/xselinux_hooks.c   |4 
 Xext/xtest.c|9 
 Xext/xvdisp.c   |4 
 Xext/xvmc.c |6 
 Xi/exevents.c   |  262 ++-
 Xi/extinit.c|8 
 Xi/grabdev.c|2 
 Xi/grabdevb.c   |4 
 Xi/grabdevk.c   |4 
 Xi/ungrdev.c|2 
 Xi/ungrdevb.c   |   32 
 Xi/ungrdevk.c   |   31 
 Xi/xichangehierarchy.c  |   15 
 Xi/xigrabdev.c  |   19 
 Xi/xipassivegrab.c  |   92 -
 Xi/xiproperty.c |4 
 Xi/xiselectev.c |5 
 config/hal.c|1 
 configure.ac|   69 
 debian/changelog|6 
 dix/atom.c  |7 
 dix/cursor.c|2 
 dix/devices.c   |6 
 dix/dispatch.c  |   28 
 dix/dixutils.c  |4 
 dix/eventconvert.c  |   16 
 dix/events.c| 1085 ---
 dix/extension.c |   25 
 dix/getevents.c |   38 
 dix/grabs.c |  166 +-
 dix/inpututils.c|  241 +++
 dix/registry.c  |5 
 dix/resource.c  |2 
 dix/tables.c|2 
 doc/Xinput.xml  |2 
 doc/Xserver-spec.xml|4 
 doc/dtrace/Xserver-DTrace.xml   |2 
 exa/exa_render.c|6 
 glx/glxdri.c|   15 
 glx/glxdri2.c   |   14 
 glx/glxdriswrast.c  |   14 
 glx/glxscreens.c|   10 
 glx/single2.c   |4 
 hw/dmx/config/Makefile.am   |1 
 hw/dmx/config/dmxcompat.c   |4 
 hw/dmx/config/scanner.l |3 
 hw/dmx/dmxinit.c|   13 
 hw/dmx/doc/dmx.xml  |2 
 hw/dmx/doc/scaled.xml   |2 
 hw/dmx/examples/ev.c|4 
 hw/dmx/glxProxy/Makefile.am |2 
 hw/dmx/glxProxy/compsize.c  |1 
 hw/dmx/glxProxy/compsize.h  |   51 
 hw/dmx/glxProxy/g_renderswap.c  |1 
 hw/dmx/glxProxy/glxcmds.c   |2 
 hw/dmx/glxProxy/glxcmds.h   |   37 
 hw/dmx/glxProxy/glxcmdsswap.c   |3 
 hw/dmx/glxProxy/glxscreens.c|5 
 hw/kdrive/ephyr/ephyrhostvideo.c|9 
 hw/kdrive/ephyr/hostx.c |5 
 hw/kdrive/linux/linux.c |2 
 hw/kdrive/src/kdrive.c  |   15 
 hw/kdrive/src/kdrive.h  |8 
 hw/kdrive/src/kinput.c  |   10 
 hw/vfb/InitOutput.c |   33 
 hw/xfree86/common/Makefile.am   |2 
 hw/xfree86/common/xf86.h|3 
 hw/xfree86/common/xf86AutoConfig.c  |2 
 hw/xfree86/common/xf86Config.c  |   56 
 hw/xfree86/common/xf86Config.h  |2 
 hw/xfree86/common/xf86Configure.c   |   72 
 hw/xfree86/common/xf86DGA.c |4 
 hw/xfree86/common/xf86Globals.c |2 
 hw/xfree86/common/xf86Helper.c  |   11 
 hw/xfree86/common/xf86Init.c|   78 -
 hw/xfree86/common/xf86Mode.c|4 
 hw/xfree86/common/xf86Module.h  |2 
 hw/xfree86/common/xf86Opt.h |4 
 hw/xfree86/common/xf86Option.c  |   12 
 hw/xfree86/common/xf86PM.c  |4 
 hw/xfree86/common/xf86Priv.h|9 
 hw/xfree86/common/xf86ShowOpts.c|  130 -
 hw/xfree86/common/xf86Xinput.c  |5 
 hw/xfree86/common/xf86Xinput.h  |2 
 hw/xfree86/common/xf86pciBus.c  |   30 
 hw/xfree86/common/xf86sbusBus.c |2 
 hw/xfree86/ddc/xf86DDC.h|5 
 hw/xfree86/doc/ddxDesign.xml|4 
 hw/xfree86/fbdevhw/fbdevhw.c|   26 
 hw/xfree86/i2c/msp3430.c|5 
 hw/xfree86/loader/loadmod.c |   13 
 hw/xfree86/modes/xf86Crtc.c |8 
 hw/xfree86/modes/xf86Crtc.h |2 
 hw/xfree86/modes/xf86EdidModes.c

xorg-server: Changes to 'debian-experimental'

2011-12-16 Thread Cyril Brulebois 
 ChangeLog | 4458 +-
 Xext/bigreq.c |7 
 Xext/dpms.c   |   60 
 Xext/geext.c  |   16 
 Xext/panoramiX.c  |   74 
 Xext/panoramiXSwap.c  |   26 
 Xext/panoramiXsrv.h   |2 
 Xext/saver.c  |   68 
 Xext/security.c   |   37 
 Xext/shape.c  |  110 
 Xext/shm.c|  114 
 Xext/sync.c   |  186 
 Xext/xcmisc.c |   41 
 Xext/xf86bigfont.c|   62 
 Xext/xres.c   |   64 
 Xext/xselinux_ext.c   |   67 
 Xext/xtest.c  |   30 
 Xext/xvdisp.c |  407 -
 Xi/allowev.c  |6 
 Xi/chgdctl.c  |   15 
 Xi/chgfctl.c  |   52 
 Xi/chgkbd.c   |4 
 Xi/chgkmap.c  |3 
 Xi/chgprop.c  |8 
 Xi/chgptr.c   |4 
 Xi/closedev.c |4 
 Xi/devbell.c  |4 
 Xi/exevents.c |   96 
 Xi/extinit.c  |  238 
 Xi/getbmap.c  |   10 
 Xi/getdctl.c  |   33 
 Xi/getfctl.c  |   64 
 Xi/getfocus.c |   14 
 Xi/getkmap.c  |   10 
 Xi/getmmap.c  |   10 
 Xi/getprop.c  |   14 
 Xi/getselev.c |   16 
 Xi/getvers.c  |   16 
 Xi/grabdev.c  |   16 
 Xi/grabdevb.c |   10 
 Xi/grabdevk.c |   10 
 Xi/gtmotion.c |   20 
 Xi/listdev.c  |   28 
 Xi/opendev.c  |   10 
 Xi/queryst.c  |   13 
 Xi/selectev.c |8 
 Xi/sendexev.c |7 
 Xi/setbmap.c  |   10 
 Xi/setdval.c  |   10 
 Xi/setfocus.c |8 
 Xi/setmmap.c  |   10 
 Xi/setmode.c  |   10 
 Xi/ungrdev.c  |6 
 Xi/ungrdevb.c |8 
 Xi/ungrdevk.c |8 
 Xi/xiallowev.c|8 
 Xi/xichangecursor.c   |   10 
 Xi/xichangehierarchy.c|   11 
 Xi/xigetclientpointer.c   |   12 
 Xi/xigrabdev.c|   28 
 Xi/xipassivegrab.c|   60 
 Xi/xiproperty.c   |  107 
 Xi/xiquerydevice.c|  142 
 Xi/xiquerydevice.h|1 
 Xi/xiquerypointer.c   |   30 
 Xi/xiqueryversion.c   |   17 
 Xi/xiselectev.c   |   30 
 Xi/xisetclientpointer.c   |8 
 Xi/xisetdevfocus.c|   23 
 Xi/xiwarppointer.c|   24 
 composite/compalloc.c |   11 
 composite/compext.c   |   74 
 config/Makefile.am|6 
 config/config-backends.h  |7 
 config/config.c

xorg-server: Changes to 'debian-experimental'

2011-08-27 Thread Cyril Brulebois 
 ChangeLog |  161 ++
 composite/compalloc.c |   12 +--
 configure.ac  |4 -
 debian/changelog  |9 ++
 exa/exa_mixed.c   |   23 +++---
 fb/fbblt.c|9 +-
 hw/kdrive/ephyr/ephyrdriext.c |4 +
 hw/xquartz/X11Application.m   |2 
 hw/xquartz/darwin.c   |4 -
 hw/xquartz/xpr/xprFrame.c |9 +-
 include/windowstr.h   |1 
 mi/miexpose.c |4 +
 12 files changed, 214 insertions(+), 28 deletions(-)

New commits:
commit 4d85945b81f250fb13783c9cee1d138cfd32f1f4
Author: Cyril Brulebois k...@debian.org
Date:   Sat Aug 27 13:31:38 2011 +0200

Close bugs.

diff --git a/debian/changelog b/debian/changelog
index 36f8d88..30d9de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,10 @@ xorg-server (2:1.11.0-1) UNRELEASED; urgency=low
 virtual package again.
 
   [ Cyril Brulebois ]
-  * New upstream release.
+  * New upstream release:
+- Fix assertion failure when calling dixSetPrivate (Closes: #632549).
+  Thanks, Mohammed Sameer!
+- Fix memcpy abuse in the fb layer (Closes: #626682).
 
  -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:18:39 +0200
 

commit d6e934be8c3363ff6e4f5243ee675493205fa5da
Author: Cyril Brulebois k...@debian.org
Date:   Sat Aug 27 13:26:16 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index b157de8..11653bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,164 @@
+commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
+Author: Keith Packard kei...@keithp.com
+Date:   Fri Aug 26 16:46:13 2011 -0700
+
+Version bumped to 1.11
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Apr 21 16:37:11 2011 -0400
+
+fb: Fix memcpy abuse
+
+The memcpy fast path implicitly assumes that the copy walks
+left-to-right.  That's not something memcpy guarantees, and newer glibc
+on some processors will indeed break that assumption.  Since we walk a
+line at a time, check the source and destination against the width of
+the blit to determine whether we can be sloppy enough to allow memcpy.
+(Having done this, we can remove the check for !reverse as well.)
+
+On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
+NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
+gives (edited to fit in 80 columns):
+
+1: Disable the fastpath entirely
+2: Replace memcpy with memmove
+3: This fix
+4: The code before this fix
+
+  12 3 4   Operation
+--   ---   ---   ---   
+258000   269000 (  1.04)   544000 (  2.11)   552000 (  2.14)   Copy 10x10
+ 2130023000 (  1.08)43700 (  2.05)47100 (  2.21)   Copy 100x100
+   960  962 (  1.00) 1990 (  2.09) 1990 (  2.07)   Copy 500x500
+
+So it's a modest performance hit, but correctness demands it, and it's
+probably worth keeping the 2x speedup from having the fast path in the
+first place.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
+Author: Pelle Johansson pe...@morth.org
+Date:   Sun Aug 14 17:44:40 2011 -0700
+
+XQuartz: Initialize darwin pointer valuators
+
+This fixes a regression introduced by: 
633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
+
+http://xquartz.macosforge.org/trac/ticket/498
+
+Signed-off-by: Pelle Johansson pe...@morth.org
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+
+commit 4020cab88f5cf3164fc83cf912f94f288aa5a45d
+Author: Michel Dänzer michel.daen...@amd.com
+Date:   Wed Aug 10 11:36:16 2011 +0200
+
+EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
+
+Otherwise sys_pitch will be stale when a system memory copy is allocated.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38322 and a crash when
+unlocking the screen with xscreensaver, reported by Janne Huttunen.
+
+Signed-off-by: Michel Dänzer michel.daen...@amd.com
+Tested-by: Janne Huttunen jahut...@gmail.com
+Tested-by: Jan Kriho erbur...@gmail.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit a1dec7cd6adabaf8770dc3b21b0df30ce2f0bc8d
+Author: Julien Cristau jcris...@debian.org
+Date:   Thu Jul 7 19:18:03 2011 +0200
+
+Xephyr/dri: register screen and window privates on init
+
+Fixes assertion failure when calling dixSetPrivate
+Debian bug#632549 http://bugs.debian.org/632549
+
+Reported-and-tested-by: Mohammed Sameer msam...@foolab.org
+Signed-off-by: Julien Cristau jcris...@debian.org
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+

xorg-server: Changes to 'debian-experimental'

2011-07-31 Thread Julien Cristau 
 ChangeLog| 1931 ++
 Xext/xtest.c |9 
 Xext/xvmc.c  |   11 
 Xi/exevents.c|   28 
 config/udev.c|   20 
 configure.ac |   33 
 debian/changelog |   25 
 debian/control   |   21 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff  |   22 
 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff|   16 
 debian/patches/20-workaround-36986.diff  |   13 
 debian/patches/series|1 
 debian/rules |2 
 dev/null |binary
 dix/.gitignore   |1 
 dix/Makefile.am  |6 
 dix/dixutils.c   |   10 
 dix/events.c |  113 
 dix/getevents.c  |   68 
 dix/grabs.c  |  112 
 dix/main.c   |2 
 dix/window.c |  151 
 doc/Xserver-spec.xml |4 
 doc/dtrace/Makefile.am   |2 
 docbook.am   |7 
 exa/exa.c|4 
 exa/exa_accel.c  |6 
 exa/exa_classic.c|2 
 exa/exa_driver.c |2 
 exa/exa_migration_classic.c  |4 
 exa/exa_migration_mixed.c|2 
 exa/exa_mixed.c  |2 
 exa/exa_unaccel.c|4 
 fb/fb24_32.c |4 
 fb/fbarc.c   |9 
 fb/fbfill.c  |6 
 fb/fbgc.c|4 
 fb/fbpush.c  |2 
 glx/Makefile.am  |7 
 glx/glapi.h  |3 
 glx/glapi_gentable.c | 7589 
++
 glx/glxdri2.c|9 
 glx/glxscreens.c |7 
 glx/glxscreens.h |1 
 hw/dmx/config/xdmxconfig.c   |8 
 hw/dmx/dmxinit.c |6 
 hw/dmx/dmxinput.c|1 
 hw/dmx/examples/xbell.c  |3 
 hw/dmx/glxProxy/glxscreens.h |1 
 hw/dmx/input/dmxinputinit.c  |3 
 hw/dmx/man/Xdmx.man  |   30 
 hw/kdrive/ephyr/ephyr.c  |2 
 hw/kdrive/ephyr/ephyr.h  |2 
 hw/kdrive/ephyr/ephyr_draw.c |2 
 hw/kdrive/ephyr/ephyrinit.c  |3 
 hw/kdrive/ephyr/hostx.c  |2 
 hw/kdrive/ephyr/hostx.h  |2 
 hw/kdrive/ephyr/man/Xephyr.man   |2 
 hw/kdrive/ephyr/os.c |2 
 hw/kdrive/fake/fakeinit.c|1 
 hw/kdrive/fake/kbd.c |2 
 hw/kdrive/fbdev/fbdev.c  |2 
 hw/kdrive/fbdev/fbdev.h  |2 
 hw/kdrive/fbdev/fbinit.c |

xorg-server: Changes to 'debian-experimental'

2011-07-31 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/control   |4 
 2 files changed, 11 insertions(+)

New commits:
commit 5929db44124705d60ed9ef7f1d53de79103a7de8
Author: Julien Cristau jcris...@debian.org
Date:   Mon Aug 1 01:19:42 2011 +0200

Restore the xserver virtual package

Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
virtual package again.

diff --git a/debian/changelog b/debian/changelog
index 17bc6df..11fc300 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.99.901+git20110731-2) UNRELEASED; urgency=low
+
+  * Make xvfb, xnest, xserver-xephyr and xserver-xfbdev provide the xserver
+virtual package again.
+
+ -- Julien Cristau jcris...@debian.org  Mon, 01 Aug 2011 01:18:39 +0200
+
 xorg-server (2:1.10.99.901+git20110731-1) experimental; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index 540f232..ea69deb 100644
--- a/debian/control
+++ b/debian/control
@@ -229,6 +229,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Recommends: libgl1-mesa-dri (= 7.1~rc1)
+Provides: xserver
 Description: Nested X server
  Xnest is a nested X server that simply relays all its requests to another
  X server, where it runs as a client.  This means that it appears as another
@@ -249,6 +250,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Recommends: xauth
+Provides: xserver
 Description: Virtual Framebuffer 'fake' X server
  Xvfb provides an X server that can run on machines with no display hardware
  and no physical input devices. It emulates a dumb framebuffer using virtual
@@ -277,6 +279,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
 Recommends: libgl1-mesa-dri (= 7.1~rc1)
+Provides: xserver
 Description: nested X server
  Xephyr is an X server that can be run inside another X server,
  much like Xnest. It is based on the kdrive X server, and as a
@@ -294,6 +297,7 @@ Depends:
  xserver-common (= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
+Provides: xserver
 Description: Linux framebuffer device tiny X server
  xserver-xfbdev is a Linux framebuffer device tiny X server based on the
  kdrive X server.


-- 
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/e1qnfij-0007zz...@vasks.debian.org

xorg-server: Changes to 'debian-experimental'

2011-06-02 Thread Cyril Brulebois 
 ChangeLog   |   94 ++
 configure.ac|   14 -
 debian/changelog|7 
 debian/control  |4 
 debian/serverminver |2 
 debian/watch|1 
 dix/main.c  |2 
 include/privates.h  |2 
 include/protocol-versions.h |2 
 m4/xorg-tls.m4  |6 
 test/Makefile.am|3 
 test/fixes.c|  327 
 xfixes/cursor.c |  399 +++-
 xfixes/xfixes.c |   24 +-
 xfixes/xfixes.h |   17 +
 xfixes/xfixesint.h  |   16 +
 16 files changed, 886 insertions(+), 34 deletions(-)

New commits:
commit c437bd08fbe6d5c93f8d98c1f139d7ad8e34b413
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 01:25:38 2011 +0200

Bump xutils-dev again for even newer macros.

diff --git a/debian/control b/debian/control
index cc0d83e..3ed0e07 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  flex,
  automake,
  libtool,
- xutils-dev (= 1:7.6+3),
+ xutils-dev (= 1:7.6+4),
  xfonts-utils (= 1:7.5+1),
  x11proto-bigreqs-dev (= 1:1.1.0),
  x11proto-composite-dev (= 1:0.4),

commit edeb8b9598c072d82d7d32eca67809b8dec103b9
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 01:25:34 2011 +0200

Bump x11proto-fixes-dev build-dep for pointer barriers support.

diff --git a/debian/changelog b/debian/changelog
index 63cbca9..bec6c1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-server (2:1.10.99.901-1) UNRELEASED; urgency=low
   * Bump pixman build-dep/dep to 0.21.8.
   * Bump xutils-dev build-dep for new macros.
   * Drop libglib2.0-dev build-dep, no longer needed for unit tests.
+  * Bump x11proto-fixes-dev build-dep for pointer barriers support.
 
  -- Cyril Brulebois k...@debian.org  Tue, 31 May 2011 13:52:04 +0200
 
diff --git a/debian/control b/debian/control
index 678362f..cc0d83e 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  x11proto-composite-dev (= 1:0.4),
  x11proto-core-dev (= 7.0.17),
  x11proto-damage-dev (= 1.1),
- x11proto-fixes-dev (= 1:4.1),
+ x11proto-fixes-dev (= 1:5.0),
  x11proto-kb-dev (= 1.0.3),
  x11proto-xinerama-dev,
  x11proto-randr-dev (= 1.2.99.3),

commit c6d66c12cf11ccd736aa05f1dbf963084e95bc00
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 01:25:28 2011 +0200

Update serverminver accordingly.

diff --git a/debian/serverminver b/debian/serverminver
index 01f0694..5580dc9 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1,3 +1,3 @@
-2:1.10.99.1
+2:1.10.99.901
 ABI_VIDEODRV_VERSION:11.0
 ABI_XINPUT_VERSION:13.0

commit bea957121f69b452f73a4a2873d25f344bda4d21
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 01:11:50 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 3a4c7bc..b7df3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,81 @@
+commit db228d3d07a6d831f53e4c05c878327ad4d045eb
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Jun 1 11:20:10 2011 -0700
+
+Version bumped to 1.10.99.901 (1.11 RC1)
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 0643c056512d10be8db223d18d6563292d57e916
+Merge: a2e6cfc d45f5b2
+Author: Keith Packard kei...@keithp.com
+Date:   Tue May 31 23:45:07 2011 -0700
+
+Merge remote-tracking branch 'ajax/xserver-next'
+
+commit a2e6cfc18aec1c0027b51572b03ec9f2ab074b56
+Merge: bc04065 8d84fd2
+Author: Keith Packard kei...@keithp.com
+Date:   Tue May 31 23:42:52 2011 -0700
+
+Merge remote-tracking branch 'sandmann/for-keithp'
+
+commit d45f5b2493bc0a2882bf972849b5c9c50cd533ca
+Author: Adam Jackson a...@redhat.com
+Date:   Wed May 25 05:54:35 2011 -0400
+
+fixes: Add support for pointer barriers
+
+Implements pointer barriers as specified by version 5 of the XFIXES
+protocol. Barriers are axis-aligned, zero-width lines that block pointer
+movement for relative input devices. Barriers may block motion in either
+the positive or negative direction, or both.
+
+v3:
+- Fix off-by-one in version_requests array
+- Port to non-glib test harness
+- Fix review notes from Søren Sandmann Pedersen, add tests to match
+
+Co-authored-by: Peter Hutterer peter.hutte...@who-t.net
+Tested-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Adam Jackson a...@redhat.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Fri May 20 19:24:34 2011 -0700
+
+privates.h, line 198: warning: void function cannot return value
+
+Providing an argument to return in a function with void return type
+is not allowed by the C standard, and makes the Sun compilers unhappy.
+(They actually flag it as an error, unless using a new enough version
+

xorg-server: Changes to 'debian-experimental'

2011-05-07 Thread Cyril Brulebois 
 ChangeLog |  340 +
 Xi/exevents.c |   11 
 Xi/extinit.c  |2 
 Xi/xipassivegrab.c|   16 
 configure.ac  |6 
 debian/changelog  |   13 
 dix/devices.c |   47 
 dix/ptrveloc.c|2 
 glx/Makefile.am   |6 
 glx/glapi.c   |  558 --
 glx/glapi.h   |   28 
 glx/glapitemp.h   | 6655 --
 glx/glxcmds.c |  109 
 glx/glxdri2.c |1 
 glx/glxdriswrast.c|8 
 glx/glxext.c  |   53 
 glx/glxserver.h   |7 
 hw/xquartz/GL/indirect.c  |9 
 hw/xquartz/X11Application.m   |2 
 hw/xquartz/applewmExt.h   |   13 
 hw/xquartz/darwinEvents.c |   28 
 hw/xquartz/mach-startup/bundle-main.c |   23 
 hw/xquartz/pbproxy/x-selection.m  |   11 
 hw/xquartz/xpr/xprAppleWM.c   |4 
 include/input.h   |5 
 include/inputstr.h|2 
 miext/rootless/rootlessScreen.c   |2 
 test/input.c  |   24 
 28 files changed, 581 insertions(+), 7404 deletions(-)

New commits:
commit 7d111fb3bd11e2840dc26952240054b91dd798dd
Author: Cyril Brulebois k...@debian.org
Date:   Sat May 7 13:27:40 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index a175b94..4c39950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg-server (2:1.10.1.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.1.901-1) experimental; urgency=low
 
   * New upstream release (1.10.2 rc1):
 - Comes with some Xi fixes.
 - Comes with many GLX fixes.
 
- -- Cyril Brulebois k...@debian.org  Sat, 07 May 2011 13:22:35 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 07 May 2011 13:27:28 +0200
 
 xorg-server (2:1.10.1-2) unstable; urgency=low
 

commit 4e9d4971d5fa66a781611f03dd7bc9534c647c5b
Author: Cyril Brulebois k...@debian.org
Date:   Sat May 7 13:27:09 2011 +0200

Mention Xi/GLX.

diff --git a/debian/changelog b/debian/changelog
index 583af9f..a175b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg-server (2:1.10.1.901-1) UNRELEASED; urgency=low
 
-  * New upstream release (1.10.2 rc1).
+  * New upstream release (1.10.2 rc1):
+- Comes with some Xi fixes.
+- Comes with many GLX fixes.
 
  -- Cyril Brulebois k...@debian.org  Sat, 07 May 2011 13:22:35 +0200
 

commit 20b68036eb7fefa0ae986b6d2939f133bea3613d
Author: Cyril Brulebois k...@debian.org
Date:   Sat May 7 13:23:30 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 63ab294..047e8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,343 @@
+commit 164ef01bd55a1d2c31620e9868f4cc3d032223a6
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri May 6 15:43:04 2011 -0700
+
+configure.ac: Version bumped to 1.10.1.901
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit c52a93c5398e439e6e1d9e8ee20c6c1cf28dd5de
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Apr 29 11:06:18 2011 -0700
+
+XQuartz: Fix incorrect typedefs with XPLUGIN_VERSION  4
+
+Ok, this time for sure... how many brown bags can I fit over my face?
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+(cherry picked from commit 0fc7ec6dd504aa03e1a1b18c60942c0c8c8b701b)
+
+commit 7688d6d317f809028394ea6c5ffa31424e853796
+Author: Adam Jackson a...@redhat.com
+Date:   Fri Apr 15 13:01:37 2011 -0400
+
+glx: Make --disable-dri not disable AIGLX
+
+Either the DRI1 or DRI2 loaders are sufficient.
+
+Reviewed-by: Ian Romanick ian.d.roman...@intel.com
+Signed-off-by: Adam Jackson a...@redhat.com
+(cherry picked from commit 001b6b8b70734db1fa2f68e45c1db8337ba9f662)
+
+commit e67afcdb9a6a634d6903da3f272aed7dab0e91b3
+Author: Adam Jackson a...@redhat.com
+Date:   Fri Apr 15 12:57:05 2011 -0400
+
+glx: Use 0 rather than garbage for unknown INTEL_swap_event types
+
+Otherwise the garbage you return could well be numerically identical to
+one of the swap type tokens, and apps which rely on us to tell the truth
+would be in trouble.
+
+Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org
+Signed-off-by: Adam Jackson a...@redhat.com
+(cherry picked from commit f8540b9dcc1fba886be5c4ce7ea0d74952cb48c4)
+
+commit b5093063b5d76ff31519a2daf85ea32808f1afe6
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Mar 28 12:30:09 2011 -0400
+
+glx: Fix lifetime tracking for pixmaps
+
+GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap
+IDs can be destroyed in either order with no error.  Only windows need
+to be tracked under both XIDs.

xorg-server: Changes to 'debian-experimental'

2011-04-26 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7bff3095550502e85017f3376f59114e896488cc
Author: Julien Cristau jcris...@debian.org
Date:   Tue Apr 26 13:25:23 2011 +0200

Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!

diff --git a/debian/changelog b/debian/changelog
index 0c367f2..42ba9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.10.1-2) UNRELEASED; urgency=low
+
+  * Build xserver-xorg-core-udeb on hurd-i386.  Thanks, Samuel Thibault!
+
+ -- Julien Cristau jcris...@debian.org  Tue, 26 Apr 2011 13:24:04 +0200
+
 xorg-server (2:1.10.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8a97023..ad69157 100644
--- a/debian/control
+++ b/debian/control
@@ -130,7 +130,7 @@ Package: xserver-xorg-core-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 # exclude sparc because of linker errors
-Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 
kfreebsd-i386 mips mipsel powerpc powerpcspe s390
+Architecture: alpha amd64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 
kfreebsd-i386 mips mipsel powerpc powerpcspe s390
 Depends:
 # merged: xserver-common (= ${source:Version}),
  xkb-data-udeb,


-- 
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/e1qegos-0004dh...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2011-04-18 Thread Cyril Brulebois 
 ChangeLog|   19 +++
 configure.ac |4 ++--
 debian/changelog |6 ++
 dix/devices.c|   42 --
 4 files changed, 27 insertions(+), 44 deletions(-)

New commits:
commit ceb92cb1e0a385c30be3a4d4a8c2846afd03543e
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 03:08:22 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index a979b15..0c367f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.10.1-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.1-1) experimental; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:07:39 +0200
+ -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:08:08 +0200
 
 xorg-server (2:1.10.0.902-1) experimental; urgency=low
 

commit 46b133ad49c8e94c33300feec00e3a056214c272
Author: Cyril Brulebois k...@debian.org
Date:   Tue Apr 19 03:07:49 2011 +0200

New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 8f0a412..63ab294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+commit a73311f8304193f9245fb077f173bf1e1d52e040
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Apr 15 17:58:57 2011 -0700
+
+configure.ac: Bump verison to 1.10.1
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 55f85d6cc28d737314f12958aac49d61b9476657
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Thu Apr 14 15:24:07 2011 -0700
+
+Revert dix: release all buttons and keys before reattaching a device 
(#34182)
+
+This patch introduced a regression, reverting for the 1.10.1 release. See
+https://bugs.freedesktop.org/show_bug.cgi?id=36146
+
+This reverts commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a.
+
 commit ec6e1e45627de2bb851f135df0507a360d0d99e6
 Author: Jeremy Huddleston jerem...@apple.com
 Date:   Fri Apr 8 16:36:32 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 7ea3fbe..a979b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.10.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 19 Apr 2011 03:07:39 +0200
+
 xorg-server (2:1.10.0.902-1) experimental; urgency=low
 
   * New upstream release (1.10.1 rc2).

commit a73311f8304193f9245fb077f173bf1e1d52e040
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Apr 15 17:58:57 2011 -0700

configure.ac: Bump verison to 1.10.1

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index d5d3e3b..756733e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-04-08
+AC_INIT([xorg-server], 1.10.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-04-15
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 55f85d6cc28d737314f12958aac49d61b9476657
Author: Jeremy Huddleston jerem...@apple.com
Date:   Thu Apr 14 15:24:07 2011 -0700

Revert dix: release all buttons and keys before reattaching a device 
(#34182)

This patch introduced a regression, reverting for the 1.10.1 release. See
https://bugs.freedesktop.org/show_bug.cgi?id=36146

This reverts commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a.

diff --git a/dix/devices.c b/dix/devices.c
index 84284e7..55f22cb 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2380,46 +2380,6 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 }
 
 /**
- * Generate release events for all keys/button currently down on this
- * device.
- */
-static void
-ReleaseButtonsAndKeys(DeviceIntPtr dev)
-{
-EventListPtreventlist = InitEventList(GetMaximumEventsNum());
-ButtonClassPtr  b = dev-button;
-KeyClassPtr k = dev-key;
-int i, j, nevents;
-
-if (!eventlist) /* no release events for you */
-return;
-
-/* Release all buttons */
-for (i = 0; b  i  b-numButtons; i++)
-{
-if (BitIsOn(b-down, i))
-{
-nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, 
NULL);
-for (j = 0; j  nevents; j++)
-mieqProcessDeviceEvent(dev, 
(InternalEvent*)(eventlist+j)-event, NULL);
-}
-}
-
-/* Release all keys */
-for (i = 0; k  i  MAP_LENGTH; i++)
-{
-if (BitIsOn(k-down, i))
-{
-nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
-for (j = 0; j  nevents; j++)
-mieqProcessDeviceEvent(dev, 
(InternalEvent*)(eventlist+j)-event, NULL);
-}
-}
-
-FreeEventList(eventlist, GetMaximumEventsNum());
-}
-
-/**
  * Attach device 'dev' to device 'master'.
  *

xorg-server: Changes to 'debian-experimental'

2011-04-08 Thread Cyril Brulebois 
 ChangeLog|  846 +++
 Xext/geext.c |2 
 Xext/xtest.c |5 
 Xi/exevents.c|   10 
 Xi/extinit.c |7 
 Xi/getprop.c |2 
 Xi/getselev.c|6 
 Xi/xichangehierarchy.c   |2 
 Xi/xiquerydevice.c   |7 
 configure.ac |4 
 debian/changelog |6 
 dix/colormap.c   |2 
 dix/devices.c|   42 +
 dix/dixfonts.c   |   18 
 dix/eventconvert.c   |   23 -
 dix/events.c |7 
 dix/extension.c  |5 
 dix/getevents.c  |4 
 fb/fboverlay.c   |8 
 fb/fbscreen.c|4 
 hw/xfree86/common/xf86Config.c   |   32 +
 hw/xfree86/common/xf86Helper.c   |1 
 hw/xfree86/common/xf86Init.c |4 
 hw/xfree86/common/xf86Option.c   |   77 ++-
 hw/xfree86/doc/man/xorg.conf.man |   13 
 hw/xfree86/dri2/dri2.c   |9 
 hw/xfree86/loader/loadmod.c  |6 
 hw/xquartz/bundle/Info.plist.cpp |4 
 mi/micmap.c  |2 
 mi/midispcur.c   |   10 
 mi/mipointer.c   |1 
 mi/mispans.c |2 
 mi/mizerline.c   |6 
 os/utils.c   |   21 
 render/render.c  |   25 -
 xfixes/region.c  |2 
 xkb/XKBGAlloc.c  |4 
 xkb/ddxList.c|4 
 38 files changed, 1083 insertions(+), 150 deletions(-)

New commits:
commit 3238cfbf4448574cd9e4a3d71bea8c05ca5982a9
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 9 04:18:38 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 5719d30..7ea3fbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.10.0.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.0.902-1) experimental; urgency=low
 
   * New upstream release (1.10.1 rc2).
 
- -- Cyril Brulebois k...@debian.org  Sat, 09 Apr 2011 03:34:54 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 09 Apr 2011 04:18:28 +0200
 
 xorg-server (2:1.10.0.901-1) experimental; urgency=low
 

commit bb0db0e851979a326304719c6d29c979e6ba42d9
Author: Cyril Brulebois k...@debian.org
Date:   Sat Apr 9 03:35:22 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index d98ca51..8f0a412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,849 @@
+commit ec6e1e45627de2bb851f135df0507a360d0d99e6
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Apr 8 16:36:32 2011 -0700
+
+configure.ac: Version bumped to 1.10.0.902 (1.10.1 RC2)
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 7379f7a7717a431ba4f8cf371aad9838aec7bec6
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Wed Apr 6 14:51:45 2011 -0400
+
+Fix unset valuator handling for XI 1.x valuator events again
+
+Set the valuator values for unset masked absolute valuators in the
+internal device event. This ensures the values will always be correct in
+getValuatorEvents even if the device has been removed.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit b28a1af55cf1ad2a882cc8cd73b77341dec7ff5a)
+
+commit 89142b356b3119d7b7012df075fc7698ec38e769
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Thu Mar 31 11:29:01 2011 -0400
+
+Don't report old relative values in getValuatorEvents
+
+Relative valuator values should not be reported in any future events. If
+a relative valuator value is not set in an internal event, set the value
+to 0 for XI 1.x valuator events sent over the wire.
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Simon Thum simon.t...@gmx.de
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit f40103cee1d591387359f401a5a7c21f4105aeb4)
+
+commit f1a8f8afc7424346dbe3360eaa5fd95d458de2e0
+Author: Chase Douglas chase.doug...@canonical.com
+Date:   Mon Mar 28 16:04:48 2011 -0400
+
+Handle non continuous valuator data in getValuatorEvents
+
+This allows for masked valuators to be handled properly in XI 1.x
+events. Any unset valuators in the device event are set to the last
+known value when transmitted on the wire through XI 1.x valuator events.
+
+Fixes https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/736500
+
+Signed-off-by: Chase Douglas chase.doug...@canonical.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+(cherry picked from commit

xorg-server: Changes to 'debian-experimental'

2011-03-29 Thread Cyril Brulebois 
 ChangeLog |   93 
 Xi/xipassivegrab.c|4 
 Xi/xiproperty.c   |4 
 config/hal.c  |6 
 config/udev.c |   10 
 configure.ac  |   14 
 debian/changelog  |9 
 debian/patches/16-construct-paths-in-doxygen.conf.diff| 2169 --
 debian/patches/series |1 
 debian/rules  |1 
 dix/devices.c |   16 
 glx/glapi.c   |4 
 glx/glapi.h   |2 
 glx/glthread.h|2 
 hw/dmx/doc/.gitignore |1 
 hw/dmx/doc/Makefile.am|  208 
 hw/dmx/doc/doxygen.conf   | 1053 
 hw/dmx/doc/doxygen.conf.in| 1053 
 hw/xfree86/common/xf86Config.c|   10 
 hw/xfree86/common/xf86Xinput.c|5 
 hw/xfree86/loader/Makefile.am |   12 
 hw/xfree86/modes/xf86Crtc.c   |   21 
 hw/xfree86/vbe/vbe.c  |2 
 hw/xquartz/X11Application.h   |3 
 hw/xquartz/X11Application.m   |   29 
 hw/xquartz/bundle/Resources/English.lproj/Localizable.strings |binary
 hw/xquartz/pbproxy/x-selection.h  |2 
 hw/xquartz/quartz.c   |2 
 hw/xquartz/quartz.h   |2 
 hw/xquartz/quartzRandR.c  |   27 
 hw/xquartz/xpr/xprAppleWM.c   |2 
 hw/xquartz/xpr/xprFrame.c |4 
 hw/xquartz/xpr/xprScreen.c|   34 
 hw/xwin/glx/Makefile.am   |4 
 include/dix-config.h.in   |3 
 include/xkbsrv.h  |5 
 miext/damage/damage.c |6 
 xkb/XKBAlloc.c|   19 
 xkb/ddxLoad.c |   22 
 xkb/xkb.c |   23 
 xkb/xkbActions.c  |   11 
 41 files changed, 1546 insertions(+), 3352 deletions(-)

New commits:
commit b4bdcaae325219489e9669ff2b711036af57e388
Author: Cyril Brulebois k...@debian.org
Date:   Wed Mar 30 02:23:29 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index aa70571..8845a98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xorg-server (2:1.10.0.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.0.901-1) experimental; urgency=low
 
-  * New upstream release.
+  * New upstream release (1.10.1 rc1).
   * Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4
 bits were finally reverted upstream.
   * Remove patch: 16-construct-paths-in-doxygen.conf.diff (merged
@@ -8,7 +8,7 @@ xorg-server (2:1.10.0.901-1) UNRELEASED; urgency=low
   * Pass --enable-xcsecurity to the main build to restore the XC-SECURITY
 extension, thanks to Stefan Fritsch's report (Closes: #599657).
 
- -- Cyril Brulebois k...@debian.org  Wed, 30 Mar 2011 01:42:22 +0200
+ -- Cyril Brulebois k...@debian.org  Wed, 30 Mar 2011 02:22:56 +0200
 
 xorg-server (2:1.9.99.903-1) experimental; urgency=low
 

commit ec55b8a6b4fe402b7cdf7df347fe33d371840ffe
Author: Cyril Brulebois k...@debian.org
Date:   Wed Mar 30 01:42:45 2011 +0200

Bump changelogs.

diff --git a/debian/changelog b/debian/changelog
index 4a662e8..aa70571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.0-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.0.901-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4
@@ -8,7 +8,7 @@ xorg-server (2:1.10.0-1) UNRELEASED; urgency=low
   * Pass --enable-xcsecurity to the main build to restore the XC-SECURITY
 extension, thanks to Stefan Fritsch's report (Closes: #599657).
 
- -- Cyril Brulebois k...@debian.org  Fri, 25 Feb 2011 16:15:45 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 30 Mar 2011 01:42:22 +0200
 
 xorg-server (2:1.9.99.903-1) experimental; urgency=low
 

commit

xorg-server: Changes to 'debian-experimental'

2011-02-25 Thread Cyril Brulebois 
 ChangeLog|  407 +
 configure.ac |6 
 debian/changelog |   14 
 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff|8 
 debian/patches/16-construct-paths-in-doxygen.conf.diff   | 2169 
++
 debian/patches/16-oot-build.diff |   31 
 debian/patches/17-fix-ftbfs-on-sparc.diff|   33 
 debian/patches/20-update-gpu-pitch.diff  |   25 
 debian/patches/series|4 
 debian/serverminver  |4 
 exa/exa_mixed.c  |9 
 hw/dmx/glxProxy/glxcmds.c|   80 
 hw/dmx/glxProxy/glxsingle.c  |7 
 hw/dmx/glxProxy/glxvendor.c  |6 
 hw/dmx/glxProxy/render2swap.c|   54 
 hw/xfree86/common/xf86Helper.c   |6 
 hw/xfree86/common/xf86Module.h   |2 
 hw/xfree86/common/xf86sbusBus.c  |2 
 hw/xfree86/modes/xf86Crtc.c  |  149 
 hw/xfree86/modes/xf86Crtc.h  |  119 
 hw/xfree86/modes/xf86Cursors.c   |4 
 hw/xfree86/modes/xf86RandR12.c   |  387 -
 hw/xfree86/modes/xf86Rotate.c|   44 
 hw/xfree86/os-support/bsd/bsd_init.c |6 
 hw/xfree86/os-support/xf86_OSlib.h   |8 
 hw/xquartz/bundle/Info.plist.cpp |2 
 hw/xquartz/bundle/Resources/French.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib |  441 +-
 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib |  360 +
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  323 +
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 include/colormapst.h |4 
 include/protocol-versions.h  |2 
 include/scrnintstr.h |2 
 include/xorg-server.h.in |7 
 randr/Makefile.am|6 
 randr/mirrcrtc.c |  174 
 randr/randr.c|   15 
 randr/randrstr.h |  207 
 randr/rrcrtc.c   |  562 --
 randr/rrdispatch.c   |6 
 randr/rrinfo.c   |2 
 randr/rrpixmap.c |  154 
 randr/rrscreen.c |   32 
 randr/rrsdispatch.c  |  132 
 randr/rrsprite.c |  104 
 randr/rrtransform.c  |   64 
 randr/rrtransform.h  |   15 
 record/record.c  |6 
 53 files changed, 3797 insertions(+), 2419 deletions(-)

New commits:
commit 5d7c54b2dd6c36df189f522623fb68d806b436c5
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 15:22:44 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index fa4d354..1cea238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.903-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.99.903-1) experimental; urgency=low
 
   * New upstream release candidate (1.10 rc3).
   * Remove patch: 17-fix-ftbfs-on-sparc.diff (merged upstream).
@@ -10,7 +10,7 @@ xorg-server (2:1.9.99.903-1) UNRELEASED; urgency=low
   without the gitignore hunk to get patching working).
   * Bump video ABI version, and serverminver accordingly.
 
- -- Cyril Brulebois k...@debian.org  Fri, 25 Feb 2011

xorg-server: Changes to 'debian-experimental'

2011-02-25 Thread Cyril Brulebois 
 debian/changelog |7 +++
 debian/control   |4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit fbc83d0ee25e7aa106e7d8ab08d195bfe3bf2999
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 25 16:16:48 2011 +0100

Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4 bits 
were finally reverted upstream.

diff --git a/debian/changelog b/debian/changelog
index 1cea238..a804edc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.9.99.903-2) UNRELEASED; urgency=low
+
+  * Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4
+bits were finally reverted upstream.
+
+ -- Cyril Brulebois k...@debian.org  Fri, 25 Feb 2011 16:15:45 +0100
+
 xorg-server (2:1.9.99.903-1) experimental; urgency=low
 
   * New upstream release candidate (1.10 rc3).
diff --git a/debian/control b/debian/control
index 25568aa..8a97023 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends:
  x11proto-fixes-dev (= 1:4.1),
  x11proto-kb-dev (= 1.0.3),
  x11proto-xinerama-dev,
- x11proto-randr-dev (= 1.3.99),
+ x11proto-randr-dev (= 1.2.99.3),
  x11proto-record-dev (= 1.13.99.1),
  x11proto-render-dev (= 2:0.11),
  x11proto-resource-dev,
@@ -153,7 +153,7 @@ Depends:
  x11proto-input-dev (= 1.9.99.902),
  x11proto-xext-dev (= 7.1.99),
  x11proto-video-dev,
- x11proto-randr-dev (= 1.3.99),
+ x11proto-randr-dev (= 1.2.99.3),
  x11proto-render-dev (= 2:0.11),
  x11proto-dri2-dev (= 2.3),
  x11proto-fonts-dev,


-- 
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/e1pszol-0005dp...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2011-02-23 Thread Cyril Brulebois 
Rebased ref, commits from common ancestor:
commit 14eefa39fc577b0e7611438377a15c5c9a57d3bd
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 23 13:36:17 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 44474b2..37d8424 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.9.99.902-3) UNRELEASED; urgency=low
+xorg-server (2:1.9.99.902-3) experimental; urgency=low
 
   * Merge from master up to 93a7399370.
   * New patch: 17-fix-ftbfs-on-sparc.diff; let's try it for real before
 asking for its being merged upstream.
   * Refresh all patches.
 
- -- Cyril Brulebois k...@debian.org  Wed, 23 Feb 2011 12:42:18 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 23 Feb 2011 13:36:13 +0100
 
 xorg-server (2:1.9.99.902-2) experimental; urgency=low
 

commit 9f41e49ee43df600dbe1e9dd19d41decc7221085
Author: Cyril Brulebois k...@debian.org
Date:   Wed Feb 23 13:35:58 2011 +0100

Refresh all patches.

diff --git a/debian/changelog b/debian/changelog
index a5b8dee..44474b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.9.99.902-3) UNRELEASED; urgency=low
   * Merge from master up to 93a7399370.
   * New patch: 17-fix-ftbfs-on-sparc.diff; let's try it for real before
 asking for its being merged upstream.
+  * Refresh all patches.
 
  -- Cyril Brulebois k...@debian.org  Wed, 23 Feb 2011 12:42:18 +0100
 
diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff 
b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
index 6b2d9af..475bf77 100644
--- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
+++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff
@@ -10,7 +10,7 @@ Signed-off-by: Julien Cristau jcris...@debian.org
 ---
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1360,7 +1360,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
+@@ -1356,7 +1356,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
  
  # SHA1 hashing
  AC_ARG_WITH([sha1],
@@ -19,7 +19,7 @@ Signed-off-by: Julien Cristau jcris...@debian.org
  [choose SHA1 implementation])])
  AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
  if test x$with_sha1 = x  test x$HAVE_SHA1_IN_LIBC = xyes; then
-@@ -1443,6 +1443,16 @@ if test x$with_sha1 = xlibcrypto; then
+@@ -1439,6 +1439,16 @@ if test x$with_sha1 = xlibcrypto; then
SHA1_CFLAGS=$OPENSSL_CFLAGS
fi
  fi
diff --git a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff 
b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
index cb86e77..b2d3167 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -10,7 +10,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
 
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -3084,6 +3084,7 @@ xf86_crtc_box_area(BoxPtr box)
+@@ -3133,6 +3133,7 @@ xf86_crtc_box_area(BoxPtr box)
  return (int) (box-x2 - box-x1) * (int) (box-y2 - box-y1);
  }
  
@@ -18,7 +18,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  /*
   * Return the crtc covering 'box'. If two crtcs cover a portion of
   * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
-@@ -3172,6 +3173,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
+@@ -3221,6 +3222,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
  
  return ret;
  }
@@ -28,7 +28,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
 --- a/hw/xfree86/modes/xf86Crtc.h
 +++ b/hw/xfree86/modes/xf86Crtc.h
-@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
+@@ -1037,6 +1037,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
  extern _X_EXPORT void
  xf86_cursors_fini (ScreenPtr screen);
  
@@ -36,7 +36,7 @@ Subject: [PATCH] xfree86: fix build with xv disabled
  /*
   * For overlay video, compute the relevant CRTC and
   * clip video to that.
-@@ -952,6 +953,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
+@@ -1055,6 +1056,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
RegionPtr   reg,
INT32   width,
INT32   height);
diff --git a/debian/patches/15-nouveau.diff b/debian/patches/15-nouveau.diff
index 77bbbc4..712c7ec 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -12,7 +12,7 @@ Also, don't treat DRI setup failure as an error for nouveau.
 
 --- a/glx/glxdri.c
 +++ b/glx/glxdri.c
-@@ -979,6 +979,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -978,6 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  const __DRIconfig **driConfigs;
  const __DRIextension **extensions;
  int i;
@@ -20,7 +20,7 @@ Also, don't treat DRI setup failure as an error for nouveau.
  
  if (!xf86LoaderCheckSymbol(DRIQueryDirectRenderingCapable) ||
!DRIQueryDirectRenderingCapable(pScreen, isCapable) ||
-@@ -1058,7

Re: xorg-server: Changes to 'debian-experimental'

2011-02-23 Thread Cyril Brulebois 
Hi,

Christopher Halse Rogers raof-gu...@alioth.debian.org (20/02/2011):
 +xorg-server (2:1.9.99.902-3) UNRELEASED; urgency=low
 +
 +  * debian/rules:
 +- Change --disable-builddocs configure flag to --disable-devel-docs to
 +  match upstream renaming.  Avoids the problem 16-oot-build.diff fixes.

sorry, I didn't see that commit before pushing my updated branches.
Investigating devel docs is on my todo, we want to have them enabled
and shipped; that's why I didn't remove or update the configure flag
yet, to make sure I notice it later when I have more time.

KiBi.


signature.asc
Description: Digital signature

xorg-server: Changes to 'debian-experimental'

2011-02-20 Thread Christopher Halse Rogers 
 debian/changelog |8 
 debian/rules |2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9fea699e75a694e85e37e0df2944262c69fa9ecd
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Mon Feb 21 10:29:55 2011 +1100

Fix --disable-builddocs configure flag

diff --git a/debian/changelog b/debian/changelog
index 0d5bd6f..cde7036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.9.99.902-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+- Change --disable-builddocs configure flag to --disable-devel-docs to
+  match upstream renaming.  Avoids the problem 16-oot-build.diff fixes.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 21 Feb 2011 
10:10:47 +1100
+
 xorg-server (2:1.9.99.902-2) experimental; urgency=low
 
   * Bump dependency on x11proto-randr-dev, needed since xorg-server.pc
diff --git a/debian/rules b/debian/rules
index 80ca5d5..eb3c542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ confflags += \
 --with-builderstring=$(SOURCE_NAME) $(SOURCE_VERSION) 
($(BUILDER)) \
 --with-xkb-path=/usr/share/X11/xkb \
 --with-xkb-output=/var/lib/xkb \
---disable-builddocs \
+--disable-devel-docs \
 --disable-install-libxf86config \
 --enable-mitshm \
 --enable-xres \


-- 
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/e1prijp-0003r0...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2011-02-19 Thread Cyril Brulebois 
 debian/README.source|   41 --
 debian/changelog|   42 ++
 debian/control  |4 
 debian/patches/20-update-gpu-pitch.diff |   27 +
 debian/patches/series   |1 
 debian/rules|   18 
 debian/xserver-xorg-core.postinst.in|   27 -
 debian/xserver-xorg-core.postrm |   14 
 debian/xserver-xorg-core.postrm.in  |   24 -
 debian/xserver-xorg-core.preinst.in |   21 -
 debian/xsfbs/repack.sh  |   32 -
 debian/xsfbs/xsfbs.mk   |  285 --
 debian/xsfbs/xsfbs.sh   |  622 
 13 files changed, 114 insertions(+), 1044 deletions(-)

New commits:
commit 771a6da6621b908439907f8f4445d37a39a8c76c
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 20 07:02:25 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index b7226b6..0d5bd6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.99.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.9.99.902-2) experimental; urgency=low
 
   * Bump dependency on x11proto-randr-dev, needed since xorg-server.pc
 pulls a newer randrproto version.
@@ -10,7 +10,7 @@ xorg-server (2:1.9.99.902-2) UNRELEASED; urgency=low
 - Don't bump the x11proto-kb-dev dependency (even etch had a
   sufficient version).
 
- -- Cyril Brulebois k...@debian.org  Sat, 19 Feb 2011 16:56:06 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 20 Feb 2011 07:02:20 +0100
 
 xorg-server (2:1.9.99.902-1) experimental; urgency=low
 

commit 11acc640ffa41a7afa0ae8b68b98b8193b2ee7d9
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 20 06:53:54 2011 +0100

Mention other occurrences of SDK_REQUIRED_MODULES in configure.ac

diff --git a/debian/README.source b/debian/README.source
index b0c17c6..f33e314 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -61,4 +61,6 @@ Updating xorg-server to a new upstream release
 * We have to keep track of the SDK_REQUIRED_MODULES variable in
   configure.ac. It is used to determine xorg-server.pc's dependencies
   so xserver-xorg-dev's dependencies have to be adjusted when this
-  variable changes.
+  variable changes. This variable is set to a list of modules, but is
+  updated a few times. It's probably a good idea to use:
+git grep SDK_REQUIRED_MODULES= -- configure.ac

commit cf1a3e48dbef08942ed9decff66ba5ecefeb4911
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 20 06:42:10 2011 +0100

Bump dependencies according to SDK_REQUIRED_MODULES.

diff --git a/debian/changelog b/debian/changelog
index b65e7c0..b7226b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ xorg-server (2:1.9.99.902-2) UNRELEASED; urgency=low
   * Merge from debian-unstable (picking packaging updates from 2:1.9.4-3).
   * Mention some basic checks to perform when updating to a new upstream
 release, in README.source: ABI bumps and SDK_REQUIRED_MODULES updates.
+  * Accordingly:
+- Bump the x11proto-xext-dev dependency.
+- Don't bump the x11proto-kb-dev dependency (even etch had a
+  sufficient version).
 
  -- Cyril Brulebois k...@debian.org  Sat, 19 Feb 2011 16:56:06 +0100
 
diff --git a/debian/control b/debian/control
index 5db4d9f..25568aa 100644
--- a/debian/control
+++ b/debian/control
@@ -151,7 +151,7 @@ Depends:
  libpixman-1-dev (= 0.15.20),
  x11proto-core-dev (= 7.0.17),
  x11proto-input-dev (= 1.9.99.902),
- x11proto-xext-dev (= 7.0.99.3),
+ x11proto-xext-dev (= 7.1.99),
  x11proto-video-dev,
  x11proto-randr-dev (= 1.3.99),
  x11proto-render-dev (= 2:0.11),

commit 2ec8c67c81e8fa1316a761dd75605f1cdb4b5759
Author: Cyril Brulebois k...@debian.org
Date:   Sun Feb 20 06:24:10 2011 +0100

Mention some basic checks to perform when updating to a new upstream 
release, in README.source: ABI bumps and SDK_REQUIRED_MODULES updates.

diff --git a/debian/README.source b/debian/README.source
index 5716df4..b0c17c6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,3 +47,18 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
+
+--
+Updating xorg-server to a new upstream release
+--
+
+* The abibumpcheck target helps us notice any ABI bump:
+  - A major ABI bump means drivers have to be rebuilt.
+  - A minor ABI bump means the version in serverminver has to be
+bumped.
+  Reference documentation about dependencies is available at:
+http://pkg-xorg.alioth.debian.org/reference/dependencies.html
+* We have to keep track of the SDK_REQUIRED_MODULES variable in
+  configure.ac. It is used to determine xorg-server.pc's dependencies
+  so xserver-xorg-dev's dependencies have to be adjusted

xorg-server: Changes to 'debian-experimental'

2011-01-31 Thread Cyril Brulebois 
 ChangeLog|  109 
 config/udev.c|2 
 configure.ac |4 
 debian/changelog |5 
 dix/getevents.c  |   18 
 hw/xquartz/bundle/Info.plist.cpp |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib  |  440 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib |  208 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib|  434 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  229 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib|  441 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib |  441 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib |  402 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib |  209 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib |  411 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib |  448 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib |  418 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib |  459 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib  |  198 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/ru.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib |  424 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib |  421 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings  |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib  | 7106 
--
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib  |  447 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/darwinEvents.c|3 
 hw/xquartz/quartz.c  |   24 
 mi/misprite.c|2 
 61 files changed, 7511 insertions(+), 5864 deletions(-)

New commits:
commit 82d9bcee205cb45455ed061030880c63bad71a3f
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jan 31 14:00:47 2011 +0100

Upload to experimental.

xorg-server: Changes to 'debian-experimental-1.10'

2011-01-30 Thread Christopher Halse Rogers 
New branch 'debian-experimental-1.10' available with the following commits:
commit e15f47bc19ef4fdbb94b5c4e030b020f99263d90
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Jan 19 10:30:26 2011 +1100

Mark as UNRELEASED, as it is ☺

commit 15f0605e125680323fac89305780600ed458
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Wed Jan 19 10:28:56 2011 +1100

Bump proto build-deps for new XRandR and XSync protocols


-- 
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/e1pjlhk-0006xk...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2011-01-29 Thread Cyril Brulebois 
 debian/changelog|5 +++--
 debian/xserver-xorg-core.bug.script |   23 +--
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c6f2b7e5b0f3983e2ed455d6ee2ce102c61d27be
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jan 29 11:51:38 2011 +0100

bug script: Check for /usr/X11R6 using ldd.

diff --git a/debian/changelog b/debian/changelog
index 8b702f5..bddb57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
 - Fix listing xorg.conf.d's contents. Previously, that was only done
   if xorg.conf existed.
 - Check for local libraries by running ldd on the server.
-- Warn about possible obsolete libraries by checking for /usr/X11R6's
-  existence.
+- Check for obsolete libraries in the same way (/usr/X11R6/lib might
+  still exist in some cases, and be referenced in /etc/ld.so.conf, so
+  using ldd is sufficient to find out, see #546836 for an example).
 
  -- Cyril Brulebois k...@debian.org  Fri, 28 Jan 2011 01:30:13 +0100
 
diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 32b7ba2..9d0f54c 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -7,8 +7,8 @@ SERVER_SYMLINK=$CONFIG_DIR/X
 XORGCONFIG=$CONFIG_DIR/xorg.conf
 XORGCONFIG_DIR=$CONFIG_DIR/xorg.conf.d
 CONFIG_AUX_DIR=/var/lib/x11
-OLD_LIBS=/usr/X11R6
-LOCAL_LIBS=/usr/local
+X11R6_LIBS=/usr/X11R6/lib
+LOCAL_LIBS=/usr/local/lib
 
 # Pretty echo, underline the specified string:
 pecho() {
@@ -39,20 +39,15 @@ echo
 if ldd $SERVER_BINARY | grep -qs $LOCAL_LIBS; then
pecho The server is using local libraries!
ldd $SERVER_BINARY | grep $LOCAL_LIBS
-else
-   echo No local libraries in sight.
+   echo
 fi
 
-echo
-
-if [ -d $OLD_LIBS ]; then
-   echo There might still be some libraries in obsolete $OLD_LIBS directory!
-else
-   echo No obsolete libraries in sight.
+if ldd $SERVER_BINARY | grep -qs $X11R6_LIBS; then
+   pecho The server is using obsolete libraries!
+   ldd $SERVER_BINARY | grep $X11R6_LIBS
+   echo
 fi
 
-echo
-
 if which lspci  /dev/null 21; then
 pecho VGA-compatible devices on PCI bus:
 LC_ALL=C lspci | grep 'VGA compatible controller:'

commit e9c8cdf69499a467e31c0f03d780f041170c600d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Jan 29 11:39:46 2011 +0100

bug script: Fix pecho() to also work if passed several parameters.

diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 1b2a5ce..32b7ba2 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -12,8 +12,8 @@ LOCAL_LIBS=/usr/local
 
 # Pretty echo, underline the specified string:
 pecho() {
-echo $1
-echo $1|sed 's/./-/g'
+echo $@
+echo $@|sed 's/./-/g'
 }
 
 exec 3


-- 
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/e1pj8rw-00036u...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2011-01-28 Thread Cyril Brulebois 
 debian/changelog|   17 
 debian/xserver-xorg-core.bug.script |  133 +++-
 2 files changed, 74 insertions(+), 76 deletions(-)

New commits:
commit 3c1dbdff7b6a542b07c2090cf2d56edba8cd81ef
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 28 02:44:54 2011 +0100

bug script: Detect /usr/local/lib and /usr/X11R6.

diff --git a/debian/changelog b/debian/changelog
index 0437a09..8b702f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
   making the output slightly more readable.
 - Fix listing xorg.conf.d's contents. Previously, that was only done
   if xorg.conf existed.
+- Check for local libraries by running ldd on the server.
+- Warn about possible obsolete libraries by checking for /usr/X11R6's
+  existence.
 
  -- Cyril Brulebois k...@debian.org  Fri, 28 Jan 2011 01:30:13 +0100
 
diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 1438a95..1b2a5ce 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -2,10 +2,13 @@
 
 PATH=/sbin:$PATH
 CONFIG_DIR=/etc/X11
+SERVER_BINARY=/usr/bin/Xorg
 SERVER_SYMLINK=$CONFIG_DIR/X
 XORGCONFIG=$CONFIG_DIR/xorg.conf
 XORGCONFIG_DIR=$CONFIG_DIR/xorg.conf.d
 CONFIG_AUX_DIR=/var/lib/x11
+OLD_LIBS=/usr/X11R6
+LOCAL_LIBS=/usr/local
 
 # Pretty echo, underline the specified string:
 pecho() {
@@ -33,6 +36,23 @@ fi
 
 echo
 
+if ldd $SERVER_BINARY | grep -qs $LOCAL_LIBS; then
+   pecho The server is using local libraries!
+   ldd $SERVER_BINARY | grep $LOCAL_LIBS
+else
+   echo No local libraries in sight.
+fi
+
+echo
+
+if [ -d $OLD_LIBS ]; then
+   echo There might still be some libraries in obsolete $OLD_LIBS directory!
+else
+   echo No obsolete libraries in sight.
+fi
+
+echo
+
 if which lspci  /dev/null 21; then
 pecho VGA-compatible devices on PCI bus:
 LC_ALL=C lspci | grep 'VGA compatible controller:'

commit 2eba00a7ed9b43e27cc60f69f4fd52f19989c753
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 28 02:09:35 2011 +0100

bug script: Fix listing xorg.conf.d's contents.

Previously, that was only done if xorg.conf existed.

diff --git a/debian/changelog b/debian/changelog
index 26aa692..0437a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
   all lines are newline-terminated anyway.
 - Also use a “pecho” (pretty echo) function to underline some strings,
   making the output slightly more readable.
+- Fix listing xorg.conf.d's contents. Previously, that was only done
+  if xorg.conf existed.
 
  -- Cyril Brulebois k...@debian.org  Fri, 28 Jan 2011 01:30:13 +0100
 
diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 71dfe57..1438a95 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -49,18 +49,21 @@ if [ -e $XORGCONFIG ]; then
 echo
 pecho Contents of $XORGCONFIG:
 iconv -c -t ascii $XORGCONFIG
-echo
-if [ -d $XORGCONFIG_DIR ]; then
-pecho Contents of $XORGCONFIG_DIR:
-ls -l $XORGCONFIG_DIR
-echo
-fi
 else
 echo $XORGCONFIG does not exist.
 fi
 
 echo
 
+if [ -d $XORGCONFIG_DIR ]; then
+pecho Contents of $XORGCONFIG_DIR:
+ls -l $XORGCONFIG_DIR
+else
+echo $XORGCONFIG_DIR does not exist.
+fi
+
+echo
+
 KERNEL_VERSION=/proc/version
 
 if [ -e $KERNEL_VERSION ]; then

commit 210e8468572db732737b5d3810c91405091ec57d
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jan 28 02:04:11 2011 +0100

bug script: Prettify, using a pretty echo function.

diff --git a/debian/changelog b/debian/changelog
index 9620f1d..26aa692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
   * Improve bug script:
 - Stop reporting about roster and checksum for config file and server
   symlink, they are no longer used.
+- Replace printf with echo everywhere, it's slightly more readable and
+  all lines are newline-terminated anyway.
+- Also use a “pecho” (pretty echo) function to underline some strings,
+  making the output slightly more readable.
 
  -- Cyril Brulebois k...@debian.org  Fri, 28 Jan 2011 01:30:13 +0100
 
diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 160d990..71dfe57 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -7,94 +7,101 @@ XORGCONFIG=$CONFIG_DIR/xorg.conf
 XORGCONFIG_DIR=$CONFIG_DIR/xorg.conf.d
 CONFIG_AUX_DIR=/var/lib/x11
 
+# Pretty echo, underline the specified string:
+pecho() {
+echo $1
+echo $1|sed 's/./-/g'
+}
+
 exec 3
 
 if [ -e $SERVER_SYMLINK ]; then
-printf X server symlink status:\n
+pecho X server symlink status:
 ls -dl $SERVER_SYMLINK
 ls -dl

Re: xorg-server: Changes to 'debian-experimental'

2011-01-28 Thread Julien Cristau 
On Fri, Jan 28, 2011 at 08:28:20 +, Cyril Brulebois wrote:

 diff --git a/debian/xserver-xorg-core.bug.script 
 b/debian/xserver-xorg-core.bug.script
 index 1438a95..1b2a5ce 100644
 --- a/debian/xserver-xorg-core.bug.script
 +++ b/debian/xserver-xorg-core.bug.script
 @@ -2,10 +2,13 @@
  
  PATH=/sbin:$PATH
  CONFIG_DIR=/etc/X11
 +SERVER_BINARY=/usr/bin/Xorg
  SERVER_SYMLINK=$CONFIG_DIR/X
  XORGCONFIG=$CONFIG_DIR/xorg.conf
  XORGCONFIG_DIR=$CONFIG_DIR/xorg.conf.d
  CONFIG_AUX_DIR=/var/lib/x11
 +OLD_LIBS=/usr/X11R6

/usr/X11R6/lib?

 +LOCAL_LIBS=/usr/local
  
  # Pretty echo, underline the specified string:
  pecho() {
 @@ -33,6 +36,23 @@ fi
  
  echo
  
 +if ldd $SERVER_BINARY | grep -qs $LOCAL_LIBS; then
 +   pecho The server is using local libraries!
 +   ldd $SERVER_BINARY | grep $LOCAL_LIBS
 +else
 +   echo No local libraries in sight.
 +fi
 +
 +echo
 +
 +if [ -d $OLD_LIBS ]; then
 +   echo There might still be some libraries in obsolete $OLD_LIBS 
 directory!
 +else
 +   echo No obsolete libraries in sight.
 +fi

not sure the else is needed.

 +
 +echo
 +
  if which lspci  /dev/null 21; then
  pecho VGA-compatible devices on PCI bus:
  LC_ALL=C lspci | grep 'VGA compatible controller:'
 
[...]
 diff --git a/debian/xserver-xorg-core.bug.script 
 b/debian/xserver-xorg-core.bug.script
 index 160d990..71dfe57 100644
 --- a/debian/xserver-xorg-core.bug.script
 +++ b/debian/xserver-xorg-core.bug.script
 @@ -7,94 +7,101 @@ XORGCONFIG=$CONFIG_DIR/xorg.conf
  XORGCONFIG_DIR=$CONFIG_DIR/xorg.conf.d
  CONFIG_AUX_DIR=/var/lib/x11
  
 +# Pretty echo, underline the specified string:
 +pecho() {
 +echo $1

echo $@?

 +echo $1|sed 's/./-/g'
 +}
 +


signature.asc
Description: Digital signature

Re: xorg-server: Changes to 'debian-experimental'

2011-01-28 Thread Cyril Brulebois 
Julien Cristau jcris...@debian.org (28/01/2011):
 On Fri, Jan 28, 2011 at 08:28:20 +, Cyril Brulebois wrote:
  +OLD_LIBS=/usr/X11R6
 
 /usr/X11R6/lib?

Yes for the libs aspect. But I figured there might be other stuff
there, so we might want to warn anyway.

  +if [ -d $OLD_LIBS ]; then
  +   echo There might still be some libraries in obsolete $OLD_LIBS 
  directory!
  +else
  +   echo No obsolete libraries in sight.
  +fi
 
 not sure the else is needed.

Could be dropped indeed.

  +# Pretty echo, underline the specified string:
  +pecho() {
  +echo $1
 
 echo $@?

I blame missing caffeine. Doesn't hurt too much since pecho is only
called on a single string at once, but that might hit later… Thanks.

KiBi.


signature.asc
Description: Digital signature

xorg-server: Changes to 'debian-experimental'

2011-01-08 Thread Cyril Brulebois 
 ChangeLog   |  334 
++
 Xext/sync.c |   35 -
 Xi/exevents.c   |6 
 configure.ac|4 
 debian/changelog|6 
 exa/exa_accel.c |2 
 exa/exa_mixed.c |2 
 exa/exa_unaccel.c   |2 
 hw/xfree86/dri2/dri2.c  |   11 
 hw/xfree86/modes/xf86EdidModes.c|7 
 hw/xfree86/modes/xf86Modes.c|   33 
 hw/xfree86/x86emu/ops.c |   63 +
 hw/xquartz/GL/Makefile.am   |2 
 hw/xquartz/Makefile.am  |2 
 hw/xquartz/X11Application.h |1 
 hw/xquartz/X11Application.m |2 
 hw/xquartz/X11Controller.h  |1 
 hw/xquartz/X11Controller.m  |4 
 hw/xquartz/bundle/Info.plist.cpp|4 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib   |  320 
++---
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/quartz.c |   11 
 hw/xquartz/quartz.h |1 
 hw/xquartz/quartzAudio.c|  329 
-
 hw/xquartz/quartzAudio.h|   37 -
 hw/xquartz/quartzKeyboard.c |1 
 hw/xquartz/quartzStartup.c  |4 
 include/protocol-versions.h |4 
 mi/mieq.c   |8 
 os/access.c |4 
 os/utils.c  |   16 
 randr/rrscreen.c|   12 
 render/animcur.c|8 
 test/input.c|   74 +-
 34 files changed, 801 insertions(+), 549 deletions(-)

New commits:
commit b6b7c8e382f71a9941ef2efe8c8951d571f01f63
Author: Cyril Brulebois k...@debian.org
Date:   Sun Jan 9 03:10:18 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 465c0e2..dbfe3de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.9.3.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.3.901-1) experimental; urgency=low
 
   * New upstream release (1.9.4 rc1).
 
- -- Cyril Brulebois k...@debian.org  Sun, 09 Jan 2011 03:06:41 +0100
+ -- Cyril Brulebois k...@debian.org  Sun, 09 Jan 2011 03:10:13 +0100
 
 xorg-server (2:1.9.2.902-1) experimental; urgency=low
 

commit 1f1da5e62c634fd6a4b169fc9c3e330b6e6b10a7
Author: Cyril Brulebois k...@debian.org
Date:   Sun Jan 9 03:07:14 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index c07bc14..25696b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,337 @@
+commit 6451a3ff949ff55c9dff7399d0babb6b98201e99
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Jan 7 15:40:25 2011 -0800
+
+xorg-server 1.9.3.901 (1.9.4 RC1)
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit c11f9bfc081423a7f15d72c36f2f0d6518083591
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Jan 7 15:39:14 2011 -0800
+
+XQuartz: Update copyright dates in bundle's plist
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 3d12e6d25a79c1d78964df723731d2510bb932f8
+Author: Zhao Yakui yakui.z...@intel.com
+Date:   Tue Jan 4 14:08:16 2011 -0500
+
+edid: Fix incorrect timings for VIC61
+
+Reviewed-by: Adam Jackson a...@redhat.com
+Signed-off-by: Anssi Hannula anssi.hann...@iki.fi
+Signed-off-by: Zhao Yakui yakui.z...@intel.com
+(cherry picked from commit 86ca434a1ab766c1519ee7146b48dbfead843524)
+
+commit 9213c2525a2be6f8bf1412f1c6001a7bc6ce4538
+Author: Adam Jackson a...@redhat.com
+Date:   Fri Dec 10 14:24:02 2010 -0500
+
+x86emu: Fix more mis-decoding of the data prefix
+
+cc2c73ddcb4370a7c3ad439cda4da825156c26c9's three-cent titanium tax
+doesn't go too far enough.  Fix the rest of the call and jmp
+instructions to handle the data prefix correctly.
+
+Reference: Intel 64 and IA-32 Architectures Software Developer's

xorg-server: Changes to 'debian-experimental'

2010-12-04 Thread Cyril Brulebois 
 ChangeLog   |  838 
++
 Xext/panoramiXprocs.c   |2 
 Xi/extinit.c|4 
 Xi/listdev.c|4 
 composite/compalloc.c   |2 
 composite/compwindow.c  |4 
 configure.ac|   16 
 damageext/damageext.c   |4 
 debian/changelog|7 
 debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff   |   22 
 debian/patches/series   |1 
 dix/Makefile.am |1 
 dix/eventconvert.c  |9 
 dix/getevents.c |   14 
 dix/inpututils.c|   24 
 dix/window.c|6 
 doc/xml/dtrace/Makefile.am  |2 
 exa/exa.c   |3 
 glx/glxdri.c|4 
 hw/dmx/glxProxy/glxcmds.c   |6 
 hw/dmx/glxProxy/glxcmdsswap.c   |2 
 hw/kdrive/ephyr/ephyrdriext.c   |2 
 hw/kdrive/linux/tslib.c |   15 
 hw/xfree86/common/xf86DGA.c |4 
 hw/xfree86/common/xf86Mode.c|   64 
 hw/xfree86/common/xf86Xinput.c  |2 
 hw/xfree86/ddc/ddc.c|4 
 hw/xfree86/dixmods/extmod/xf86dga2.c|   46 
 hw/xfree86/dri2/dri2.c  |   11 
 hw/xfree86/modes/xf86Cursors.c  |   62 
 hw/xfree86/modes/xf86EdidModes.c|4 
 hw/xfree86/modes/xf86RandR12.c  |   10 
 hw/xfree86/modes/xf86Rotate.c   |2 
 hw/xfree86/os-support/hurd/hurd_mmap.c  |   12 
 hw/xfree86/os-support/hurd/hurd_video.c |   27 
 hw/xfree86/os-support/linux/lnx_video.c |2 
 hw/xfree86/x86emu/ops.c |   20 
 hw/xquartz/bundle/Makefile.am   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib   |   52 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib|   44 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib|   21 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib|   23 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib|   97 -
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib|   42 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib |2 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/mk_bundke.sh  |3 
 hw/xquartz/mach-startup/bundle-main.c   |2 
 hw/xquartz/quartz.c |   37 
 hw/xquartz/quartzRandR.c|   23 
 hw/xquartz/xpr/dri.c|  112 -
 include/eventstr.h  |2 
 include/inputstr.h

xorg-server: Changes to 'debian-experimental'

2010-11-09 Thread Cyril Brulebois 
 ChangeLog |   28 
 configure.ac  |6 +++---
 debian/changelog  |6 ++
 miext/damage/damage.c |6 +-
 4 files changed, 42 insertions(+), 4 deletions(-)

New commits:
commit a30c7d3c1a52f2a4b6889dc3b361136822504420
Author: Cyril Brulebois k...@debian.org
Date:   Wed Nov 10 00:10:24 2010 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index d4ed4b3..bb8b61a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.9.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.2-1) experimental; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 23:26:17 +0100
+ -- Cyril Brulebois k...@debian.org  Wed, 10 Nov 2010 00:10:19 +0100
 
 xorg-server (2:1.9.0.902-1) experimental; urgency=low
 

commit 3caa15e1eaed980fa803039a5ced16347dbc1382
Author: Cyril Brulebois k...@debian.org
Date:   Mon Nov 1 23:26:29 2010 +0100

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 6aeeb43..3a79c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+commit e3769c20d5f656f76e2c475a722db97c58089260
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sat Oct 30 19:49:42 2010 -0700
+
+Bump version to 1.9.2
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit e0ab016d85f828a78cb53ee9bcb171535de6032e
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Sat Oct 30 19:48:22 2010 -0700
+
+Revert rootless: Remove ROOTLESS_WORKAROUND
+
+Christof Wolf has reported a regression that seems to be caused by
+this change, so reverting the change in the 1.9 branch.  We'll
+investigate a proper fix in master for 1.10.
+
+This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
+
+commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Oct 22 20:18:38 2010 -0700
+
+Bump version to 1.9.1
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
 commit 4dd316f25261707620cd4c52e2987b93627ff260
 Author: Jeremy Huddleston jerem...@apple.com
 Date:   Fri Oct 15 11:08:42 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 015d768..d4ed4b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.9.2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Cyril Brulebois k...@debian.org  Mon, 01 Nov 2010 23:26:17 +0100
+
 xorg-server (2:1.9.0.902-1) experimental; urgency=low
 
   * New upstream release (1.9.1 rc2).

commit e3769c20d5f656f76e2c475a722db97c58089260
Author: Jeremy Huddleston jerem...@apple.com
Date:   Sat Oct 30 19:49:42 2010 -0700

Bump version to 1.9.2

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index b1f6282..77cad54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-10-22
+AC_INIT([xorg-server], 1.9.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-10-30
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit e0ab016d85f828a78cb53ee9bcb171535de6032e
Author: Jeremy Huddleston jerem...@apple.com
Date:   Sat Oct 30 19:48:22 2010 -0700

Revert rootless: Remove ROOTLESS_WORKAROUND

Christof Wolf has reported a regression that seems to be caused by
this change, so reverting the change in the 1.9 branch.  We'll
investigate a proper fix in master for 1.10.

This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.

diff --git a/configure.ac b/configure.ac
index a3843dc..b1f6282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ if test x$XQUARTZ = xyes; then
 
AC_CHECK_LIB([Xplugin],[xp_init],[:])
 
-   CFLAGS=${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA
+   CFLAGS=${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA 
-DNO_ALLOCA
 
PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
 
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index e0e96f2..1cf0513 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable)
ScreenPtr   pScreen = pDrawable-pScreen;
 
pPixmap = 0;
-   if (pScreen-GetWindowPixmap)
+   if (pScreen-GetWindowPixmap
+#ifdef ROOTLESS_WORKAROUND
+((WindowPtr)pDrawable)-viewable
+#endif
+   )
pPixmap = (*pScreen-GetWindowPixmap) ((WindowPtr)pDrawable);
 
if (!pPixmap)

commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Oct 22 20:18:38 2010 -0700

Bump version to 1.9.1

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff

xorg-server: Changes to 'debian-experimental'

2010-10-16 Thread Cyril Brulebois 
 ChangeLog   |   48 
 configure.ac|4 -
 debian/changelog|7 ++
 debian/patches/20-Revert-for-bug-30267.diff |   28 ---
 debian/patches/series   |1 
 dix/eventconvert.c  |9 ---
 hw/xfree86/vbe/vbe.c|   66 +---
 mi/mieq.c   |4 +
 8 files changed, 64 insertions(+), 103 deletions(-)

New commits:
commit 95d0569810a71a0a943201bd78303cc8c50cd941
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 15:24:54 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 27230da..015d768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.9.0.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.0.902-1) experimental; urgency=low
 
   * New upstream release (1.9.1 rc2).
   * Drop 20-Revert-for-bug-30267.diff, merged upstream.
 
- -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 15:21:36 +0200
+ -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 15:24:48 +0200
 
 xorg-server (2:1.9.0.901-1) experimental; urgency=low
 

commit 9792b88b384dc53f4aca5bcf9706d57792d38703
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 15:23:10 2010 +0200

Drop 20-Revert-for-bug-30267.diff, merged upstream.

diff --git a/debian/changelog b/debian/changelog
index 22cef8e..27230da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xorg-server (2:1.9.0.902-1) UNRELEASED; urgency=low
 
   * New upstream release (1.9.1 rc2).
+  * Drop 20-Revert-for-bug-30267.diff, merged upstream.
 
  -- Cyril Brulebois k...@debian.org  Sat, 16 Oct 2010 15:21:36 +0200
 
diff --git a/debian/patches/20-Revert-for-bug-30267.diff 
b/debian/patches/20-Revert-for-bug-30267.diff
deleted file mode 100644
index f0a5137..000
--- a/debian/patches/20-Revert-for-bug-30267.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit e97d9ed9a9d71abe285f9f91cfce9fe0f0f72298
-Author: Cyril Brulebois k...@debian.org
-Date:   Mon Oct 11 00:47:26 2010 +0200
-
-Revert dix: don't create core motion events for non-x/y valuators.
-
-This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
-
-diff --git a/dix/eventconvert.c b/dix/eventconvert.c
-index 0f747c1..4e3de0b 100644
 a/dix/eventconvert.c
-+++ b/dix/eventconvert.c
-@@ -102,15 +102,6 @@ EventToCore(InternalEvent *event, xEvent *core)
- switch(event-any.type)
- {
- case ET_Motion:
--{
--DeviceEvent *e = event-device_event;
--/* Don't create core motion event if neither x nor y are
-- * present */
--if (!BitIsOn(e-valuators.mask, 0) 
--!BitIsOn(e-valuators.mask, 1))
--return BadMatch;
--}
--/* fallthrough */
- case ET_ButtonPress:
- case ET_ButtonRelease:
- case ET_KeyPress:
diff --git a/debian/patches/series b/debian/patches/series
index 3f8b683..adf3c9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 #13_debian_add_xkbpath_env_variable.diff
 15-nouveau.diff
 16-xaa-fbcomposite-fix-negative-size.diff
-20-Revert-for-bug-30267.diff

commit 91800fd8caa937336c4a2c4b7de3ea1d98e19dc3
Author: Cyril Brulebois k...@debian.org
Date:   Sat Oct 16 15:22:19 2010 +0200

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index 7dca8b7..6aeeb43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+commit 4dd316f25261707620cd4c52e2987b93627ff260
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Fri Oct 15 11:08:42 2010 -0700
+
+Bump version to 1.9.0.902 (1.9.1 rc2)
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 712853fbcbc644575d791fa48fbd5757cd850f1d
+Author: Jon TURNEY jon.tur...@dronecode.org.uk
+Date:   Wed Oct 13 17:34:31 2010 +0100
+
+event_size is currently never assigned to in mieqProcessInputEvents().
+
+event_size is never assigned to in mieqProcessInputEvents(), so realloc()
+is always called.  This is benign, but I'm guessing not intended.
+
+Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
+Reviewed-by: Keith Packard kei...@keithp.com
+Signed-off-by: Keith Packard kei...@keithp.com
+(cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)
+
+commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
+Author: Adam Jackson a...@redhat.com
+Date:   Tue Oct 5 11:24:28 2010 -0400
+
+vbe: Fix copying the mode info block
+
+Just use memcpy, seriously.
+
+Reviewed-by: Rémi Cardona r...@gentoo.org
+Signed-off-by: Adam Jackson a...@redhat.com
+Signed-off-by: Keith Packard kei...@keithp.com
+(cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)
+
+commit e5b19f14eac609e3c315e14e20ca1935de8de0e3
+Author: Jeremy Huddleston

xorg-server: Changes to 'debian-experimental'

2010-10-12 Thread Cyril Brulebois 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cc75a71023b6aea28cb1ef3d19116af320f4ff48
Author: Cyril Brulebois k...@debian.org
Date:   Tue Oct 12 22:13:32 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 965e0f9..7c01823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.0.901-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.0.901-1) experimental; urgency=low
 
   [ Christopher James Halse Rogers ]
   * New upstream release (1.9.0):
@@ -16,7 +16,7 @@ xorg-server (2:1.9.0.901-1) UNRELEASED; urgency=low
   * Remove --disable-multibuffer from configure flags, that extension is
 gone for real now.
 
- -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 23 Aug 2010 
12:28:45 +1000
+ -- Cyril Brulebois k...@debian.org  Tue, 12 Oct 2010 22:13:20 +0200
 
 xorg-server (2:1.8.99.905-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
Archive: http://lists.debian.org/e1p5me2-000773...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2010-10-11 Thread Cyril Brulebois 
 ChangeLog| 1220 
+
 config/udev.c|   26 
 configure.ac |6 
 debian/changelog |   16 
 debian/control   |2 
 debian/patches/20-Revert-for-bug-30267.diff  |   28 
 debian/patches/series|1 
 debian/rules |1 
 dix/devices.c|4 
 dix/eventconvert.c   |9 
 dix/privates.c   |1 
 dix/property.c   |1 
 dix/selection.c  |3 
 glx/glxext.c |   11 
 hw/xfree86/common/compiler.h |  416 +
 hw/xfree86/common/xf86DGA.c  |2 
 hw/xfree86/common/xf86Helper.c   |3 
 hw/xfree86/common/xf86Xinput.c   |1 
 hw/xfree86/doc/man/Xorg.man.pre  |   10 
 hw/xfree86/modes/xf86RandR12.c   |3 
 hw/xfree86/os-support/linux/lnx_init.c   |5 
 hw/xfree86/parser/scan.c |2 
 hw/xfree86/vgahw/vgaHW.h |2 
 hw/xquartz/Makefile.am   |2 
 hw/xquartz/X11Application.h  |3 
 hw/xquartz/X11Application.m  |   44 
 hw/xquartz/X11Controller.m   |   42 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib  | 1591 
++
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/French.lproj/Localizable.strings |binary
 hw/xquartz/bundle/Resources/French.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib | 1720 
++-
 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib | 1598 
++
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings|binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib| 1543 
++
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   | 1618 
++
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings|binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib| 1586 
++
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings   |binary
 hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 2413 
--
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib | 1530 
++
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 1678 
++
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib | 1544 
++
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist|4

xorg-server: Changes to 'debian-experimental'

2010-07-19 Thread Christopher Halse Rogers 
 debian/changelog |7 +++
 debian/patches/17-fix-DRI2-segfault-when-clientGone.diff |   33 ---
 debian/patches/series|1 
 3 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit be9a61fd2ab1b9ac0c0b8cea1719bf0d929c733c
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date:   Thu Jul 15 15:37:44 2010 +1000

Drop DRI2 segfault fix patch.

This is fixed upstream in commit 660f6ab5

diff --git a/debian/changelog b/debian/changelog
index 2b67be9..fdca61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.8.99.905-2) UNRELEASED; urgency=low
+
+  * Drop 17-fix-DRI2-segfault-when-clientGone.diff: fixed upstream in more
+generality.
+
+ -- Christopher James Halse Rogers r...@ubuntu.com  Mon, 19 Jul 2010 
12:48:10 +0200
+
 xorg-server (2:1.8.99.905-1) experimental; urgency=low
 
   * Drop recommends on xbase-clients.
diff --git a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff 
b/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
deleted file mode 100644
index 2e75ca2..000
--- a/debian/patches/17-fix-DRI2-segfault-when-clientGone.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From c1c59e7d5f0c6f0eea88657f892175166679da4f Mon Sep 17 00:00:00 2001
-From: Chris Wilson ch...@chris-wilson.co.uk
-Date: Sat, 15 May 2010 19:24:30 +0100
-Subject: [PATCH] dri2: Only send the swap event if the client hasn't gone 
fishing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
-  Bug 27497 - xorg crashes after update to 1.8.0
-  https://bugs.freedesktop.org/show_bug.cgi?id=27497
-
-Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
-Cc: Kristian Høgsberg k...@bitplanet.net

- hw/xfree86/dri2/dri2ext.c |3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-Index: xorg-server/hw/xfree86/dri2/dri2ext.c
-===
 xorg-server.orig/hw/xfree86/dri2/dri2ext.c
-+++ xorg-server/hw/xfree86/dri2/dri2ext.c
-@@ -362,6 +362,9 @@
- xDRI2BufferSwapComplete event;
- DrawablePtr pDrawable = data;
- 
-+if (client-clientGone)
-+  return;
-+
- event.type = DRI2EventBase + DRI2_BufferSwapComplete;
- event.event_type = type;
- event.drawable = pDrawable-id;
diff --git a/debian/patches/series b/debian/patches/series
index f850a70..adf3c9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 #13_debian_add_xkbpath_env_variable.diff
 15-nouveau.diff
 16-xaa-fbcomposite-fix-negative-size.diff
-17-fix-DRI2-segfault-when-clientGone.diff


-- 
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/e1oanyy-rc...@alioth.debian.org

xorg-server: Changes to 'debian-experimental'

2010-07-17 Thread Julien Cristau 
 ChangeLog  |  460 +
 Xi/exevents.c  |   27 --
 configure.ac   |4 
 dbe/midbe.c|6 
 dbe/midbestr.h |   16 -
 debian/changelog   |5 
 dix/devices.c  |2 
 dix/events.c   |   12 
 dix/getevents.c|   49 +++
 exa/exa.c  |   23 +
 exa/exa_classic.c  |4 
 exa/exa_driver.c   |4 
 exa/exa_mixed.c|4 
 exa/exa_priv.h |3 
 glx/glxdri.c   |   17 +
 glx/glxdri2.c  |   17 +
 hw/dmx/input/atKeynames.h  |2 
 hw/kdrive/ephyr/ephyr.c|8 
 hw/xfree86/common/xf86Events.c |4 
 hw/xfree86/common/xf86VGAarbiter.c |   10 
 hw/xfree86/common/xf86cmap.c   |8 
 hw/xfree86/common/xf86xv.c |8 
 hw/xfree86/dri2/dri2.c |   19 +
 hw/xfree86/ramdac/xf86Cursor.c |   12 
 hw/xfree86/shadowfb/shadow.c   |   11 
 hw/xfree86/xaa/xaaInit.c   |   12 
 hw/xnest/Keyboard.c|8 
 hw/xquartz/bundle/Info.plist.cpp   |4 
 hw/xquartz/quartz.c|4 
 hw/xquartz/quartzCocoa.m   |   11 
 hw/xquartz/quartzCommon.h  |   15 -
 hw/xquartz/xpr/xprCursor.c |6 
 hw/xwin/winkeynames.h  |1 
 include/input.h|9 
 include/privates.h |2 
 include/protocol-versions.h|2 
 include/xkbsrv.h   |6 
 mi/mipointer.c |   40 +--
 mi/mipointer.h |5 
 mi/miscrinit.c |2 
 xkb/xkbAccessX.c   |   39 ---
 xkb/xkbActions.c   |   19 -
 42 files changed, 721 insertions(+), 199 deletions(-)

New commits:
commit 549baf9b901ec93cc9f6f4bb5b9574424022eb0e
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 17 10:26:03 2010 +0100

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 5a5e00f..e62568b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,335 @@
+commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
+Author: Keith Packard kei...@keithp.com
+Date:   Wed Jul 14 12:57:29 2010 -0700
+
+Bump to version 1.8.99.905 (1.9 RC5)
+
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit 0fc02c0bf92f694889589e3648acc08d4684de37
+Merge: 0540c46 9d8ec71
+Author: Keith Packard kei...@keithp.com
+Date:   Tue Jul 13 15:05:36 2010 -0700
+
+Merge remote branch 'jeremyhu/master'
+
+commit 0540c46066f938ad5611c56081cfcd8457a9b718
+Author: Michel Dänzer daen...@vmware.com
+Date:   Tue Jul 13 14:56:53 2010 +0200
+
+EXA: Finish access to pixmap if it's prepared at destruction time.
+
+Previously we assumed every pixmap destroyed during a software fallback was
+also created during a software fallback and had access prepared, but that's
+not always true.
+
+Fixes a server abort
+Reported-by: 邓逸昕 bupt.dengyi...@gmail.com
+
+Signed-off-by: Michel Dänzer daen...@vmware.com
+Acked-by: Maarten Maathuis madman2...@gmail.com
+Signed-off-by: Keith Packard kei...@keithp.com
+
+commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
+Author: Keith Packard kei...@keithp.com
+Date:   Mon Jul 12 16:01:34 2010 -0700
+
+Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
+
+Because some EnterVT code needs to remove it self from the
+call chain, we need to fix all of the wrappers to correctly
+unwrap/rewrap during the call chain. This is a follow-on to the fix
+for bug 27114 in commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e.
+
+Signed-off-by: Keith Packard kei...@keithp.com
+Tested-by: Jesse Barnes jesse.bar...@intel.com
+Reviewed-by: Daniel Stone dan...@fooishbar.org
+Reviewed-by: Tiago Vignatti tiago.vigna...@nokia.com
+
+commit 9d8ec712a67ce71ea7408f0626cda7e0fa7c3bac
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Jul 13 08:56:36 2010 -0700
+
+XQuartz: Bump bundle version to 2.6.0 for xorg-server-1.9.0 and X11R7.6
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit b2b9c458a46e9a41c3c76ffe83a2b580a41d0e90
+Author: Jan Hauffa hau...@in.tum.de
+Date:   Wed Jun 16 09:25:41 2010 -0700
+
+XQuartz: Remove some dead code.
+
+Signed-off-by: Jan Hauffa hau...@in.tum.de
+Reviewed-by: Jeremy Huddleston jerem...@apple.com
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 648d189548530fa23d97d1e8737f89d297f1c443
+Author: Jeremy Huddleston jerem...@apple.com
+Date:   Tue Jul 13 08:25:27 2010 -0700
+
+XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on 
some configs
+
+Signed-off-by: Jeremy Huddleston jerem...@apple.com
+
+commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f
+Author: Jesse Barnes

  1   2   3   >