From e7624df85cd25b05407e5f8aa43681e2692372dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 25 Dec 2014 18:47:03 +0100 Subject: Fix cirucular dependency in tdepim on Debian and Ubuntu This resolves Bug 2251 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 1fe13987fc1ece28b36fc39032127a648ed862f3) --- debian/lenny/tdepim/debian/control | 2 +- debian/squeeze/tdepim/debian/control | 2 +- 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. -- cgit v1.2.3