xorg-server: Changes to 'ubuntu'
debian/changelog | 3 +++
debian/rules | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 380c6f4f0d096e73f0d1ac62f5cd083bf7c9bf9a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Sep 9 12:28:05 2011 +0300
debian/rules: Shift the xvfb-run test to be run later, to ensure that the binaries are installed.
diff --git a/debian/changelog b/debian/changelog
index cfcd691..e39dc48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low
* Update patch 500_xi2.1.patch to apply.
* Refresh patches.
* debian/rules: Add PATH for the xvfb-run check, otherwise Xvfb is not found.
+ * debian/rules: Shift the xvfb-run test to be run later, to ensure that the
+ binaries are installed.
[ Bryce Harrington ]
* debian/rules: Add check target invoking xvfb-run to test that it works
diff --git a/debian/rules b/debian/rules
index 2bb7d35..e1bfb71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -267,6 +267,10 @@ endif
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxf8_16bpp.so
install -m 755 debian/local/xvfb-run debian/tmp/main/usr/bin
+ # Make sure Xvfb at least starts up
+ PATH=debian/tmp/main/usr/bin/:/bin:/usr/bin \
+ debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true
+
install debian/local/xvfb-run.1 debian/tmp/main/usr/share/man/man1
ifneq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/tmp/main/usr/share/X11/xorg.conf.d
@@ -362,9 +366,5 @@ binary-indep: build install check
check:
dh_testdir
- # Make sure Xvfb at least starts up
- PATH=debian/tmp/main/usr/bin/:/bin:/usr/bin \
- debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
commit 7ff07ed964079684f121fc00de4d4ba5ac978406
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Sep 9 12:17:00 2011 +0300
debian/rules: Add PATH for the xvfb-run check, otherwise Xvfb is not found.
diff --git a/debian/changelog b/debian/changelog
index 17f5df6..cfcd691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low
* debian/rules: Modify the patch stampdir creation.
* Update patch 500_xi2.1.patch to apply.
* Refresh patches.
+ * debian/rules: Add PATH for the xvfb-run check, otherwise Xvfb is not found.
[ Bryce Harrington ]
* debian/rules: Add check target invoking xvfb-run to test that it works
diff --git a/debian/rules b/debian/rules
index f89a65f..2bb7d35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -363,7 +363,8 @@ check:
dh_testdir
# Make sure Xvfb at least starts up
- debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true
+ PATH=debian/tmp/main/usr/bin/:/bin:/usr/bin \
+ debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -nolisten tcp -noreset" true
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Reply to: