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>
pull/3/head
Slávek Banko 10 years ago
parent 42aa1eb336
commit 61fd4b9a79

@ -22,7 +22,7 @@ Section: tde
Architecture: all Architecture: all
Replaces: kdepim-trinity (<< 4:14.0.0~) Replaces: kdepim-trinity (<< 4:14.0.0~)
Breaks: 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 Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release Description: Personal Information Management apps from the official Trinity release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@ -60,7 +60,7 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
kontact-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}),
korganizer-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}),
libkpimidentities1-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}),
libkcal2-trinity-dev (= ${Source-Version}), libical-dev, libical-dev,
libtdepim1-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}),
libkgantt0-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}),
libkleopatra1-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. 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. 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 Package: libtdepim1a-trinity
Section: libs Section: libs
Architecture: any Architecture: any
Replaces: libkdepim1a-trinity (<< 4:14.0.0~) Provides: libkcal2b-trinity
Breaks: libkdepim1a-trinity (<< 4:14.0.0~) 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} Depends: ${shlibs:Depends}
Suggests: tdepim-tderesources-trinity
Description: Trinity PIM library Description: Trinity PIM library
This is the runtime package for programs that use the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -526,12 +497,13 @@ Description: Trinity PIM library
Package: libtdepim1-trinity-dev Package: libtdepim1-trinity-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~) Provides: libkcal2-trinity-dev
Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~) Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~)
Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev 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] Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -626,7 +598,7 @@ Section: libdevel
Architecture: any Architecture: any
Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0~) Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0~)
Breaks: 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] Description: Trinity PIM Exchange library [development]
This is the development package which contains the headers for the This is the development package which contains the headers for the
libkpimexchange-trinity library. libkpimexchange-trinity library.

@ -1,8 +0,0 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so

@ -1,21 +0,0 @@
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -1,3 +1,11 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/include/tdepimmacros.h /opt/trinity/include/tdepimmacros.h
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so
/opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.la
/opt/trinity/lib/libtdepim.so /opt/trinity/lib/libtdepim.so

@ -1,12 +1,33 @@
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so /opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la /opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1
/opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/lib/libtdepim.so.1.0.0
/opt/trinity/share/apps/tdepimwidgets /opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/apps/libtdepim /opt/trinity/share/apps/libtdepim
/opt/trinity/share/apps/tdepim /opt/trinity/share/apps/tdepim
/opt/trinity/share/apps/tdepimwidgets
/opt/trinity/share/config.kcfg/pimemoticons.kcfg /opt/trinity/share/config.kcfg/pimemoticons.kcfg
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -37,7 +37,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
shlibs_ver=4:3.5.7 shlibs_ver=4:3.5.7
DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
@ -62,20 +61,6 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \ $(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
-dDepends # Since -u args go first in dpkg-shlibdeps call -dDepends # Since -u args go first in dpkg-shlibdeps call
## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
# -Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
# -- -dRecommends \
# debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
# -dDepends
#
## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends
test-shlibdeps: test-shlibdeps:
@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity) @echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity)

