summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdepim/debian/control
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-11-22 18:49:14 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-11-22 18:49:14 +0100
commit61fd4b9a795fa246b0822553f8cadae48c1d7a18 (patch)
treec61a0c13faad60a188161d10b05e75a61a5d39b0 /ubuntu/maverick/tdepim/debian/control
parent42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf (diff)
downloadtde-packaging-61fd4b9a795fa246b0822553f8cadae48c1d7a18.tar.gz
tde-packaging-61fd4b9a795fa246b0822553f8cadae48c1d7a18.zip
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>
Diffstat (limited to 'ubuntu/maverick/tdepim/debian/control')
-rw-r--r--ubuntu/maverick/tdepim/debian/control57
1 files changed, 14 insertions, 43 deletions
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 46481b8f1..5d4ba7037 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -22,7 +22,7 @@ Section: tde
Architecture: all
Replaces: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~)
Breaks: kdepim-kde3 (<< 4:14.0.0~), 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-kde3 (<< 4:14.0.0~), libkcal2b-trinity (<< 4:14.0.0~)
-Breaks: libkcal2b-kde3 (<< 4:14.0.0~), 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-kde3-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~)
-Breaks: libkcal2-kde3-dev (<< 4:14.0.0~), 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-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~)
-Breaks: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~)
+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
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,12 @@ 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~)
-Breaks: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~)
-Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev
+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~)
+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 +597,7 @@ Section: libdevel
Architecture: any
Replaces: libkpimexchange1-kde3-dev (<< 4:14.0.0~), libkpimexchange1-trinity-dev (<< 4:14.0.0~)
Breaks: libkpimexchange1-kde3-dev (<< 4:14.0.0~), 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.