Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
Commits:
-
18540225
by Emilio Pozuelo Monfort at 2017-11-23T00:33:52+01:00
-
e540fb20
by Emilio Pozuelo Monfort at 2017-11-23T00:36:37+01:00
3 changed files:
Changes:
| ... | ... | @@ -8,6 +8,11 @@ xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium |
| 8 | 8 |
from Helmut Grohne. Closes: #836453.
|
| 9 | 9 |
* Move xserver-xorg-legacy to priority optional, as priority extra is
|
| 10 | 10 |
deprecated.
|
| 11 |
+ * Make calculation of xserver-xorg-core's xinput/video ABI provides more
|
|
| 12 |
+ robust.
|
|
| 13 |
+ * Use ${prefix} rather than ${libexecdir} for --with-module-dir, as the
|
|
| 14 |
+ module dir ends up in the pkg-config file, where libexecdir is not
|
|
| 15 |
+ defined.
|
|
| 11 | 16 |
|
| 12 | 17 |
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
|
| 13 | 18 |
|
| ... | ... | @@ -105,12 +105,14 @@ override_dh_install: |
| 105 | 105 |
dh_install --remaining-packages --sourcedir=debian/tmp/main --fail-missing
|
| 106 | 106 |
install -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
|
| 107 | 107 |
# Extract only the major ABI version:
|
| 108 |
- 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`; \
|
|
| 109 |
- echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
|
|
| 110 |
- echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
|
|
| 111 |
- 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`; \
|
|
| 112 |
- echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
|
|
| 113 |
- echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
|
|
| 108 |
+ set -e; \
|
|
| 109 |
+ 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`; \
|
|
| 110 |
+ test -n "$$abi_videodrv"; echo videoabi=xorg-video-abi-$$abi_videodrv > debian/xserver-xorg-core.substvars && \
|
|
| 111 |
+ echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
|
|
| 112 |
+ set -e; \
|
|
| 113 |
+ 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`; \
|
|
| 114 |
+ test -n "$$abi_xinput"; echo inputabi=xorg-input-abi-$$abi_xinput >> debian/xserver-xorg-core.substvars && \
|
|
| 115 |
+ echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>= $(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
|
|
| 114 | 116 |
|
| 115 | 117 |
# The udeb uses the same substvars:
|
| 116 | 118 |
cp debian/xserver-xorg-core.substvars debian/xserver-xorg-core-udeb.substvars
|
| ... | ... | @@ -10,7 +10,7 @@ SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print |
| 10 | 10 |
# kill the .las.
|
| 11 | 11 |
confflags += \
|
| 12 | 12 |
--libexecdir=\$${prefix}/lib/xorg \
|
| 13 |
- --with-module-dir=\$${libexecdir}/modules \
|
|
| 13 |
+ --with-module-dir=\$${prefix}/lib/xorg/modules \
|
|
| 14 | 14 |
--with-serverconfig-path=\$${libexecdir} \
|
| 15 | 15 |
--disable-static \
|
| 16 | 16 |
--without-dtrace \
|