xorg-server: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/rules | 14 +++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit b00aa5396f176ae929d9a75c6422ae62add464a7
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 10:17:43 2017 +0100
rules: Remove unused vars config_backend_main and config_backend_udeb.
diff --git a/debian/changelog b/debian/changelog
index f60ee85..a5e280e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.19.1-2) UNRELEASED; urgency=medium
* rules: Fix udeb regression from dh migration. Should also fix FTBFS
on hurd and kfreebsd.
* rules: Add --fail-missing to dh_install.
+ * rules: Remove unused vars config_backend_main and
+ config_backend_udeb.
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 09:46:53 +0100
diff --git a/debian/rules b/debian/rules
index d2af56f..40c92f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,7 +131,6 @@ confflags_main = \
--enable-xephyr \
--with-sha1=libgcrypt \
--enable-xcsecurity \
- $(config_backend_main) \
$(void)
confflags_udeb = \
@@ -164,7 +163,6 @@ confflags_udeb = \
--disable-kdrive \
--disable-xephyr \
--with-sha1=libnettle \
- $(config_backend_udeb) \
$(void)
%:
commit 4cea7f948ec68f20d9dc1e0d97b91332c89a8791
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 10:14:06 2017 +0100
rules: Add --fail-missing to dh_install.
diff --git a/debian/changelog b/debian/changelog
index a179cfe..f60ee85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-server (2:1.19.1-2) UNRELEASED; urgency=medium
* rules: Fix udeb regression from dh migration. Should also fix FTBFS
on hurd and kfreebsd.
+ * rules: Add --fail-missing to dh_install.
-- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 09:46:53 +0100
diff --git a/debian/rules b/debian/rules
index 038b5b5..d2af56f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -221,8 +221,10 @@ override_dh_auto_install:
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libwfb.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxf8_16bpp.so
- # we don't ship these from the udeb build, reduce noise from dh_install
- # --list-missing
+ # we don't ship these from the udeb build, needed for dh_install
+ # --fail-missing
+ rm -rf debian/tmp/udeb/var/lib/xkb/README.compiled
+ rm -rf debian/tmp/udeb/usr/bin/X
rm -rf debian/tmp/udeb/usr/include
rm -rf debian/tmp/udeb/usr/share/aclocal
rm -rf debian/tmp/udeb/usr/share/man
@@ -261,7 +263,7 @@ abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
fi
override_dh_install:
- dh_install
+ dh_install --fail-missing
-chown root:root $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
-chmod ug+s $(CURDIR)/debian/xserver-xorg-legacy/usr/lib/xorg/Xorg.wrap
commit 0f08c98a377e0b63c61304d5c7f9eb497ddcb526
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jan 18 09:49:07 2017 +0100
rules: Fix udeb regression from dh migration. Should also fix FTBFS on hurd and kfreebsd.
diff --git a/debian/changelog b/debian/changelog
index 9150070..a179cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.19.1-2) UNRELEASED; urgency=medium
+
+ * rules: Fix udeb regression from dh migration. Should also fix FTBFS
+ on hurd and kfreebsd.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Wed, 18 Jan 2017 09:46:53 +0100
+
xorg-server (2:1.19.1-1) unstable; urgency=medium
[ Emilio Pozuelo Monfort ]
diff --git a/debian/rules b/debian/rules
index 782c076..038b5b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,11 +233,9 @@ override_dh_auto_install:
ifneq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/tmp/main/usr/share/X11/xorg.conf.d
install -m 644 debian/local/10-*.conf debian/tmp/main/usr/share/X11/xorg.conf.d
-ifeq ($(udeb), yes)
install -d debian/tmp/udeb/usr/share/X11/xorg.conf.d
install -m 644 debian/local/10-*.conf debian/tmp/udeb/usr/share/X11/xorg.conf.d
endif
-endif
# Only read the first line, the rest of the file is used to determine
# when the minimal version is to be bumped:
@@ -289,11 +287,9 @@ override_dh_install:
ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-core/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d
-ifeq ($(udeb), yes)
install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
endif
-endif
override_dh_strip:
dh_strip -pxserver-xorg-core --dbgsym-migration="xserver-xorg-core-dbg (<< 2:1.19.0-3~)"
Reply to: