xorg-server: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor:
commit 2a006327f17f448461aecc715fabef1b0d9caa1f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 10:41:02 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index dfb8d61..bee9515 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.4-1) unstable; urgency=low
* The “squeeze is released, target sid!” upload.
* New upstream release.
@@ -43,7 +43,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David & Steve & Brice!
* Bump Standards-Version to 3.9.1 (no changes needed).
- -- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Feb 2011 10:40:55 +0100
xorg-server (2:1.9.3.902-1) experimental; urgency=low
commit 72fa4c902da7083473f2f6adb2195c474545586f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 10:40:48 2011 +0100
Bump debhelper build-dep for dh_prep.
diff --git a/debian/changelog b/debian/changelog
index f725594..dfb8d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
call, to avoid non-stripped binaries if the build is resumed.
* Use “dh_prep” instead of deprecated “dh_clean -k”.
+ * Bump debhelper build-dep accordingly.
* Introduce dh_xsf_substvars, to be used in driver packages to set
appropriate substitution variables for Depends and Provides, before
calling dh_gencontrol. Ship it in xserver-xorg-dev.
diff --git a/debian/control b/debian/control
index 022e782..53d321d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
# x11proto-print-dev and libfreetype6-dev are for Xprint
# everything on is for the DMX and Xnest servers.
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 7),
quilt,
lsb-release,
pkg-config,
commit e780c528d9fac6599b538de865d9cd9adbba49e3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 10:38:46 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 9d338e0..f725594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Cherry-pick, thanks to Samuel Thibault (Closes: #590715):
- xserver: enable TLS even if AIGLX is not enabled
* Update Uploaders list. Thanks, David & Steve & Brice!
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/control b/debian/control
index b941013..022e782 100644
--- a/debian/control
+++ b/debian/control
@@ -78,7 +78,7 @@ Build-Depends:
libglib2.0-dev,
xkb-data,
x11-xkb-utils,
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
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
commit 6ff0cbf4155358200c8e3ee311709aa02380b020
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 07:28:42 2011 +0100
Update Uploaders list. Thanks, David & Steve & Brice!
diff --git a/debian/changelog b/debian/changelog
index c99a35d..9d338e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
(Closes: #585697, #605764).
* Cherry-pick, thanks to Samuel Thibault (Closes: #590715):
- xserver: enable TLS even if AIGLX is not enabled
+ * Update Uploaders list. Thanks, David & Steve & Brice!
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/control b/debian/control
index 5e5d922..b941013 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg-server
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@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 ca355d8640355e1894818c666b575ace31f1d14a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 07:26:47 2011 +0100
Fix case.
diff --git a/debian/changelog b/debian/changelog
index 7de52d4..c99a35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
- * The “Squeeze is released, target sid!” upload.
+ * The “squeeze is released, target sid!” upload.
* New upstream release.
* Unfuzzy all patches.
* Get rid of long obsolete NEWS file.
commit d52858a8339766d95e83ff91802e19275fdb802b
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:28:39 2011 +0100
Unfuzzy all patches.
diff --git a/debian/changelog b/debian/changelog
index 3d9f980..7de52d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* The “Squeeze is released, target sid!” upload.
* New upstream release.
+ * Unfuzzy all patches.
* Get rid of long obsolete NEWS file.
* Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
call, to avoid non-stripped binaries if the build is resumed.
diff --git a/debian/patches/001_fedora_extramodes.patch b/debian/patches/001_fedora_extramodes.patch
index 30743b8..77005b2 100644
--- a/debian/patches/001_fedora_extramodes.patch
+++ b/debian/patches/001_fedora_extramodes.patch
@@ -3,10 +3,8 @@ Date: Sun, 28 Oct 2007 09:37:52 +0100
Subject: [PATCH] Fedora extra modes list
---
-Index: xorg-server/hw/xfree86/common/extramodes
-===================================================================
---- xorg-server.orig/hw/xfree86/common/extramodes
-+++ xorg-server/hw/xfree86/common/extramodes
+--- a/hw/xfree86/common/extramodes
++++ b/hw/xfree86/common/extramodes
@@ -3,16 +3,75 @@
//
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
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 263c9ed..6b2d9af 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 <kibi@debian.org>
[jcristau: forward-ported from 1.7 to 1.8]
Signed-off-by: Julien Cristau <jcristau@debian.org>
---
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac 2010-07-05 16:58:09.868394001 +1000
-+++ xorg-server/configure.ac 2010-07-05 16:59:02.628394001 +1000
-@@ -1358,7 +1358,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1360,7 +1360,7 @@ CORE_INCS='-I$(top_srcdir)/include -I$(t
# 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
-@@ -1441,6 +1441,16 @@
+@@ -1443,6 +1443,16 @@ if test "x$with_sha1" = xlibcrypto; then
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 2010-07-05 16:58:09.888394001 +1000
-+++ xorg-server/include/dix-config.h.in 2010-07-05 16:59:02.628394001 +1000
+--- a/include/dix-config.h.in
++++ b/include/dix-config.h.in
@@ -175,6 +175,9 @@
/* Define to use libsha1 for SHA1 */
#undef HAVE_SHA1_IN_LIBSHA1
@@ -52,11 +48,9 @@ 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.c 2010-07-05 16:58:09.898394001 +1000
-+++ xorg-server/os/xsha1.c 2010-07-05 16:59:02.628394001 +1000
-@@ -127,6 +127,31 @@
+--- a/os/xsha1.c
++++ b/os/xsha1.c
+@@ -127,6 +127,31 @@ int x_sha1_final(void *ctx, unsigned cha
return 1;
}
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 d240b66..cb86e77 100644
--- a/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
+++ b/debian/patches/07-xfree86-fix-build-with-xv-disabled.diff
@@ -8,11 +8,9 @@ Subject: [PATCH] xfree86: fix build with xv disabled
hw/xfree86/modes/xf86Crtc.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
-Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
-===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:58:09.758394001 +1000
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.c 2010-07-05 16:59:15.268394002 +1000
-@@ -3084,6 +3084,7 @@
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -3084,6 +3084,7 @@ xf86_crtc_box_area(BoxPtr box)
return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
}
@@ -20,7 +18,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
/*
* 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 @@
+@@ -3172,6 +3173,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr
return ret;
}
@@ -28,11 +26,9 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.c
xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
-Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
-===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:58:09.778394001 +1000
-+++ xorg-server/hw/xfree86/modes/xf86Crtc.h 2010-07-05 16:59:15.268394002 +1000
-@@ -934,6 +934,7 @@
+--- a/hw/xfree86/modes/xf86Crtc.h
++++ b/hw/xfree86/modes/xf86Crtc.h
+@@ -934,6 +934,7 @@ xf86_hide_cursors (ScrnInfoPtr scrn);
extern _X_EXPORT void
xf86_cursors_fini (ScreenPtr screen);
@@ -40,7 +36,7 @@ Index: xorg-server/hw/xfree86/modes/xf86Crtc.h
/*
* For overlay video, compute the relevant CRTC and
* clip video to that.
-@@ -952,6 +953,7 @@
+@@ -952,6 +953,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 39035fb..77bbbc4 100644
--- a/debian/patches/15-nouveau.diff
+++ b/debian/patches/15-nouveau.diff
@@ -10,11 +10,9 @@ Also, don't treat DRI setup failure as an error for nouveau.
hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++-
3 files changed, 28 insertions(+), 5 deletions(-)
-Index: xorg-server/glx/glxdri.c
-===================================================================
---- xorg-server.orig/glx/glxdri.c
-+++ xorg-server/glx/glxdri.c
-@@ -981,6 +981,7 @@
+--- a/glx/glxdri.c
++++ b/glx/glxdri.c
+@@ -979,6 +979,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIconfig **driConfigs;
const __DRIextension **extensions;
int i;
@@ -22,7 +20,7 @@ Index: xorg-server/glx/glxdri.c
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
-@@ -1060,7 +1061,9 @@
+@@ -1058,7 +1059,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -33,7 +31,7 @@ Index: xorg-server/glx/glxdri.c
filename, dlerror());
goto handle_error;
}
-@@ -1198,7 +1201,7 @@
+@@ -1196,7 +1199,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
@@ -42,11 +40,9 @@ Index: xorg-server/glx/glxdri.c
return NULL;
}
-Index: xorg-server/glx/glxdri2.c
-===================================================================
---- xorg-server.orig/glx/glxdri2.c
-+++ xorg-server/glx/glxdri2.c
-@@ -709,6 +709,7 @@
+--- a/glx/glxdri2.c
++++ b/glx/glxdri2.c
+@@ -709,6 +709,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIextension **extensions;
const __DRIconfig **driConfigs;
int i;
@@ -54,7 +50,7 @@ Index: xorg-server/glx/glxdri2.c
screen = calloc(1, sizeof *screen);
if (screen == NULL)
-@@ -735,7 +736,9 @@
+@@ -735,7 +736,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
@@ -65,7 +61,7 @@ Index: xorg-server/glx/glxdri2.c
filename, dlerror());
goto handle_error;
}
-@@ -829,7 +832,7 @@
+@@ -829,7 +832,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
@@ -74,11 +70,9 @@ Index: xorg-server/glx/glxdri2.c
return NULL;
}
-Index: xorg-server/hw/xfree86/common/xf86pciBus.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86pciBus.c
-+++ xorg-server/hw/xfree86/common/xf86pciBus.c
-@@ -1118,7 +1118,24 @@
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1118,7 +1118,24 @@ videoPtrToDriverList(struct pci_device *
break;
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
diff --git a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
index b8d2716..f3e8ceb 100644
--- a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
+++ b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
@@ -1,7 +1,5 @@
-Index: xorg-server/fb/fbpict.c
-===================================================================
---- xorg-server.orig/fb/fbpict.c 2010-07-05 16:12:34.118394001 +1000
-+++ xorg-server/fb/fbpict.c 2010-07-05 17:20:51.548394001 +1000
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
@@ -35,7 +35,7 @@
#include "mipict.h"
#include "fbpict.h"
commit b17654e0f97da38ff90e753f9cb53201f8641c87
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:25:23 2011 +0100
The “Squeeze is released, target sid!” upload.
diff --git a/debian/changelog b/debian/changelog
index 93f6f3c..3d9f980 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
+ * The “Squeeze is released, target sid!” upload.
* New upstream release.
* Get rid of long obsolete NEWS file.
* Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
commit 0807748ff95eaf8a7252f3184be9bbe7c71e95af
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:21:31 2011 +0100
Remove trailing whitespaces.
diff --git a/debian/rules b/debian/rules
index c22e085..6fbb28c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,7 +208,7 @@ endif
clean: xsfclean abibumpcheck
dh_testdir
dh_testroot
-
+
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -219,7 +219,7 @@ clean: xsfclean abibumpcheck
rm -f include/do-not-use-config.h.in
rm -f m4/lt*.m4 m4/libtool.m4
find -name Makefile.in -delete
-
+
dh_clean
install: build
@@ -227,23 +227,23 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
+
cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install
ifeq ($(udeb), yes)
cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/udeb install
endif
-
+
# oh, yuck.
find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \
xargs rm -f
-
+
# remove modules not needed in d-i
rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libexa.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libwfb.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxf8_16bpp.so
-
+
install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin
install debian/local/xvfb-run.1 debian/tmp/main/usr/share/man/man1
ifneq ($(DEB_HOST_ARCH_OS), linux)
@@ -294,7 +294,7 @@ abibumpcheck: debian/serverminver
# Build architecture-dependent files here.
binary-arch: build install
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial
-
+
dh_installdocs -s
dh_installchangelogs -s
dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp --list-missing
commit ec3429f4dbb2795e7e79751cb026228839988930
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:19:30 2011 +0100
Document the cherry-pick (Closes: #590715).
diff --git a/debian/changelog b/debian/changelog
index 315b20c..93f6f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Use architecture wildcards for build-deps.
* Make xserver-xfbdev linux-any; add armhf and powerpcspe to the udeb
(Closes: #585697, #605764).
+ * Cherry-pick, thanks to Samuel Thibault (Closes: #590715):
+ - xserver: enable TLS even if AIGLX is not enabled
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
commit 34057ed41fcca37544255be465850d7b5dc7399d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jan 31 23:25:10 2011 +0100
xserver: enable TLS even if AIGLX is not enabled
This aligns the xorg server build with the mesa build, which is needed on
systems where aiglx with dri support is not enabled. Else the following error is
obtained when trying to load the software raster:
(EE) AIGLX error: dlopen of /usr/lib/dri/swrast_dri.so failed (/usr/lib/dri/swrast_dri.so: undefined symbol: _glapi_tls_Context)
(EE) GLX: could not load software renderer
(II) GLX: no usable GL providers found for screen 0
because mesa always enables TLS use in GLX, even if dri is not available.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 0b15033031d78836582bd1b641c3160c3803a708)
diff --git a/configure.ac b/configure.ac
index b2fbb5f..559188e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1020,7 +1020,7 @@ else
fi
AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
-if test "x$GLX_USE_TLS" = xyes -a "x$AIGLX" = xyes; then
+if test "x$GLX_USE_TLS" = xyes ; then
GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
fi
commit 5aa1c9e6b3fc1936b0068fc3d61fff732ff3f8b9
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:09:31 2011 +0100
Add armhf/powerpcspe support (Closes: #585697, #605764).
diff --git a/debian/changelog b/debian/changelog
index 879bff8..315b20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Add current versions to debian/serverminver accordingly.
* Remove “xserver” from Provides, it's deprecated.
* Use architecture wildcards for build-deps.
+ * Make xserver-xfbdev linux-any; add armhf and powerpcspe to the udeb
+ (Closes: #585697, #605764).
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/control b/debian/control
index 3cc411c..5e5d922 100644
--- a/debian/control
+++ b/debian/control
@@ -131,7 +131,7 @@ Package: xserver-xorg-core-udeb
XC-Package-Type: udeb
Section: debian-installer
# exclude sparc because of linker errors
-Architecture: alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390
+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390
Depends:
# merged: xserver-common (>= ${source:Version}),
xkb-data-udeb,
@@ -283,7 +283,7 @@ Description: nested X server
This package is built from the X.org xserver module.
Package: xserver-xfbdev
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
+Architecture: linux-any
Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
commit 567a3060c15ebfe80ced2f250576fd4b071165c8
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:03:23 2011 +0100
Use architecture wildcards for build-deps.
diff --git a/debian/changelog b/debian/changelog
index ce989be..879bff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
beginning of the build.
* Add current versions to debian/serverminver accordingly.
* Remove “xserver” from Provides, it's deprecated.
+ * Use architecture wildcards for build-deps.
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/control b/debian/control
index 09e7e3e..3cc411c 100644
--- a/debian/control
+++ b/debian/control
@@ -48,11 +48,11 @@ Build-Depends:
libpciaccess-dev (>= 0.11.0-2),
libgcrypt-dev,
nettle-dev,
- libdbus-1-dev [kfreebsd-amd64 kfreebsd-i386],
- libhal-dev [kfreebsd-amd64 kfreebsd-i386],
- libudev-dev (>= 151-3) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- libaudit-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libdbus-1-dev [kfreebsd-any],
+ libhal-dev [kfreebsd-any],
+ libudev-dev (>= 151-3) [linux-any],
+ libselinux1-dev (>= 2.0.80) [linux-any],
+ libaudit-dev [linux-any],
x11proto-xf86dri-dev (>= 2.1.0),
libdrm-dev (>= 2.4.3) [!hurd-i386],
x11proto-gl-dev (>= 1.4.10),
commit 8bcab3862975d2a017787446b9013f65a058e36d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 06:03:04 2011 +0100
Remove “xserver” from Provides, it's deprecated.
diff --git a/debian/changelog b/debian/changelog
index 00d5bdf..ce989be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
clean depend on it to make sure such an update is noticed at the very
beginning of the build.
* Add current versions to debian/serverminver accordingly.
+ * Remove “xserver” from Provides, it's deprecated.
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/control b/debian/control
index 140dea6..09e7e3e 100644
--- a/debian/control
+++ b/debian/control
@@ -113,7 +113,6 @@ Breaks:
xserver-xorg-input-vmmouse (<= 1:12.6.5-4),
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
Provides:
- xserver,
${videoabi}, xorg-video-abi-8.0,
${inputabi}, xorg-input-abi-11.0,
Description: Xorg X server - core server
@@ -143,7 +142,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Provides:
- xserver,
${videoabi},
${inputabi},
Description: Xorg X server - core server
commit e95c5a22caf150c7eae37006cc4f26c41604fc57
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Feb 5 05:51:08 2011 +0100
Remove trailing space.
diff --git a/debian/control b/debian/control
index e88bcab..140dea6 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
xutils-dev (>= 1:7.5+4),
xfonts-utils (>= 1:7.5+1),
x11proto-bigreqs-dev (>= 1:1.1.0),
- x11proto-composite-dev (>= 1:0.4),
+ x11proto-composite-dev (>= 1:0.4),
x11proto-core-dev (>= 7.0.17),
x11proto-damage-dev (>= 1.1),
x11proto-fixes-dev (>= 1:4.1),
commit 8fb74ff4eeddb86098fee1b0650d4bc05c23fce4
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 4 23:47:00 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3def1bf..2231f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit ce83d1bd5a7dee70cc1616b583fbd3ce2392f0a0
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Feb 4 11:35:58 2011 -0800
+
+ xorg-server 1.9.4
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit df12f4a4d9afe819fd3ae1ec8aaa5a7ec9d6567f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jan 30 17:07:25 2011 -0800
diff --git a/debian/changelog b/debian/changelog
index 042ad2b..192e07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
+ * New upstream release.
* Get rid of long obsolete NEWS file.
* Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
call, to avoid non-stripped binaries if the build is resumed.
commit 01b061423d9bcb13c3582c93b7e89578bc7e913d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 4 23:15:11 2011 +0100
Use “dh_prep” instead of deprecated “dh_clean -k”.
diff --git a/debian/changelog b/debian/changelog
index 5342494..042ad2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
* Get rid of long obsolete NEWS file.
* Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
call, to avoid non-stripped binaries if the build is resumed.
+ * Use “dh_prep” instead of deprecated “dh_clean -k”.
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/rules b/debian/rules
index 651fd6b..b18b3d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,7 +225,7 @@ clean: xsfclean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install
commit ce83d1bd5a7dee70cc1616b583fbd3ce2392f0a0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Feb 4 11:35:58 2011 -0800
xorg-server 1.9.4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index a977c7a..b2fbb5f 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.3.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-01-30"
+AC_INIT([xorg-server], 1.9.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-02-04"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit d9c13f2cb0444156eb2fda8158a065592c38027b
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 3 02:18:38 2011 +0100
Don't set variables for -all meta packages.
diff --git a/debian/local/dh_xsf_substvars b/debian/local/dh_xsf_substvars
index 2624f25..c5242ed 100755
--- a/debian/local/dh_xsf_substvars
+++ b/debian/local/dh_xsf_substvars
@@ -36,8 +36,8 @@ for package in $(dh_listpackages); do
# To avoid having "unused substitution variable" warnings from
# dpkg-gencontrol, only set variables which make sense:
case $package in
- *-dbg|*-dev)
- # debug or devel package, no need for Depends/Provides.
+ *-dbg|*-dev|*-all)
+ # debug, devel, or meta package, no need for Depends/Provides.
:
;;
xserver-xorg-input-*)
commit 372a6f87f74b7247ddbb967c56d4093035db3e9f
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 3 01:55:38 2011 +0100
Don't set variables for -dev packages.
Examples of such packages:
xserver-xorg-input-evdev-dev
xserver-xorg-input-joystick-dev
xserver-xorg-input-synaptics-dev
diff --git a/debian/local/dh_xsf_substvars b/debian/local/dh_xsf_substvars
index 2c30c18..2624f25 100755
--- a/debian/local/dh_xsf_substvars
+++ b/debian/local/dh_xsf_substvars
@@ -36,9 +36,8 @@ for package in $(dh_listpackages); do
# To avoid having "unused substitution variable" warnings from
# dpkg-gencontrol, only set variables which make sense:
case $package in
- *-dbg)
- # debug package, going to depend on the appropriate driver, no
- # need to set any variable.
+ *-dbg|*-dev)
+ # debug or devel package, no need for Depends/Provides.
:
;;
xserver-xorg-input-*)
commit 6dc682cae562d0ca3dbe3e6ce5da2a271c96fd42
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 3 01:45:57 2011 +0100
Bump changelog.
To use the dh_xsf_substvars and xsf.pm sequence features, packages must
build-depend on xserver-xorg-dev (>= 2:1.9.4) rather than on a specific
revision of the package.
diff --git a/debian/changelog b/debian/changelog
index d51ad31..17a2066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.9.4-1) UNRELEASED; urgency=low
* Introduce dh_xsf_substvars, to be used in driver packages to set
appropriate substitution variables for Depends and Provides, before
commit 356280d974792beeffe1a22d4d4d052ef1b509a8
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Feb 3 01:26:17 2011 +0100
Also ship a debhelper sequence: xsf.pm
At the moment, it only inserts dh_xsf_substvars before dh_gencontrol.
Usage:
“dh $@ --with xsf” when using dh.
diff --git a/debian/changelog b/debian/changelog
index 1724783..d51ad31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
* Introduce dh_xsf_substvars, to be used in driver packages to set
appropriate substitution variables for Depends and Provides, before
calling dh_gencontrol. Ship it in xserver-xorg-dev.
+ * Also ship a debhelper sequence: xsf.pm, to insert dh_xsf_substvars
+ before dh_gencontrol. Usage: “dh $@ --with xsf” when using dh.
* Get rid of inputabiver and videoabiver files, they've been deprecated
for a while, and drivers should all have switched by now.
* rules: Only read the first line of debian/serverminver to set the
diff --git a/debian/local/xsf.pm b/debian/local/xsf.pm
new file mode 100644
index 0000000..9037d70
--- /dev/null
+++ b/debian/local/xsf.pm
@@ -0,0 +1,8 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+insert_before("dh_gencontrol", "dh_xsf_substvars");
+
+1;
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index b5e0d6a..9ec3c60 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -3,3 +3,4 @@ main/usr/lib/pkgconfig/xorg-server.pc usr/lib/pkgconfig
main/usr/share/aclocal usr/share
../../debian/local/dh_xsf_substvars usr/bin
+../../debian/local/xsf.pm /usr/share/perl5/Debian/Debhelper/Sequence/
commit f3331b490ae81364d133046dac851d7deb1ac070
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 2 09:33:55 2011 +0100
Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s” call.
This avoids non-stripped binaries if the build is resumed.
diff --git a/debian/changelog b/debian/changelog
index 34d7764..5342494 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
* Get rid of long obsolete NEWS file.
+ * Replace “--remaining-packages” with “-Nfoo -Nbar” in the “dh_strip -s”
+ call, to avoid non-stripped binaries if the build is resumed.
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:14:18 +0100
diff --git a/debian/rules b/debian/rules
index 95257c5..651fd6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -306,7 +306,7 @@ endif
dh_installman -s
dh_link -s
dh_strip -pxserver-xorg-core --dbg-package=xserver-xorg-core-dbg
- dh_strip -s --remaining-packages
+ dh_strip -s -Nxserver-xorg-core -Nxserver-xorg-core-dbg
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-deb
commit b8e49668f9d9a15b796ba459da10a1f84f4deb56
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 1 17:29:11 2011 +0100
Copy server's substvars as udeb's substvars.
Do that once the videoabi/inputabi variables are computed. The differences
between both files appear way later, when dpkg-shlibdeps comes into play.
diff --git a/debian/changelog b/debian/changelog
index 58843b4..1724783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
the next ABI bump).
* Add ${videoabi}, ${inputabi} to the udeb's Provides. There's no reason
for udebs to have loose dependencies.
+ * Accordingly, copy server's substvars as udeb's substvars once the
+ videoabi/inputabi variables are computed.
* Add an abibumpcheck target which checks for xinput and videodrv ABI
updates, based on the versions stored in debian/serverminver; make
clean depend on it to make sure such an update is noticed at the very
diff --git a/debian/rules b/debian/rules
index f3473de..17e3487 100755
--- a/debian/rules
+++ b/debian/rules
@@ -307,6 +307,9 @@ binary-arch: build install
echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
+ # The udeb uses the same substvars:
+ cp debian/xserver-xorg-core.substvars debian/xserver-xorg-core-udeb.substvars
+
$(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
$(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
ifeq ($(DEB_HOST_ARCH_OS), linux)
commit 8c40997b6e9ef824de427f2f1b20e6e47396c21b
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 1 17:12:10 2011 +0100
Ship dh_xsf_substvars in xserver-xorg-dev.
diff --git a/debian/changelog b/debian/changelog
index 5ee4f51..58843b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
* Introduce dh_xsf_substvars, to be used in driver packages to set
appropriate substitution variables for Depends and Provides, before
- calling dh_gencontrol.
+ calling dh_gencontrol. Ship it in xserver-xorg-dev.
* Get rid of inputabiver and videoabiver files, they've been deprecated
for a while, and drivers should all have switched by now.
* rules: Only read the first line of debian/serverminver to set the
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index 36df50e..b5e0d6a 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -1,3 +1,5 @@
main/usr/include/xorg usr/include
main/usr/lib/pkgconfig/xorg-server.pc usr/lib/pkgconfig
main/usr/share/aclocal usr/share
+
+../../debian/local/dh_xsf_substvars usr/bin
commit 6169ed3a8064baf2a738a7777e9396a64eb468ae
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 1 16:33:04 2011 +0100
Add current versions to debian/serverminver accordingly.
diff --git a/debian/changelog b/debian/changelog
index 9505d7b..5ee4f51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xorg-server (2:1.9.3.902-2) UNRELEASED; urgency=low
updates, based on the versions stored in debian/serverminver; make
clean depend on it to make sure such an update is noticed at the very
beginning of the build.
+ * Add current versions to debian/serverminver accordingly.
-- Cyril Brulebois <kibi@debian.org> Tue, 01 Feb 2011 15:01:20 +0100
diff --git a/debian/serverminver b/debian/serverminver
index df5b538..cb66b15 100644
--- a/debian/serverminver
+++ b/debian/serverminver
@@ -1 +1,3 @@
2:1.8.99.904
Reply to: