debian/changelog | 5 +++++
debian/rules | 14 ++++++++------
debian/rules.flags | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit e540fb20a1f6be86aea0deba3e7838a52e0757d7
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Thu Nov 23 00:36:37 2017 +0100
Unbreak the pkg-config file
diff --git a/debian/changelog b/debian/changelog
index 5f995a3..73add17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium
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 <po...@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
diff --git a/debian/rules.flags b/debian/rules.flags
index c6f3672..f2aec76 100755
--- a/debian/rules.flags
+++ b/debian/rules.flags
@@ -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 \
commit 185402250a848966e256fdd816737f4d8e1cd7a2
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Thu Nov 23 00:33:52 2017 +0100
Fail the build if calculating video/xinput abi fails
diff --git a/debian/changelog b/debian/changelog
index 1e21016..5f995a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ 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.
-- Emilio Pozuelo Monfort <po...@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
diff --git a/debian/rules b/debian/rules
index ed20e61..acbb191 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,12 +105,14 @@ 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:
-
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 && \
- echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>=
$(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
-
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 && \
- echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>=
$(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
+ 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`; \
+ 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`; \
+ 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:
cp debian/xserver-xorg-core.substvars
debian/xserver-xorg-core-udeb.substvars
