summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <ukleinek@debian.org>2019-12-06 09:20:25 +0100
committerUwe Kleine-König <ukleinek@debian.org>2019-12-06 09:20:25 +0100
commitb3675246d9f540ad9d34942d2fafb57645f4f52a (patch)
treeb2578bd74f9c5314e33e491d653badb80b77cb23
parentff4056a25eeafc9c6cd5f02f147d7a84763a0ed8 (diff)
downloadrt-tests-b3675246d9f540ad9d34942d2fafb57645f4f52a.tar.gz
rt-tests-b3675246d9f540ad9d34942d2fafb57645f4f52a.tar.xz
[debian] Drop Conflicts: xenomai-runtime
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a3c8bd..ee0424e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rt-tests (1.5-2) UNRELEASED; urgency=medium
+
+ * drop Conflicts to xenomai-runtime which only exists in Jessie.
+
+ -- Uwe Kleine-König <ukleinek@debian.org> Fri, 06 Dec 2019 09:19:35 +0100
+
rt-tests (1.5-1) unstable; urgency=medium
* Fix selection for building with or without NUMA (Closes: #930836)
diff --git a/debian/control b/debian/control
index 0701dee..372dad0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Package: rt-tests
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
libnuma1 (>= 2.0.3) [amd64 i386 ia64 mips mipsel powerpc]
-Conflicts: xenomai-runtime
Description: Test programs for rt kernels
rt-tests contains a set of programs that test and measure various components
of real-time kernel behavior, such as timer latency, signal latency and the