Skip to content
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ e540fb20
......@@ -8,6 +8,11 @@ xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium
from Helmut Grohne. Closes: #836453.
* Move xserver-xorg-legacy to priority optional, as priority extra is
deprecated.
* Make calculation of xserver-xorg-core's xinput/video ABI provides more
robust.
* Use ${prefix} rather than ${libexecdir} for --with-module-dir, as the
module dir ends up in the pkg-config file, where libexecdir is not
defined.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
......
debian/rules
View file @ e540fb20
......@@ -105,11 +105,13 @@ override_dh_install:
dh_install --remaining-packages --sourcedir=debian/tmp/main --fail-missing
install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
# Extract only the major ABI version:
set -e; \
abi_videodrv=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
test -n "$$abi_videodrv"; echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
set -e; \
abi_xinput=`PKG_CONFIG_PATH=debian/tmp/main/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig pkg-config --variable=abi_xinput xorg-server|cut -d . -f 1`; \
echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
test -n "$$abi_xinput"; 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:
......
debian/rules.flags
View file @ e540fb20
......@@ -10,7 +10,7 @@ SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print
# kill the .las.
confflags += \
--libexecdir=\$${prefix}/lib/xorg \
--with-module-dir=\$${libexecdir}/modules \
--with-module-dir=\$${prefix}/lib/xorg/modules \
--with-serverconfig-path=\$${libexecdir} \
--disable-static \
--without-dtrace \
......