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>
6 years ago · 13a3998392
parent 631492524c
commit 13a3998392
3 changed files with 3 additions and 3 deletions
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@ -44,7 +44,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
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@ -44,7 +44,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
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@ -45,7 +45,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~)
+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~)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications