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 <[email protected]> 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 <[email protected]> Thu, 11 Dec 2014 15:49:13 +0100 + -- Julien Cristau <[email protected]> Sun, 03 May 2015 18:00:32 +0200 xorg-server (2:1.16.4-1) unstable; urgency=high commit 7ff2d28ad35f50ea6921bfca8c414c3dc5911443 Author: Julien Cristau <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Thu, 11 Dec 2014 15:49:13 +0100 xorg-server (2:1.16.4-1) unstable; urgency=high diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index fc49d6a..4a79cf8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Build-Depends: - debhelper (>= 7), + debhelper (>= 9), dpkg-dev (>= 1.16.1), quilt, lsb-release, diff --git a/debian/rules b/debian/rules index 56f2030..080fd7e 100755 --- a/debian/rules +++ b/debian/rules @@ -211,6 +211,7 @@ $(STAMP_DIR)/configure-%: $(STAMP_DIR)/autoreconf cd build-$* && \ ../configure \ --prefix=/usr \ + --libdir=\$${exec_prefix}/lib \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --sysconfdir=/etc \ commit 76dda33cba6c565299f10abb8462289fadabdf11 Author: Julien Cristau <[email protected]> Date: Sun May 3 00:02:03 2015 +0200 Fixup build dependencies and configure options diff --git a/debian/control b/debian/control index dc32e2b..fc49d6a 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Build-Depends: libselinux1-dev (>= 2.0.80) [linux-any], libaudit-dev [linux-any], x11proto-xf86dri-dev (>= 2.1.0), - libdrm-dev (>= 2.4.3) [!hurd-i386], + libdrm-dev (>= 2.4.46) [!hurd-i386], x11proto-gl-dev (>= 1.4.17), libgl1-mesa-dev (>= 9.2), libxmuu-dev (>= 1:0.99.1), @@ -77,14 +77,16 @@ Build-Depends: # XCB bits for Xephyr libxcb1-dev, libxcb-shape0-dev, + libxcb-render0-dev, + libxcb-render-util0-dev, libxcb-util0-dev, libxcb-image0-dev, libxcb-icccm4-dev, libxcb-shm0-dev, libxcb-keysyms1-dev, + libxcb-randr0-dev, libxcb-xv0-dev, libxcb-glx0-dev, - libxcb-render-util0-dev, libxcb-xf86dri0-dev (>= 1.6), # unit tests xkb-data, diff --git a/debian/rules b/debian/rules index ffae283..56f2030 100755 --- a/debian/rules +++ b/debian/rules @@ -53,9 +53,11 @@ endif ifeq ($(DEB_HOST_ARCH_OS), hurd) dri = --disable-dri --disable-dri2 + xshmfence = --disable-xshmfence else dri = --enable-dri --enable-dri2 dri += --enable-glamor + xshmfence = --enable-xshmfence endif ifeq ($(DEB_HOST_ARCH_OS), linux) @@ -114,6 +116,7 @@ confflags += \ --enable-dbe \ --disable-xf86bigfont \ --enable-dpms \ + $(xshmfence) \ $(config_backend) \ --enable-xorg \ --disable-linux-acpi \ @@ -128,7 +131,6 @@ 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-glx-tls \ - --enable-registry \ --enable-composite \ --enable-record \ --enable-xv \ @@ -160,7 +162,6 @@ confflags_udeb = \ --with-default-font-path="built-ins" \ --disable-aiglx \ --disable-glx-tls \ - --disable-registry \ --disable-composite \ --disable-record \ --disable-xv \ commit 1d49e432e7f0837b0879799860803b74afd1e802 Author: Julien Cristau <[email protected]> Date: Sat May 2 23:51:31 2015 +0200 Fix changelog and control diff --git a/debian/changelog b/debian/changelog index ef18e34..6be49f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium - * New upstream release candidate 17~rc1. + * New upstream release 1.17.1. * Enable the modesetting driver from xorg-server. * Drop upstreamed patches: - 09_Xserver-man-iglx.diff diff --git a/debian/control b/debian/control index 5ec4a5c..dc32e2b 100644 --- a/debian/control +++ b/debian/control @@ -138,14 +138,15 @@ Breaks: xserver-xorg-video-vga (<= 1:4.1.0-8), libgl1-mesa-dri (<< 7.10.2-4), libgl1-mesa-dri-experimental (<< 7.10.2-4), - xserver-xorg-video-modesetting, Replaces: xserver-xorg-video-modesetting, Conflicts: xserver-xorg-input-evtouch, + xserver-xorg-video-modesetting, Provides: ${videoabi}, ${inputabi}, + xserver-xorg-video-modesetting, Description: Xorg X server - core server The Xorg X server is an X server for several architectures and operating systems, which is derived from the XFree86 4.x series of X servers. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
