Merge package libkcal2 into libtdepim1 on Debian and Ubuntu

This resolves circular dependency - Bug 2197

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 15 insertions, 43 deletions

diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 19694c257..b416f4234 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
 Architecture: all
 Replaces: kdepim-trinity (<< 4:14.0.0~)
 Breaks: kdepim-trinity (<< 4:14.0.0~)
-Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libkcal2b-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
+Depends: akregator-trinity (>= ${Source-Version}), kaddressbook-trinity (>= ${Source-Version}), kalarm-trinity (>= ${Source-Version}), kandy-trinity (>= ${Source-Version}), karm-trinity (>= ${Source-Version}), tdepim-tdefile-plugins-trinity (>= ${Source-Version}), tdepim-tdeio-plugins-trinity (>= ${Source-Version}), tdepim-tderesources-trinity (>= ${Source-Version}), tdepim-wizards-trinity (>= ${Source-Version}), kitchensync-trinity (>= ${Source-Version}), kleopatra-trinity (>= ${Source-Version}), kmail-trinity (>= ${Source-Version}), kmailcvt-trinity (>= ${Source-Version}), knode-trinity (>= ${Source-Version}), knotes-trinity (>= ${Source-Version}), konsolekalendar-trinity (>= ${Source-Version}), kontact-trinity (>= ${Source-Version}), korganizer-trinity (>= ${Source-Version}), korn-trinity (>= ${Source-Version}), ktnef-trinity (>= ${Source-Version}), libindex0-trinity (>= ${Source-Version}), libtdepim1a-trinity (>= ${Source-Version}), libkgantt0-trinity (>= ${Source-Version}), libkleopatra1-trinity (>= ${Source-Version}), libkpimexchange1-trinity (>= ${Source-Version}), libkpimidentities1-trinity (>= ${Source-Version}), libksieve0-trinity (>= ${Source-Version}), libktnef1-trinity (>= ${Source-Version}), libmimelib1c2a-trinity (>= ${Source-Version})
 Suggests: tdepim-trinity-doc-html
 Description: Personal Information Management apps from the official Trinity release
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@@ -60,7 +60,7 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
  kontact-trinity (= ${Source-Version}),
  korganizer-trinity (= ${Source-Version}),
  libkpimidentities1-trinity (= ${Source-Version}),
- libkcal2-trinity-dev (= ${Source-Version}), libical-dev,
+ libical-dev,
  libtdepim1-trinity-dev (= ${Source-Version}),
  libkgantt0-trinity-dev (= ${Source-Version}),
  libkleopatra1-trinity-dev (= ${Source-Version}),
@@ -477,48 +477,19 @@ Description: Trinity indexing library [development]
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
 
-Package: libkcal2b-trinity
-Section: libs
-Architecture: any
-Replaces: libkcal2b-trinity (<< 4:14.0.0~)
-Breaks: libkcal2b-trinity (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Recommends: ${shlibs:Recommends}
-Conflicts: libkcal2-trinity, libkcal2a-trinity
-Suggests: tdepim-tderesources-trinity
-Description: Trinity calendaring library
- This library provides a C++ API for handling the vCalendar and iCalendar
- formats.
- .
- This is the runtime package for programs that use the libkcal-trinity library.
- .
- This package is part of Trinity, and a component of the TDE PIM module.
- See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
-
-Package: libkcal2-trinity-dev
-Section: libdevel
-Architecture: any
-Replaces: libkcal2-trinity-dev (<< 4:14.0.0~)
-Breaks: libkcal2-trinity-dev (<< 4:14.0.0~)
-Depends: libkcal2b-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version})
-Description: Trinity calendaring library [development]
- This library provides a C++ API for handling the vCalendar and iCalendar
- formats.
- .
- This is the development package which contains the headers for the libkcal-trinity
- library.
- .
- This package is part of Trinity, and a component of the TDE PIM module.
- See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
-
 Package: libtdepim1a-trinity
 Section: libs
 Architecture: any
-Replaces: libkdepim1a-trinity (<< 4:14.0.0~)
-Breaks: libkdepim1a-trinity (<< 4:14.0.0~)
+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
 Depends: ${shlibs:Depends}
+Suggests: tdepim-tderesources-trinity
 Description: Trinity PIM library
  This is the runtime package for programs that use the libtdepim-trinity library.
+ This package also provides a C++ API for handling the vCalendar and iCalendar
+ formats (libkcal-trinity).
  .
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@@ -526,12 +497,13 @@ Description: Trinity PIM library
 Package: libtdepim1-trinity-dev
 Section: libdevel
 Architecture: any
-Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~)
-Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
+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~)
+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
- library.
+ library and libkcal-trinity library.
  .
  This package is part of Trinity, and a component of the TDE PIM module.
  See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@@ -626,7 +598,7 @@ Section: libdevel
 Architecture: any
 Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0~)
 Breaks: libkpimexchange1-trinity-dev (<< 4:14.0.0~)
-Depends: libkpimexchange1-trinity (= ${Source-Version}), libkcal2-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
+Depends: libkpimexchange1-trinity (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version})
 Description: Trinity PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange-trinity library.