@ -22,7 +22,7 @@ Section: tde
Architecture: all Architecture: all
Replaces: kdepim-trinity (<< 4:14.0.0~) Replaces: kdepim-trinity (<< 4:14.0.0~)
Breaks: 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 Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release Description: Personal Information Management apps from the official Trinity release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@ -60,7 +60,7 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
kontact-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}),
korganizer-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}),
libkpimidentities1-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}),
libkcal2-trinity-dev (= ${Source-Version}), libical-dev, libical-dev,
libtdepim1-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}),
libkgantt0-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}),
libkleopatra1-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. 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. 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 Package: libtdepim1a-trinity
Section: libs Section: libs
Architecture: any Architecture: any
Replaces: libkdepim1a-trinity (<< 4:14.0.0~) Provides: libkcal2b-trinity
Breaks: libkdepim1a-trinity (<< 4:14.0.0~) 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} Depends: ${shlibs:Depends}
Suggests: tdepim-tderesources-trinity
Description: Trinity PIM library Description: Trinity PIM library
This is the runtime package for programs that use the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -526,12 +497,13 @@ Description: Trinity PIM library
Package: libtdepim1-trinity-dev Package: libtdepim1-trinity-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~) Provides: libkcal2-trinity-dev
Breaks: libkdepim1-trinity-dev (<< 4:14.0.0~) Replaces: libkdepim1-trinity-dev (<< 4:14.0.0~), libkcal2-trinity-dev (<< 4:14.0.0~)
Depends: libtdepim1a-trinity (= ${Source-Version}), tdelibs14-trinity-dev 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] Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -626,7 +598,7 @@ Section: libdevel
Architecture: any Architecture: any
Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0~) Replaces: libkpimexchange1-trinity-dev (<< 4:14.0.0~)
Breaks: 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] Description: Trinity PIM Exchange library [development]
This is the development package which contains the headers for the This is the development package which contains the headers for the
libkpimexchange-trinity library. libkpimexchange-trinity library.

@ -1,8 +0,0 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so

@ -1,21 +0,0 @@
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -1,3 +1,11 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/include/tdepimmacros.h /opt/trinity/include/tdepimmacros.h
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so
/opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.la
/opt/trinity/lib/libtdepim.so /opt/trinity/lib/libtdepim.so

@ -1,12 +1,33 @@
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so /opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la /opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1
/opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/lib/libtdepim.so.1.0.0
/opt/trinity/share/apps/tdepimwidgets /opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/apps/libtdepim /opt/trinity/share/apps/libtdepim
/opt/trinity/share/apps/tdepim /opt/trinity/share/apps/tdepim
/opt/trinity/share/apps/tdepimwidgets
/opt/trinity/share/config.kcfg/pimemoticons.kcfg /opt/trinity/share/config.kcfg/pimemoticons.kcfg
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -37,7 +37,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
shlibs_ver=4:3.5.7 shlibs_ver=4:3.5.7
DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
@ -62,20 +61,6 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \ $(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
-dDepends # Since -u args go first in dpkg-shlibdeps call -dDepends # Since -u args go first in dpkg-shlibdeps call
## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
# -Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
# -- -dRecommends \
# debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
# -dDepends
#
## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends
test-shlibdeps: test-shlibdeps:
@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity) @echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity)

@ -22,7 +22,7 @@ Section: tde
Architecture: all Architecture: all
Replaces: kdepim-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~) 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~) 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 Suggests: tdepim-trinity-doc-html
Description: Personal Information Management apps from the official Trinity release Description: Personal Information Management apps from the official Trinity release
TDE (the Trinity Desktop Environment) is a powerful Open Source graphical TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
@ -60,7 +60,7 @@ Depends: kaddressbook-trinity (= ${Source-Version}),
kontact-trinity (= ${Source-Version}), kontact-trinity (= ${Source-Version}),
korganizer-trinity (= ${Source-Version}), korganizer-trinity (= ${Source-Version}),
libkpimidentities1-trinity (= ${Source-Version}), libkpimidentities1-trinity (= ${Source-Version}),
libkcal2-trinity-dev (= ${Source-Version}), libical-dev, libical-dev,
libtdepim1-trinity-dev (= ${Source-Version}), libtdepim1-trinity-dev (= ${Source-Version}),
libkgantt0-trinity-dev (= ${Source-Version}), libkgantt0-trinity-dev (= ${Source-Version}),
libkleopatra1-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. 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. 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 Package: libtdepim1a-trinity
Section: libs Section: libs
Architecture: any Architecture: any
Replaces: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~) Provides: libkcal2b-trinity
Breaks: libkdepim1a-kde3 (<< 4:14.0.0~), libkdepim1a-trinity (<< 4:14.0.0~) 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} Depends: ${shlibs:Depends}
Suggests: tdepim-tderesources-trinity
Description: Trinity PIM library Description: Trinity PIM library
This is the runtime package for programs that use the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -526,12 +497,12 @@ Description: Trinity PIM library
Package: libtdepim1-trinity-dev Package: libtdepim1-trinity-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Replaces: libkdepim1-kde3-dev (<< 4:14.0.0~), libkdepim1-trinity-dev (<< 4:14.0.0~) 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~) 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}), tdelibs14-trinity-dev Depends: libtdepim1a-trinity (= ${Source-Version}), libktnef1-trinity-dev (= ${Source-Version}), tdelibs14-trinity-dev
Description: Trinity PIM library [development] Description: Trinity PIM library [development]
This is the development package which contains the headers for the libtdepim-trinity 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. 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. See the 'tde-trinity' and 'tdepim-trinity' packages for more information.
@ -626,7 +597,7 @@ Section: libdevel
Architecture: any Architecture: any
Replaces: libkpimexchange1-kde3-dev (<< 4:14.0.0~), libkpimexchange1-trinity-dev (<< 4:14.0.0~) 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~) 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] Description: Trinity PIM Exchange library [development]
This is the development package which contains the headers for the This is the development package which contains the headers for the
libkpimexchange-trinity library. libkpimexchange-trinity library.

