summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-12-25 18:47:03 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-12-25 18:48:26 +0100
commit1fe13987fc1ece28b36fc39032127a648ed862f3 (patch)
tree5b810850922dd058a38f8494848e25524e6f8e7d
parentd528497c48f4af95d15fa0b0027aaaf1d283ad1a (diff)
downloadtde-packaging-1fe13987fc1ece28b36fc39032127a648ed862f3.tar.gz
tde-packaging-1fe13987fc1ece28b36fc39032127a648ed862f3.zip
Fix cirucular dependency in tdepim on Debian and Ubuntu
This resolves Bug 2251 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/lenny/tdepim/debian/control2
-rw-r--r--debian/squeeze/tdepim/debian/control2
-rw-r--r--ubuntu/maverick/tdepim/debian/control2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index c6bd10d08..491be1311 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -501,7 +501,7 @@ Provides: libkcal2-trinity-dev
Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity
library and libkcal-trinity library.
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index c6bd10d08..491be1311 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -501,7 +501,7 @@ Provides: libkcal2-trinity-dev
Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev
Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
Conflicts: libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity
library and libkcal-trinity library.
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 1cd17adbd..5d6a91520 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -500,7 +500,7 @@ Architecture: any
Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev, libkcal2-trinity-dev
Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
Conflicts: libkcal2-kde3-dev, libkcal2-trinity-dev
-Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
+Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity
library and libkcal-trinity library.