debian/changelog | 7 +++++++
debian/rules | 8 +++++---
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit a8bfc990827023d20ebd8a811f71081cdddf5cfd
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Thu Jan 19 19:14:15 2017 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index 23a4cfe..d4f876d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.19.1-3) UNRELEASED; urgency=medium
+xorg-server (2:1.19.1-3) unstable; urgency=medium
* rules: Fix setting suid bit on Xorg.wrap.
* rules: Don't ignore errors when setting the suid bit.
- -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 19 Jan 2017 11:14:40 +0100
+ -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 19 Jan 2017 19:14:06 +0100
xorg-server (2:1.19.1-2) unstable; urgency=medium
commit 7f734c21b8a6a8dc7c32b8cdb90d606fc381827e
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Thu Jan 19 11:27:36 2017 +0100
Don't ignore errors when setting the suid bit
diff --git a/debian/changelog b/debian/changelog
index 235cdb6..23a4cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.19.1-3) UNRELEASED; urgency=medium
* rules: Fix setting suid bit on Xorg.wrap.
+ * rules: Don't ignore errors when setting the suid bit.
-- Emilio Pozuelo Monfort <po...@debian.org> Thu, 19 Jan 2017 11:14:40 +0100
diff --git a/debian/rules b/debian/rules
index 01b3513..a83d187 100755
--- a/debian/rules
+++ b/debian/rules
@@ -262,8 +262,8 @@ abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
override_dh_fixperms:
dh_fixperms
- -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
+ 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
override_dh_install:
dh_install --fail-missing
commit 633c7a6a5945e70165e63e07f89d3f453a97d905
Author: Emilio Pozuelo Monfort <po...@debian.org>
Date: Thu Jan 19 11:15:19 2017 +0100
Fix setting suid bit on Xorg.wrap
diff --git a/debian/changelog b/debian/changelog
index 9aea1cb..235cdb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.19.1-3) UNRELEASED; urgency=medium
+
+ * rules: Fix setting suid bit on Xorg.wrap.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 19 Jan 2017 11:14:40 +0100
+
xorg-server (2:1.19.1-2) unstable; urgency=medium
* rules: Fix udeb regression from dh migration. Should also fix FTBFS
diff --git a/debian/rules b/debian/rules
index 40c92f5..01b3513 100755
--- a/debian/rules
+++ b/debian/rules
@@ -260,11 +260,13 @@ abibumpcheck: debian/serverminver $(QUILT_STAMPFN)
rm -f $(SERVERMINVER).new; \
fi
-override_dh_install:
- dh_install --fail-missing
+override_dh_fixperms:
+ dh_fixperms
-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
+override_dh_install:
+ dh_install --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`; \
