diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-12-25 18:47:03 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-12-25 19:00:56 +0100 |
| commit | e7624df85cd25b05407e5f8aa43681e2692372dc (patch) | |
| tree | 420e4fc371435affd09ccbf73df5ebcf8c1e95a6 | |
| parent | 19215f8229ac06a0b2170572f8bfc0db572351f2 (diff) | |
| download | tde-packaging-e7624df85cd25b05407e5f8aa43681e2692372dc.tar.gz tde-packaging-e7624df85cd25b05407e5f8aa43681e2692372dc.zip | |
Fix cirucular dependency in tdepim on Debian and Ubuntu
This resolves Bug 2251
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1fe13987fc1ece28b36fc39032127a648ed862f3)
| -rw-r--r-- | debian/lenny/tdepim/debian/control | 2 | ||||
| -rw-r--r-- | debian/squeeze/tdepim/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/tdepim/debian/control | 2 |
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. |