François Andriot 11 years ago
commit 22bcb2f1bd

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -1,11 +1,11 @@
.TH KABC2MUTT 1 .TH TDEABC2MUTT 1
.SH NAME .SH NAME
kabc2mutt \- kabc to mutt converter tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS .SH SYNOPSIS
.B kabc2mutt .B tdeabc2mutt
.I [Qt-options] [KDE-options] [options] .I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION .SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format. tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS
.TP .TP
.B --query \fI<substring>\fB .B --query \fI<substring>\fB

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -1,11 +1,11 @@
.TH KABC2MUTT 1 .TH TDEABC2MUTT 1
.SH NAME .SH NAME
kabc2mutt \- kabc to mutt converter tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS .SH SYNOPSIS
.B kabc2mutt .B tdeabc2mutt
.I [Qt-options] [KDE-options] [options] .I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION .SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format. tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS
.TP .TP
.B --query \fI<substring>\fB .B --query \fI<substring>\fB

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -1,11 +1,11 @@
.TH KABC2MUTT 1 .TH TDEABC2MUTT 1
.SH NAME .SH NAME
kabc2mutt \- kabc to mutt converter tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS .SH SYNOPSIS
.B kabc2mutt .B tdeabc2mutt
.I [Qt-options] [KDE-options] [options] .I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION .SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format. tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS
.TP .TP
.B --query \fI<substring>\fB .B --query \fI<substring>\fB

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -1,11 +1,11 @@
.TH KABC2MUTT 1 .TH TDEABC2MUTT 1
.SH NAME .SH NAME
kabc2mutt \- kabc to mutt converter tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS .SH SYNOPSIS
.B kabc2mutt .B tdeabc2mutt
.I [Qt-options] [KDE-options] [options] .I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION .SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format. tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS
.TP .TP
.B --query \fI<substring>\fB .B --query \fI<substring>\fB

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -1,26 +0,0 @@
.TH KABC2MUTT 1
.SH NAME
kabc2mutt \- kabc to mutt converter
.SH SYNOPSIS
.B kabc2mutt
.I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS
.TP
.B --query \fI<substring>\fB
Only show contacts where name or address matches \fI<substring>\fP.
.TP
.B --format \fI<format>\fB
Default format is `alias'. `query' returns
email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
.TP
.B --ignore-case
Make queries case insensitive.
.TP
.B --all-addresses
Return all mail addresses, not just the preferred one.
.so kdeopt.part
.SH SEE ALSO
.B kaddressbook
(1).

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -0,0 +1,26 @@
.TH TDEABC2MUTT 1
.SH NAME
tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS
.B tdeabc2mutt
.I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION
tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS
.TP
.B --query \fI<substring>\fB
Only show contacts where name or address matches \fI<substring>\fP.
.TP
.B --format \fI<format>\fB
Default format is `alias'. `query' returns
email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
.TP
.B --ignore-case
Make queries case insensitive.
.TP
.B --all-addresses
Return all mail addresses, not just the preferred one.
.so kdeopt.part
.SH SEE ALSO
.B kaddressbook
(1).

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

