summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-11-28 22:42:08 +0100
committerSlávek Banko <slavek.banko@axis.cz>2018-11-28 22:42:46 +0100
commit221f754b33e972b983198d98f72c7551fb049818 (patch)
tree78785453340129e1b1df74044b5ee2b6aa8f33bd /debian
parent3e86caf70fc7ecc2a85c442e2c6850e5db4dbaa2 (diff)
downloadtde-packaging-221f754b33e972b983198d98f72c7551fb049818.tar.gz
tde-packaging-221f754b33e972b983198d98f72c7551fb049818.zip
DEB tdelibs: Add ksysv-trinity (<< 4:14.0.6~) to Conflicts
for tdelibs-data-trinity to ensure smooth upgrade. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 13a399839238b84ad9b951e3a061b0975e12e79c)
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/tdelibs/debian/control2
-rw-r--r--debian/squeeze/tdelibs/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 03ea02fcc..d2a553790 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/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~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 03ea02fcc..d2a553790 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/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~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications