xorg-server: Changes to 'debian-unstable'
debian/changelog | 13 +++++++++++++
debian/control | 1 -
debian/rules | 11 ++++++-----
debian/rules.flags | 5 +++--
debian/xdmx-tools.install | 12 ++++++------
debian/xdmx.install | 4 ++--
debian/xnest.install | 4 ++--
debian/xorg-server-source.install | 2 +-
debian/xserver-common.install | 6 +++---
debian/xserver-xephyr.install | 4 ++--
debian/xserver-xorg-core-udeb.install | 8 ++++----
debian/xserver-xorg-core.install | 26 +++++++++++++-------------
debian/xserver-xorg-dev.install | 6 +++---
debian/xserver-xorg-legacy.install | 6 +++---
debian/xvfb.install | 8 ++++----
debian/xwayland.install | 2 +-
16 files changed, 66 insertions(+), 52 deletions(-)
New commits:
commit 4f84f345e3a58f622da1969bb5063ae4f7d4d6a5
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 21 20:50:16 2017 +0100
Move xserver-xorg-legacy to priority optional
diff --git a/debian/changelog b/debian/changelog
index 0bf1596..1e21016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium
be installed to in *.install.
* Install xorg-server.pc to a multiarch location. Based on a patch
from Helmut Grohne. Closes: #836453.
+ * Move xserver-xorg-legacy to priority optional, as priority extra is
+ deprecated.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
diff --git a/debian/control b/debian/control
index ccbefd6..89bea5b 100644
--- a/debian/control
+++ b/debian/control
@@ -355,7 +355,6 @@ Description: Xwayland X server
Package: xserver-xorg-legacy
Architecture: any
-Priority: extra
Depends:
xserver-common (>= ${source:Version}),
${shlibs:Depends},
commit aefc7f3036425772d903a44206909b08e80dc3c8
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 21 20:11:34 2017 +0100
Install xorg-server.pc to a multiarch location
diff --git a/debian/changelog b/debian/changelog
index 9b1cb46..0bf1596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium
--sourcedir=debian/tmp/main for the rest, so that we don't have
to specify where the files come from as well as where they should
be installed to in *.install.
+ * Install xorg-server.pc to a multiarch location. Based on a patch
+ from Helmut Grohne. Closes: #836453.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
diff --git a/debian/rules b/debian/rules
index 7466ffe..ed20e61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
include debian/rules.flags
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+include /usr/share/dpkg/architecture.mk
%:
dh $@ --with quilt,autoreconf --parallel
@@ -61,7 +61,7 @@ override_dh_auto_install:
rm -rf debian/tmp/udeb/usr/include
rm -rf debian/tmp/udeb/usr/share/aclocal
rm -rf debian/tmp/udeb/usr/share/man
- rm -rf debian/tmp/udeb/usr/lib/pkgconfig
+ rm -rf debian/tmp/udeb/usr/lib/*/pkgconfig
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
@@ -105,10 +105,10 @@ 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/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
+ 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/pkgconfig pkg-config --variable=abi_xinput xorg-server|cut -d . -f 1`; \
+ 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
diff --git a/debian/rules.flags b/debian/rules.flags
index 2850da6..c6f3672 100755
--- a/debian/rules.flags
+++ b/debian/rules.flags
@@ -9,8 +9,9 @@ SOURCE_VERSION := $(shell dpkg-parsechangelog | awk -F': ' '/^Version: / {print
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
- --libdir=\$${prefix}/lib \
- --libexecdir=\$${libdir}/xorg \
+ --libexecdir=\$${prefix}/lib/xorg \
+ --with-module-dir=\$${libexecdir}/modules \
+ --with-serverconfig-path=\$${libexecdir} \
--disable-static \
--without-dtrace \
--disable-strict-compilation \
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index bb2f6ed..7b1b556 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -1,5 +1,5 @@
usr/include/xorg
-usr/lib/pkgconfig/xorg-server.pc
+usr/lib/*/pkgconfig/xorg-server.pc
usr/share/aclocal
../../debian/local/dh_xsf_substvars usr/bin
commit dab761d523c0e25fcc0eab9a2b6fe24c4aa4917c
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Nov 21 19:36:20 2017 +0100
Use --sourcedir for dh_install
diff --git a/debian/changelog b/debian/changelog
index 6f8955b..9b1cb46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.19.5-2) UNRELEASED; urgency=medium
+
+ * Use --sourcedir=debian/tmp/udeb for the udeb package and
+ --sourcedir=debian/tmp/main for the rest, so that we don't have
+ to specify where the files come from as well as where they should
+ be installed to in *.install.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 21 Nov 2017 19:34:34 +0100
+
xorg-server (2:1.19.5-1) unstable; urgency=high
[ Emilio Pozuelo Monfort ]
diff --git a/debian/rules b/debian/rules
index 585b869..7466ffe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,8 @@ override_dh_fixperms-arch:
chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
override_dh_install:
- dh_install --fail-missing
+ dh_install -pxserver-xorg-core-udeb --sourcedir=debian/tmp/udeb
+ 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/pkgconfig pkg-config --variable=abi_videodrv xorg-server|cut -d . -f 1`; \
diff --git a/debian/xdmx-tools.install b/debian/xdmx-tools.install
index 3eac31a..9348dd4 100644
--- a/debian/xdmx-tools.install
+++ b/debian/xdmx-tools.install
@@ -1,6 +1,6 @@
-main/usr/bin/dmx* usr/bin
-main/usr/bin/vdltodmx usr/bin
-main/usr/bin/xdmxconfig usr/bin
-main/usr/share/man/man1/vdltodmx.1 usr/share/man/man1
-main/usr/share/man/man1/dmxtodmx.1 usr/share/man/man1
-main/usr/share/man/man1/xdmxconfig.1 usr/share/man/man1
+usr/bin/dmx*
+usr/bin/vdltodmx
+usr/bin/xdmxconfig
+usr/share/man/man1/vdltodmx.1
+usr/share/man/man1/dmxtodmx.1
+usr/share/man/man1/xdmxconfig.1
diff --git a/debian/xdmx.install b/debian/xdmx.install
index c6a37eb..e212e19 100644
--- a/debian/xdmx.install
+++ b/debian/xdmx.install
@@ -1,2 +1,2 @@
-main/usr/bin/Xdmx usr/bin
-main/usr/share/man/man1/Xdmx.1 usr/share/man/man1
+usr/bin/Xdmx
+usr/share/man/man1/Xdmx.1
diff --git a/debian/xnest.install b/debian/xnest.install
index b11a15e..c04b581 100644
--- a/debian/xnest.install
+++ b/debian/xnest.install
@@ -1,2 +1,2 @@
-main/usr/bin/Xnest usr/bin
-main/usr/share/man/man1/Xnest.1 usr/share/man/man1
+usr/bin/Xnest
+usr/share/man/man1/Xnest.1
diff --git a/debian/xorg-server-source.install b/debian/xorg-server-source.install
index 712189c..efa02be 100644
--- a/debian/xorg-server-source.install
+++ b/debian/xorg-server-source.install
@@ -1 +1 @@
-build-source/xorg-server.tar.* usr/src
+../../build-source/xorg-server.tar.* usr/src
diff --git a/debian/xserver-common.install b/debian/xserver-common.install
index 28c12bb..32c1f18 100644
--- a/debian/xserver-common.install
+++ b/debian/xserver-common.install
@@ -1,3 +1,3 @@
-main/usr/lib/xorg/protocol.txt usr/lib/xorg
-main/usr/share/man/man1/Xserver.1 usr/share/man/man1
-main/var/lib/xkb/README.compiled var/lib/xkb
+usr/lib/xorg/protocol.txt
+usr/share/man/man1/Xserver.1
+var/lib/xkb/README.compiled
diff --git a/debian/xserver-xephyr.install b/debian/xserver-xephyr.install
index c0939e6..24fe4ac 100644
--- a/debian/xserver-xephyr.install
+++ b/debian/xserver-xephyr.install
@@ -1,2 +1,2 @@
-main/usr/bin/Xephyr usr/bin
-main/usr/share/man/man1/Xephyr.1 usr/share/man/man1
+usr/bin/Xephyr
+usr/share/man/man1/Xephyr.1
diff --git a/debian/xserver-xorg-core-udeb.install b/debian/xserver-xorg-core-udeb.install
index 8092696..1832efa 100644
--- a/debian/xserver-xorg-core-udeb.install
+++ b/debian/xserver-xorg-core-udeb.install
@@ -1,7 +1,7 @@
# from xserver-common:
-udeb/usr/lib/xorg/protocol.txt usr/lib/xorg
+usr/lib/xorg/protocol.txt
# from xserver-xorg-core:
-udeb/usr/lib/xorg/modules usr/lib/xorg
-udeb/usr/bin/Xorg usr/bin
-udeb/usr/share/X11/xorg.conf.d usr/share/X11/
+usr/lib/xorg/modules
+usr/bin/Xorg
+usr/share/X11/xorg.conf.d
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index e16f9d6..63649f8 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -1,13 +1,13 @@
-main/usr/lib/xorg/modules usr/lib/xorg
-main/usr/bin/Xorg usr/bin
-main/usr/bin/X usr/bin
-main/usr/share/man/man1/Xorg.1 usr/share/man/man1
-main/usr/share/man/man4 usr/share/man/
-main/usr/share/man/man5/xorg.conf.5 usr/share/man/man5
-main/usr/share/man/man5/xorg.conf.d.5 usr/share/man/man5
-main/usr/bin/cvt usr/bin
-main/usr/bin/gtf usr/bin
-main/usr/share/man/man1/cvt.1 usr/share/man/man1
-main/usr/share/man/man1/gtf.1 usr/share/man/man1
-main/usr/share/X11/xorg.conf.d usr/share/X11/
-main/usr/lib/xorg/Xorg usr/lib/xorg
+usr/lib/xorg/modules
+usr/bin/Xorg
+usr/bin/X
+usr/share/man/man1/Xorg.1
+usr/share/man/man4
+usr/share/man/man5/xorg.conf.5
+usr/share/man/man5/xorg.conf.d.5
+usr/bin/cvt
+usr/bin/gtf
+usr/share/man/man1/cvt.1
+usr/share/man/man1/gtf.1
+usr/share/X11/xorg.conf.d
+usr/lib/xorg/Xorg
diff --git a/debian/xserver-xorg-dev.install b/debian/xserver-xorg-dev.install
index 9ec3c60..bb2f6ed 100644
--- a/debian/xserver-xorg-dev.install
+++ b/debian/xserver-xorg-dev.install
@@ -1,6 +1,6 @@
-main/usr/include/xorg usr/include
-main/usr/lib/pkgconfig/xorg-server.pc usr/lib/pkgconfig
-main/usr/share/aclocal usr/share
+usr/include/xorg
+usr/lib/pkgconfig/xorg-server.pc
+usr/share/aclocal
../../debian/local/dh_xsf_substvars usr/bin
../../debian/local/xsf.pm /usr/share/perl5/Debian/Debhelper/Sequence/
diff --git a/debian/xserver-xorg-legacy.install b/debian/xserver-xorg-legacy.install
index 44b995e..d078f97 100644
--- a/debian/xserver-xorg-legacy.install
+++ b/debian/xserver-xorg-legacy.install
@@ -1,3 +1,3 @@
-main/usr/lib/xorg/Xorg.wrap usr/lib/xorg
-main/usr/share/man/man1/Xorg.wrap.1 usr/share/man/man1
-main/usr/share/man/man5/Xwrapper.config.5 usr/share/man/man5
+usr/lib/xorg/Xorg.wrap
+usr/share/man/man1/Xorg.wrap.1
+usr/share/man/man5/Xwrapper.config.5
diff --git a/debian/xvfb.install b/debian/xvfb.install
index 9fb2663..7a2095e 100644
--- a/debian/xvfb.install
+++ b/debian/xvfb.install
@@ -1,4 +1,4 @@
-main/usr/bin/Xvfb usr/bin
-main/usr/bin/xvfb-run usr/bin
-main/usr/share/man/man1/xvfb-run.1 usr/share/man/man1
-main/usr/share/man/man1/Xvfb.1 usr/share/man/man1
+usr/bin/Xvfb
+usr/bin/xvfb-run
+usr/share/man/man1/xvfb-run.1
+usr/share/man/man1/Xvfb.1
diff --git a/debian/xwayland.install b/debian/xwayland.install
index 4e62413..0802412 100644
--- a/debian/xwayland.install
+++ b/debian/xwayland.install
@@ -1 +1 @@
-main/usr/bin/Xwayland usr/bin
+usr/bin/Xwayland
Reply to: