summaryrefslogtreecommitdiffstats
path: root/dilos/tdelibs/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-02-27 15:36:26 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-04-10 14:46:15 +0200
commit16245e8cf044d5b6cfd87177461ac2fe06ba97de (patch)
tree854387766ff851008d453b2f1953bf138f1fa2fd /dilos/tdelibs/debian
parent5619de739976980a135e73c0611d4a347bd7b55f (diff)
downloadtde-packaging-16245e8cf044d5b6cfd87177461ac2fe06ba97de.tar.gz
tde-packaging-16245e8cf044d5b6cfd87177461ac2fe06ba97de.zip
DilOS tdelibs: Add kamera-trinity (<< 4:14.0.8~) to Conflicts
for tdelibs-data-trinity to ensure smooth upgrade. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit a0e52cbc9e2575c55db35d3e5d458f44bfe95267)
Diffstat (limited to 'dilos/tdelibs/debian')
-rw-r--r--dilos/tdelibs/debian/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/dilos/tdelibs/debian/control b/dilos/tdelibs/debian/control
index 8aebf2f83..027c90da9 100644
--- a/dilos/tdelibs/debian/control
+++ b/dilos/tdelibs/debian/control
@@ -45,7 +45,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