summaryrefslogtreecommitdiffstats
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:08 +0100
commit13a399839238b84ad9b951e3a061b0975e12e79c (patch)
tree7f9de6b296be8ed00f614d8af82e86fd8d6ea4e6
parent631492524cb02ce875e0f05b8c0b35d5b4222368 (diff)
downloadtde-packaging-13a399839238b84ad9b951e3a061b0975e12e79c.tar.gz
tde-packaging-13a399839238b84ad9b951e3a061b0975e12e79c.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>
-rw-r--r--debian/lenny/tdelibs/debian/control2
-rw-r--r--debian/squeeze/tdelibs/debian/control2
-rw-r--r--ubuntu/maverick/tdelibs/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 9e41a81c4..c9a956401 100644
--- 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
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 9e41a81c4..c9a956401 100644
--- 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
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index d2dd12b4b..ab5e5c85f 100644
--- 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