This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libx11-keyboard-perl.
commit bddef305e1d28e8e6719b92096f036eb119f298d Author: gregor herrmann <[email protected]> Date: Thu May 14 00:54:19 2015 +0200 Simplify running the test suite. Use `xvfb-run -a' in debian/rules, and drop the manual X11 setup there. This also needs xauth as a build dependency in debian/control. Remove helper scripts in debian/helpers which are not needed anymore. --- debian/control | 3 +-- debian/helpers/X11_get_unused_socket | 15 --------------- debian/helpers/X11_launch_Xvfb | 9 --------- debian/helpers/X11_used_namespace_sockets | 13 ------------- debian/rules | 9 +-------- 5 files changed, 2 insertions(+), 47 deletions(-) diff --git a/debian/control b/debian/control index 700f8c6..b561363 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ Build-Depends: perl, libx11-protocol-perl, xvfb, - iproute2, - procps, + xauth, Standards-Version: 3.9.6 Homepage: https://metacpan.org/release/X11-Keyboard Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libx11-keyboard-perl.git diff --git a/debian/helpers/X11_get_unused_socket b/debian/helpers/X11_get_unused_socket deleted file mode 100755 index 8fa8422..0000000 --- a/debian/helpers/X11_get_unused_socket +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/perl - -my $X11_PORT = shift; -my $X11_USED_NAMESPACE_SOCKETS = shift; - -for ($i=$X11_PORT; $displ_found ne "true"; $i++) { - - if( "$X11_USED_NAMESPACE_SOCKETS" =~ m/\|$i\|/) { - $displ_found="false"; - } else { - $displ_found="true"; - print $i; - } - -} diff --git a/debian/helpers/X11_launch_Xvfb b/debian/helpers/X11_launch_Xvfb deleted file mode 100755 index 4edfb71..0000000 --- a/debian/helpers/X11_launch_Xvfb +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -x - -DISPLAY=$1 -XVFB_BINARY=$(type -p Xvfb) - -${XVFB_BINARY} -nolisten TCP :${DISPLAY} 1>/dev/null 2>/dev/null & -echo $$ \ No newline at end of file diff --git a/debian/helpers/X11_used_namespace_sockets b/debian/helpers/X11_used_namespace_sockets deleted file mode 100755 index 09b5b58..0000000 --- a/debian/helpers/X11_used_namespace_sockets +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -ss -xl | grep @/tmp/.X11-unix | \ -awk ' -{ - n=split($0,lines,"\n"); - for(i=1;i<=n;i++){ - line_delim=split(lines[i],cols," "); - col_delim=split(cols[5],sockets,"/X"); - printf ("|%s|\n",sockets[col_delim]); - }; -}; -' diff --git a/debian/rules b/debian/rules index 4d86780..71cc708 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,10 @@ #!/usr/bin/make -f -X11_PORT=40 -X11_USED_NAMESPACE_SOCKETS = $(shell debian/helpers//X11_used_namespace_sockets) -export DISPLAY=$(shell debian/helpers/X11_get_unused_socket $(X11_PORT) "$(X11_USED_NAMESPACE_SOCKETS)") -XVFB_PID=$(shell debian/helpers/X11_launch_Xvfb $(DISPLAY)) - %: dh $@ override_dh_auto_test: - DISPLAY=":$(DISPLAY)" dh_auto_test - # if the below fails, the build chroot will tear down the running Xvfb process... - -kill -SIGKILL $(XVFB_PID) + xvfb-run -a dh_auto_test get-orig-source: uscan --noconf --force-download --rename --download-current-version --destdir=.. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libx11-keyboard-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