@ -141,9 +141,10 @@ $(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop

@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -161,9 +161,10 @@ endif
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif
@ -256,6 +257,7 @@ endif # archall detection
ifdef _cdbs_rules_debhelper ifdef _cdbs_rules_debhelper
DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
@ -263,7 +265,7 @@ ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
else else
dh_pycentral -p$(cdbs_curpkg) dh_pycentral -p$(cdbs_curpkg)
endif endif
dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
endif endif

@ -1,4 +1,4 @@
debian/tmp/opt/trinity/include/kopete/kabcpersistence.h debian/tmp/opt/trinity/include/kopete/tdeabcpersistence.h
debian/tmp/opt/trinity/include/kopete/kopete_export.h debian/tmp/opt/trinity/include/kopete/kopete_export.h
debian/tmp/opt/trinity/include/kopete/kopeteaccount.h debian/tmp/opt/trinity/include/kopete/kopeteaccount.h
debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h debian/tmp/opt/trinity/include/kopete/kopeteaccountmanager.h

@ -1,4 +1,4 @@
/opt/trinity/bin/kabc2mutt /opt/trinity/bin/tdeabc2mutt
/opt/trinity/bin/kaddressbook /opt/trinity/bin/kaddressbook
/opt/trinity/lib/trinity/kcm_kabconfig.la /opt/trinity/lib/trinity/kcm_kabconfig.la
/opt/trinity/lib/trinity/kcm_kabconfig.so /opt/trinity/lib/trinity/kcm_kabconfig.so

@ -1,2 +1,2 @@
debian/man/out/kabc2mutt-trinity.1 debian/man/out/tdeabc2mutt-trinity.1
debian/man/out/kaddressbook-trinity.1 debian/man/out/kaddressbook-trinity.1

@ -1,5 +1,5 @@
/opt/trinity/lib/trinity/kcal_kabc.la /opt/trinity/lib/trinity/kcal_tdeabc.la
/opt/trinity/lib/trinity/kcal_kabc.so /opt/trinity/lib/trinity/kcal_tdeabc.so
/opt/trinity/lib/trinity/kcal_localdir.la /opt/trinity/lib/trinity/kcal_localdir.la
/opt/trinity/lib/trinity/kcal_localdir.so /opt/trinity/lib/trinity/kcal_localdir.so
/opt/trinity/lib/trinity/kcal_local.la /opt/trinity/lib/trinity/kcal_local.la
@ -14,7 +14,7 @@
/opt/trinity/lib/libkholidays.so.1.0.0 /opt/trinity/lib/libkholidays.so.1.0.0
/opt/trinity/share/apps/libkholidays /opt/trinity/share/apps/libkholidays
/opt/trinity/share/services/tderesources/kcal/imap.desktop /opt/trinity/share/services/tderesources/kcal/imap.desktop
/opt/trinity/share/services/tderesources/kcal/kabc.desktop /opt/trinity/share/services/tderesources/kcal/tdeabc.desktop
/opt/trinity/share/services/tderesources/kcal/local.desktop /opt/trinity/share/services/tderesources/kcal/local.desktop
/opt/trinity/share/services/tderesources/kcal/localdir.desktop /opt/trinity/share/services/tderesources/kcal/localdir.desktop
/opt/trinity/share/services/tderesources/kcal/remote.desktop /opt/trinity/share/services/tderesources/kcal/remote.desktop

@ -1,26 +0,0 @@
.TH KABC2MUTT 1
.SH NAME
kabc2mutt \- kabc to mutt converter
.SH SYNOPSIS
.B kabc2mutt
.I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION
kabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS
.TP
.B --query \fI<substring>\fB
Only show contacts where name or address matches \fI<substring>\fP.
.TP
.B --format \fI<format>\fB
Default format is `alias'. `query' returns
email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
.TP
.B --ignore-case
Make queries case insensitive.
.TP
.B --all-addresses
Return all mail addresses, not just the preferred one.
.so kdeopt.part
.SH SEE ALSO
.B kaddressbook
(1).

@ -7,14 +7,14 @@ kaddressbook \- The KDE Address Book
.SH DESCRIPTION .SH DESCRIPTION
\fBKAddressBook\fP is the main address book application for KDE; it enables \fBKAddressBook\fP is the main address book application for KDE; it enables
you to manage your contacts efficiently and comfortably. Since it is based you to manage your contacts efficiently and comfortably. Since it is based
on the kabc library it supports resources, which can be used to load and save on the tdeabc library it supports resources, which can be used to load and save
your contacts to many different locations -- not just the local file system, your contacts to many different locations -- not just the local file system,
but also to LDAP servers and SQL databases. but also to LDAP servers and SQL databases.
The user interface is similar to MS Outlook and it supports different views The user interface is similar to MS Outlook and it supports different views
to represent the contact data differently; it also provides an incremental to represent the contact data differently; it also provides an incremental
search over all fields and a jump button bar to quickly access single entries. search over all fields and a jump button bar to quickly access single entries.
Since the underlying kabc library uses the vCard format (specified in RFC 2426) Since the underlying tdeabc library uses the vCard format (specified in RFC 2426)
as its default storage medium, KAddressBook mainly reflects the supported as its default storage medium, KAddressBook mainly reflects the supported
entry fields in its graphical user interface. entry fields in its graphical user interface.
.SH PROGRAM OPTIONS .SH PROGRAM OPTIONS

@ -0,0 +1,26 @@
.TH TDEABC2MUTT 1
.SH NAME
tdeabc2mutt \- tdeabc to mutt converter
.SH SYNOPSIS
.B tdeabc2mutt
.I [Qt-options] [KDE-options] [options]
.SH DESCRIPTION
tdeabc2mutt converts the KDE address book's entries to Mutt format.
.SH PROGRAM OPTIONS
.TP
.B --query \fI<substring>\fB
Only show contacts where name or address matches \fI<substring>\fP.
.TP
.B --format \fI<format>\fB
Default format is `alias'. `query' returns
email\fB<tab>\fPname\fB<tab>\fP, as needed by mutt's query_command.
.TP
.B --ignore-case
Make queries case insensitive.
.TP
.B --all-addresses
Return all mail addresses, not just the preferred one.
.so kdeopt.part
.SH SEE ALSO
.B kaddressbook
(1).

@ -71,9 +71,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
# #
## Move kaddressbook dependency of libkcal2b-trinity to Recommends ## Move kaddressbook dependency of libkcal2b-trinity to Recommends
#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
# -- -dRecommends \ # -- -dRecommends \
# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
# -dDepends # -dDepends
test-shlibdeps: test-shlibdeps:

@ -26,10 +26,10 @@
/opt/trinity/lib/trinity/knotes_scalix.so /opt/trinity/lib/trinity/knotes_scalix.so
/opt/trinity/lib/trinity/knotes_xmlrpc.la /opt/trinity/lib/trinity/knotes_xmlrpc.la
/opt/trinity/lib/trinity/knotes_xmlrpc.so /opt/trinity/lib/trinity/knotes_xmlrpc.so
/opt/trinity/lib/libkabckolab.so.0 /opt/trinity/lib/libtdeabckolab.so.0
/opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libtdeabckolab.so.0.0.0
/opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libtdeabcscalix.so.0
/opt/trinity/lib/libkabcscalix.so.0.0.0 /opt/trinity/lib/libtdeabcscalix.so.0.0.0
/opt/trinity/lib/libtdeabc_groupdav.so.1 /opt/trinity/lib/libtdeabc_groupdav.so.1
/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 /opt/trinity/lib/libtdeabc_groupdav.so.1.0.0
/opt/trinity/lib/libtdeabc_groupwise.so.1 /opt/trinity/lib/libtdeabc_groupwise.so.1

@ -10,10 +10,10 @@
/opt/trinity/include/kmailpartIface.h /opt/trinity/include/kmailpartIface.h
/opt/trinity/include/kontact /opt/trinity/include/kontact
/opt/trinity/include/korganizer /opt/trinity/include/korganizer
/opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libtdeabckolab.la
/opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libtdeabckolab.so
/opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libtdeabcscalix.la
/opt/trinity/lib/libkabcscalix.so /opt/trinity/lib/libtdeabcscalix.so
/opt/trinity/lib/libtdeabc_groupdav.la /opt/trinity/lib/libtdeabc_groupdav.la
/opt/trinity/lib/libtdeabc_groupdav.so /opt/trinity/lib/libtdeabc_groupdav.so
/opt/trinity/lib/libtdeabc_groupwise.la /opt/trinity/lib/libtdeabc_groupwise.la

@ -1,6 +1,6 @@
debian/tmp/opt/trinity/include/kprofilemethod.h debian/tmp/opt/trinity/include/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/tdeabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop

Loading…
Cancel
Save