From d7ae33e913f04471d24f01baacb13b04e7eeb4f0 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 09:30:37 +0100 Subject: Updated debian package to use debhelper instead of cdbs. --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 0e5d4c1..2e18ada 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: qmenumodel Section: libs Priority: optional Maintainer: Renato Araujo Oliveira Filho -Build-Depends: debhelper (>= 8.0.0), - cdbs, +Build-Depends: debhelper (>= 9.0.0), cmake (>= 2.8.9), libglib2.0-dev, qtbase (>= 5.0), qtdeclarative (>= 5.0), -Standards-Version: 3.9.2 + python3 (>= 3.2), +Standards-Version: 3.9.3 Package: libqmenumodel0 Section: libs -- cgit v1.2.3 From 7ee5b380e6b4d25d971fe6fd4acc9a6e3dce74fc Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 10:21:00 +0100 Subject: Fixed control file to accept any python3 version. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 2e18ada..58073ce 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9.0.0), libglib2.0-dev, qtbase (>= 5.0), qtdeclarative (>= 5.0), - python3 (>= 3.2), + python3, Standards-Version: 3.9.3 Package: libqmenumodel0 -- cgit v1.2.3 From 89f52ae80a061cd40d5b927e292401a501359e77 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 11:09:33 +0100 Subject: Added 'dbus-test-runner' ad build dependency. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 58073ce..ab992cf 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9.0.0), qtbase (>= 5.0), qtdeclarative (>= 5.0), python3, + dbus-test-runner, Standards-Version: 3.9.3 Package: libqmenumodel0 -- cgit v1.2.3 From 07087af0ce285afa96565e851f3e65f20620fae5 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 11:51:50 +0100 Subject: Added missing opengl dependency. Necessary for examples. --- debian/control | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index ab992cf..2a2e8d9 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Build-Depends: debhelper (>= 9.0.0), qtdeclarative (>= 5.0), python3, dbus-test-runner, + libgles2-mesa-dev, + libgl-dev, Standards-Version: 3.9.3 Package: libqmenumodel0 -- cgit v1.2.3 From 49797fd4b489c31989d1e8a24e2b3bfa90b45825 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 13:09:44 +0100 Subject: Added xvfb option on cmake to enable run tests without X running. --- CMakeLists.txt | 10 ++++++++++ debian/control | 1 + debian/rules | 2 +- tests/client/CMakeLists.txt | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/CMakeLists.txt b/CMakeLists.txt index 261335a..d22194c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,16 @@ endif() add_subdirectory(libqmenumodel) # Tests Tools +set(XVFB_EXEC "") +option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtWidgets tests fails without X." FALSE) +if(USE_XVFB) + find_program(XVFB_RUN NAMES xvfb-run) + if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") + set(XVFB_EXEC ${XVFB_RUN} -a) + message(STATUS "Using xvfb-run to perform QtWidget tests.") + endif() +endif() + if(NOT DBUS_RUNNER) message(STATUS "dbus-test-runner not found tests disabled.") else() diff --git a/debian/control b/debian/control index 2a2e8d9..e4e9d1c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9.0.0), dbus-test-runner, libgles2-mesa-dev, libgl-dev, + xvfb, Standards-Version: 3.9.3 Package: libqmenumodel0 diff --git a/debian/rules b/debian/rules index 2364c9f..366a447 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 override_dh_auto_configure: - PATH=/opt/qt5/bin:${PATH} dh_auto_configure + PATH=/opt/qt5/bin:${PATH} dh_auto_configure -- -DUSE_XVFB=On override_dh_makeshlibs: dh_makeshlibs -Xlibqmenumodel-qml.so diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 9bce370..9209cc8 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -9,6 +9,7 @@ macro(declare_test testname) ) add_test(${testname} + ${XVFB_EXEC} ${DBUS_RUNNER} --task ${CMAKE_CURRENT_BINARY_DIR}/${testname} --task-name Client --task ${CMAKE_CURRENT_SOURCE_DIR}/script_${testname}.py --task-name Server -- cgit v1.2.3 From abd20beb045675f8a8e434e3de8e659d599e21f0 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 16:04:16 +0100 Subject: Added missing python dependencies. --- debian/control | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index e4e9d1c..9488dd7 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,9 @@ Build-Depends: debhelper (>= 9.0.0), qtbase (>= 5.0), qtdeclarative (>= 5.0), python3, + python-dbus, + python-gi, + gir1.2-glib-2.0, dbus-test-runner, libgles2-mesa-dev, libgl-dev, -- cgit v1.2.3 From bf5a53e949ffe0ebcf8578a0fc9062f63527dbc9 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Wed, 31 Oct 2012 16:36:28 +0100 Subject: Updated dependency list to use python3 packages. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9488dd7..298defd 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 9.0.0), qtbase (>= 5.0), qtdeclarative (>= 5.0), python3, - python-dbus, - python-gi, + python3-dbus, + python3-gi, gir1.2-glib-2.0, dbus-test-runner, libgles2-mesa-dev, -- cgit v1.2.3 From a086f905c9ded6f1738cd8ad657820c510a78fb6 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Tue, 6 Nov 2012 09:25:10 -0300 Subject: Removed 'xvfb' from the dependency list. --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 298defd..4a85338 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9.0.0), dbus-test-runner, libgles2-mesa-dev, libgl-dev, - xvfb, Standards-Version: 3.9.3 Package: libqmenumodel0 -- cgit v1.2.3