xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++--
debian/control | 1 +
debian/rules | 8 +++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit b55289248415579757ace3f4163d2441ee1fec90
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Aug 24 23:33:48 2011 -0700
Add a check target to rules, which invokes xvfb-run to verify it works.
diff --git a/debian/changelog b/debian/changelog
index 7ea4721..67936a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low
[ Bryce Harrington ]
* debian/rules: Add check target invoking xvfb-run to test that it works
+ * debian/control: Add build dependency on xauth, required by xvfb-run
-- Bryce Harrington <bryce@ubuntu.com> Wed, 24 Aug 2011 19:39:26 -0700
diff --git a/debian/control b/debian/control
index f2446c9..88cde28 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
flex,
automake,
libtool,
+ xauth,
xutils-dev (>= 1:7.5+4),
xfonts-utils (>= 1:7.5+1),
x11proto-bigreqs-dev (>= 1:1.1.0),
diff --git a/debian/rules b/debian/rules
index 05d8b4c..f89a65f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -361,7 +361,9 @@ binary-indep: build install check
check:
dh_testdir
- debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -noreset" true
+
+ # Make sure Xvfb at least starts up
+ 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 cddcb092536dd55ffb02ee57443d1df519bd330d
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Aug 24 19:57:11 2011 -0700
Add a check target which invokes xvfb-run to verify it works.
(Note, this fails due to not finding xauth, so that needs worked around)
diff --git a/debian/changelog b/debian/changelog
index 204c337..7ea4721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.10.4-1ubuntu2) UNRELEASED; urgency=low
[ Christopher James Halse Rogers ]
* Drop i8xx-disablement patch. 2.6.39 and later kernels contain a patch
@@ -14,7 +14,10 @@ xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low
* Update patch 500_xi2.1.patch to apply.
* Refresh patches.
- -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 01 Aug 2011 16:27:52 +1000
+ [ Bryce Harrington ]
+ * debian/rules: Add check target invoking xvfb-run to test that it works
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 24 Aug 2011 19:39:26 -0700
xorg-server (2:1.10.4-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 812ec22..05d8b4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -351,7 +351,7 @@ endif
# Build architecture-independent files here
-binary-indep: build install
+binary-indep: build install check
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-initial
dh_install -i --sourcedir=debian/tmp
dh_installdocs -i
@@ -359,5 +359,9 @@ binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-deb
+check:
+ dh_testdir
+ debian/tmp/main/usr/bin/xvfb-run -s "-screen 0 1280x1024x24 -noreset" true
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
Reply to: