From 0dfbc5f7c11b4f228cd5176fba06c1098d3c4691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 10 Jan 2020 10:05:31 +0100 Subject: DEB tdelibs: Add kamera-trinity (<< 4:14.0.8~) to Conflicts for tdelibs-data-trinity to ensure smooth upgrade. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit f03fe2f1447badd293be7bf028a1839eeaf8dd5f) --- debian/_base/tdelibs/debian/control | 2 +- ubuntu/_base/tdelibs/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/_base/tdelibs/debian/control b/debian/_base/tdelibs/debian/control index d2a553790..d95938a64 100644 --- a/debian/_base/tdelibs/debian/control +++ b/debian/_base/tdelibs/debian/control @@ -43,7 +43,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-trinity (<< 4:14.0.0~) -Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~) +Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~) Depends: hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications diff --git a/ubuntu/_base/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control index 6f8d18f51..0185d2c0d 100644 --- a/ubuntu/_base/tdelibs/debian/control +++ b/ubuntu/_base/tdelibs/debian/control @@ -44,7 +44,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) -Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~) +Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~) Depends: hicolor-icon-theme Provides: tdelibs-data Description: core shared data for all TDE applications -- cgit v1.2.1