Timo Aaltonen pushed to branch ubuntu at X Strike Force / xserver / xorg-server
Commits: fe5bb3a1 by Timo Aaltonen at 2018-09-19T21:22:03Z xvfb-run: Update default resolution and bitdepth to match upstream defaults. - - - - - f31c940d by Timo Aaltonen at 2018-09-19T21:41:29Z bump xvfb-run defaults on the manpage too - - - - - 166ad97f by Timo Aaltonen at 2018-09-20T08:12:53Z Limit libunwind to archs that actually have it. (Closes: #909240) - - - - - 02086fd1 by Timo Aaltonen at 2018-09-20T08:26:23Z release to unstable - - - - - f0ad970e by Timo Aaltonen at 2018-09-21T08:21:57Z Merge branch 'debian-unstable' into ubuntu - - - - - 17449663 by Timo Aaltonen at 2018-09-21T08:22:34Z release to cosmic - - - - - 5 changed files: - debian/changelog - debian/control - debian/local/xvfb-run - debian/local/xvfb-run.1 - debian/rules.flags Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,17 @@ +xorg-server (2:1.20.1-3ubuntu1) cosmic; urgency=medium + + * Merge from Debian. + + -- Timo Aaltonen <[email protected]> Fri, 21 Sep 2018 11:22:03 +0300 + +xorg-server (2:1.20.1-3) unstable; urgency=medium + + * xvfb-run*: Update default resolution and bitdepth to match upstream + defaults. + * Limit libunwind to archs that actually have it. (Closes: #909240) + + -- Timo Aaltonen <[email protected]> Thu, 20 Sep 2018 11:26:11 +0300 + xorg-server (2:1.20.1-2ubuntu1) cosmic; urgency=medium * Merge from Debian. ===================================== debian/control ===================================== @@ -31,7 +31,7 @@ Build-Depends: libaudit-dev [linux-any], libdrm-dev (>= 2.4.89) [!hurd-i386], libgl1-mesa-dev (>= 9.2), - libunwind-dev, + libunwind-dev [amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4], libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1), libx11-dev (>= 2:1.6), ===================================== debian/local/xvfb-run ===================================== @@ -2,8 +2,7 @@ # This script starts an instance of Xvfb, the "fake" X server, runs a command # with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script, except in cases -# where this script encounters an error. +# value of the command becomes the return value of this script. # # If anyone is using this to build a Debian package, make sure the package # Build-Depends on xvfb and xauth. @@ -14,7 +13,7 @@ PROGNAME=xvfb-run SERVERNUM=99 AUTHFILE= ERRORFILE=/dev/null -XVFBARGS="-screen 0 640x480x16" +XVFBARGS="-screen 0 1280x1024x24" LISTENTCP="-nolisten tcp" XAUTHPROTO=. ===================================== debian/local/xvfb-run.1 ===================================== @@ -156,7 +156,7 @@ Use the option .BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. +The default is \(oq\-screen 0 1280x1024x24\(cq. .TP .BI \-w\ delay \fR,\fB\ \-\-wait= delay Ignored for compatibility with earlier versions. ===================================== debian/rules.flags ===================================== @@ -41,7 +41,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-composite \ - --enable-libunwind \ --enable-record \ --enable-xv \ --enable-xvmc \ @@ -133,6 +132,11 @@ else # hurd confflags += --disable-config-udev endif +# some archs don't have libunwind +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf hppa i386 ia64 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4)) + confflags_main += --enable-libunwind +endif + # linux: libdrm needed for kms (hw/xfree86/os-support/linux/lnx_platform.c) # even in udeb # kfreebsd: libdrm for dri in main build View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/7b895a7a5703c1cf58952b6e61acea46b28528b6...174496635f485958e5258dda65281708e9b12acf -- View it on GitLab: https://salsa.debian.org/xorg-team/xserver/xorg-server/compare/7b895a7a5703c1cf58952b6e61acea46b28528b6...174496635f485958e5258dda65281708e9b12acf You're receiving this email because of your account on salsa.debian.org.