@ -1,8 +0,0 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so

@ -1,21 +0,0 @@
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -1,3 +1,11 @@
/opt/trinity/include/libemailfunctions/idmapper.h
/opt/trinity/include/libkcal
/opt/trinity/include/tdepimmacros.h /opt/trinity/include/tdepimmacros.h
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
/opt/trinity/lib/libkcal_resourceremote.so
/opt/trinity/lib/libkholidays.la
/opt/trinity/lib/libkholidays.so
/opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.la
/opt/trinity/lib/libtdepim.so /opt/trinity/lib/libtdepim.so

@ -1,12 +1,33 @@
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la /opt/trinity/lib/libkcal.so.2
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so /opt/trinity/lib/libkcal.so.2.0.0
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la /opt/trinity/lib/libkcal_resourceremote.so.1
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so /opt/trinity/lib/libkcal_resourceremote.so.1.0.0
/opt/trinity/lib/libkholidays.so.1
/opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/lib/libtdepim.so.1 /opt/trinity/lib/libtdepim.so.1
/opt/trinity/lib/libtdepim.so.1.0.0 /opt/trinity/lib/libtdepim.so.1.0.0
/opt/trinity/share/apps/tdepimwidgets /opt/trinity/lib/trinity/kcal_local.la
/opt/trinity/lib/trinity/kcal_local.so
/opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_remote.la
/opt/trinity/lib/trinity/kcal_remote.so
/opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.la
/opt/trinity/lib/trinity/plugins/designer/tdepartsdesignerplugin.so
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.la
/opt/trinity/lib/trinity/plugins/designer/tdepimwidgets.so
/opt/trinity/share/apps/libkholidays
/opt/trinity/share/apps/libtdepim /opt/trinity/share/apps/libtdepim
/opt/trinity/share/apps/tdepim /opt/trinity/share/apps/tdepim
/opt/trinity/share/apps/tdepimwidgets
/opt/trinity/share/config.kcfg/pimemoticons.kcfg /opt/trinity/share/config.kcfg/pimemoticons.kcfg
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_fewer.png
/opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png /opt/trinity/share/icons/crystalsvg/22x22/actions/button_more.png
/opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop
/opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal_manager.desktop

@ -37,7 +37,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
shlibs_ver=4:3.5.7 shlibs_ver=4:3.5.7
DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))' DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
@ -62,20 +61,6 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \ $(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
-dDepends # Since -u args go first in dpkg-shlibdeps call -dDepends # Since -u args go first in dpkg-shlibdeps call
## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
# -Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
# -- -dRecommends \
# debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
# -dDepends
#
## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends
test-shlibdeps: test-shlibdeps:
@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity) @echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity)

Loading…
Cancel
Save