From 18faab06ff10ddd37c351f18a35b13f2d4111286 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 6 Jul 2016 19:33:28 +0100
Subject: [PATCH] chaiwala-tests: replace libreoffice/ with a symlink into
apertis-tests
There's no point in providing both.
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3635
---
Makefile | 1 -
debian/chaiwala-tests.links | 1 +
debian/control | 5 ++++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 4e12dd8..bbde37b 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ SUBDIRS = \
glib/automated/ \
gstreamer-buffering/automated/ \
gupnp/automated/ \
- libreoffice/automated/ \
librest/automated/ \
libsoup/automated/ \
networking/proxy-manual/ \
diff --git a/debian/chaiwala-tests.links b/debian/chaiwala-tests.links
index b2ce6e2..27ce837 100644
--- a/debian/chaiwala-tests.links
+++ b/debian/chaiwala-tests.links
@@ -1,3 +1,4 @@
usr/lib/apertis-tests/cgroups usr/lib/chaiwala-tests/cgroups
usr/lib/apertis-tests/dbus/dos-match-rules usr/share/chaiwala-tests/dbus-dos-match-rules/manual
usr/lib/apertis-tests/dbus/dos-reply-time usr/share/chaiwala-tests/dbus-dos-reply-time/manual
+usr/lib/apertis-tests/libreoffice usr/share/chaiwala-tests/libreoffice
diff --git a/debian/control b/debian/control
index 6350cc9..06ddbee 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,10 @@ Depends:
${misc:Depends},
${python3:Depends},
${python:Depends},
+Breaks:
+ chaiwala-tests (<< ${binary:Version}),
+Replaces:
+ chaiwala-tests (<< ${binary:Version}),
Description: automated and manual test definitions
This package installs test scripts, test data and other pieces of
automated and manual tests.
@@ -246,7 +250,6 @@ Depends:
apparmor (>= 2.8.0-0ubuntu5co7),
apparmor-profiles,
chaiwala-apparmor-profiles,
- chaiwala-tests (>= 20130318.0),
libreoffice-calc,
libreoffice-impress,
libreoffice-writer,
--
GitLab