diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-11-25 02:11:35 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-11-25 02:11:35 +0100 |
| commit | 69b9979782ea03a77c2366bb4298873fabb205e1 (patch) | |
| tree | e2c782f69ea12f48803b28194028ade7ee4867a3 | |
| parent | cd046fcfe14f7ece0852f8b2614d1eb912e05617 (diff) | |
| download | tde-packaging-69b9979782ea03a77c2366bb4298873fabb205e1.tar.gz tde-packaging-69b9979782ea03a77c2366bb4298873fabb205e1.zip | |
Package libkcal2 moved from Breaks to Conflicts, for a smooth upgrade on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | debian/lenny/tdepim/debian/control | 11 | ||||
| -rw-r--r-- | debian/squeeze/tdepim/debian/control | 11 | ||||
| -rw-r--r-- | ubuntu/maverick/tdepim/debian/control | 11 |
3 files changed, 18 insertions, 15 deletions
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control index b416f4234..c6bd10d08 100644 --- a/debian/lenny/tdepim/debian/control +++ b/debian/lenny/tdepim/debian/control @@ -481,9 +481,9 @@ Package: libtdepim1a-trinity Section: libs Architecture: any Provides: libkcal2b-trinity -Replaces: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Breaks: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Conflicts: libkcal2-trinity, libkcal2a-trinity +Replaces: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity +Breaks: libkdepim1a-trinity (<< 4:14.0.0~) +Conflicts: libkcal2-trinity, libkcal2a-trinity, libkcal2b-trinity Depends: ${shlibs:Depends} Suggests: tdepim-tderesources-trinity Description: Trinity PIM library @@ -498,8 +498,9 @@ Package: libtdepim1-trinity-dev Section: libdevel Architecture: any Provides: libkcal2-trinity-dev -Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) -Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) +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 Description: Trinity PIM library [development] This is the development package which contains the headers for the libtdepim-trinity diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control index b416f4234..c6bd10d08 100644 --- a/debian/squeeze/tdepim/debian/control +++ b/debian/squeeze/tdepim/debian/control @@ -481,9 +481,9 @@ Package: libtdepim1a-trinity Section: libs Architecture: any Provides: libkcal2b-trinity -Replaces: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Breaks: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Conflicts: libkcal2-trinity, libkcal2a-trinity +Replaces: libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-trinity +Breaks: libkdepim1a-trinity (<< 4:14.0.0~) +Conflicts: libkcal2-trinity, libkcal2a-trinity, libkcal2b-trinity Depends: ${shlibs:Depends} Suggests: tdepim-tderesources-trinity Description: Trinity PIM library @@ -498,8 +498,9 @@ Package: libtdepim1-trinity-dev Section: libdevel Architecture: any Provides: libkcal2-trinity-dev -Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) -Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) +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 Description: Trinity PIM library [development] This is the development package which contains the headers for the libtdepim-trinity diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control index 5d4ba7037..1cd17adbd 100644 --- a/ubuntu/maverick/tdepim/debian/control +++ b/ubuntu/maverick/tdepim/debian/control @@ -481,9 +481,9 @@ Package: libtdepim1a-trinity Section: libs Architecture: any Provides: libkcal2b-trinity -Replaces: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-kde3 (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Breaks: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-kde3 (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~) -Conflicts: libkcal2-trinity, libkcal2a-trinity +Replaces: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~), libkcal2b-kde3, libkcal2b-trinity +Breaks: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~) +Conflicts: libkcal2-trinity, libkcal2a-trinity, libkcal2b-kde3, libkcal2b-trinity Depends: ${shlibs:Depends} Suggests: tdepim-tderesources-trinity Description: Trinity PIM library @@ -497,8 +497,9 @@ Description: Trinity PIM library Package: libtdepim1-trinity-dev Section: libdevel Architecture: any -Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) -Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-kde3-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~) +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 Description: Trinity PIM library [development] This is the development package which contains the headers for the libtdepim-trinity |