Update to 2.1.4

------
v2.1.4
------

[jan] Fix character set encoding of exported vCards.
[mjr] Fix fatal error when exporting to vCard.
[cjh] Organize basic search form from left to right (Request 4914).
[jan] Fix links to only show contacts or lists, or both.
[mjr] Don't remember the lastly selected address book in the session, if it
      was not browseable.
[mjr] Fix bug that caused counting the number of contacts in a shared SQL
      source to return the count of the user's default address book instead.
[mjr] Fix bug that caused the wrong address book to be deleted when replacing
      an address book during import.

------
v2.1.3
------
[jan] Support departments in vCard's ORG properties (martin@matuska.org,
      Request 4285).
[cjh] Fix LDAP driver check for whether objects need to be renamed (Bug 4468).
[jan] Fix generation of mailto: links if IMP is not installed (Bug 4334).
[jan] Show error message if imported file didn't contain contacts (Bug 4260).
[jan] Remember the lastly selected address book during the session.
[jan] Add categories from imported contacts to the user's categories.

3 files changed, 12 insertions, 8 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 0af35a93721..79ef7715dbc 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/08/05 12:52:25 adrianp Exp $
+# $NetBSD: Makefile,v 1.20 2007/03/18 12:14:05 adrianp Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -18,7 +18,7 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.1.2
+TURBAVER=	2.1.4
 PAXDIRS=	lib locale po scripts templates themes
 USE_TOOLS+=	perl:run
 
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index 77a6fcfb045..ea834beeffe 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/05 12:52:25 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/03/18 12:14:05 adrianp Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -39,10 +39,12 @@ share/horde/turba/lib/Turba.php
 share/horde/turba/lib/api.php
 share/horde/turba/lib/base.php
 share/horde/turba/lib/prefs.php
+share/horde/turba/lib/tests/tovcard.phpt
 share/horde/turba/lib/version.php
 share/horde/turba/locale/ar_SY/LC_MESSAGES/turba.mo
 share/horde/turba/locale/bg_BG/LC_MESSAGES/turba.mo
 share/horde/turba/locale/ca_ES/LC_MESSAGES/turba.mo
+share/horde/turba/locale/ca_ES/help.xml
 share/horde/turba/locale/cs_CZ/LC_MESSAGES/turba.mo
 share/horde/turba/locale/da_DK/LC_MESSAGES/turba.mo
 share/horde/turba/locale/de_DE/LC_MESSAGES/turba.mo
@@ -57,6 +59,7 @@ share/horde/turba/locale/fa_IR/help.xml
 share/horde/turba/locale/fi_FI/LC_MESSAGES/turba.mo
 share/horde/turba/locale/fi_FI/help.xml
 share/horde/turba/locale/fr_FR/LC_MESSAGES/turba.mo
+share/horde/turba/locale/fr_FR/help.xml
 share/horde/turba/locale/gl_ES/LC_MESSAGES/turba.mo
 share/horde/turba/locale/hu_HU/LC_MESSAGES/turba.mo
 share/horde/turba/locale/is_IS/LC_MESSAGES/turba.mo
@@ -135,8 +138,8 @@ share/horde/turba/scripts/sql/turba_objects.mysql.sql
 share/horde/turba/scripts/sql/turba_objects.oci8.sql
 share/horde/turba/scripts/sql/turba_objects.pgsql.sql
 share/horde/turba/scripts/sql/turba_objects.sql
-share/horde/turba/scripts/sql/turba_objects.xml
 share/horde/turba/scripts/sql/turba_weddingguests.sql
+share/horde/turba/scripts/sql/turba.xml
 share/horde/turba/scripts/upgrades/1.1_to_1.2.sql
 share/horde/turba/scripts/upgrades/1.2_to_2.0.oci8.sql
 share/horde/turba/scripts/upgrades/1.2_to_2.0.sql
@@ -266,6 +269,7 @@ share/horde/turba/view.php
 @dirrm share/horde/turba/lib/Object
 @dirrm share/horde/turba/lib/Driver
 @dirrm share/horde/turba/lib/Block
+@dirrm share/horde/turba/lib/tests
 @dirrm share/horde/turba/lib
 @unexec ${RMDIR} %D/share/horde/turba/config 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/horde/turba 2>/dev/null || ${TRUE}
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index d57b802b30d..84273bdbd04 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/08/05 12:52:25 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2007/03/18 12:14:05 adrianp Exp $
 
-SHA1 (turba-h3-2.1.2.tar.gz) = 7ad1ef5b2b1aca08778467e9dc4f419e64ff9808
-RMD160 (turba-h3-2.1.2.tar.gz) = d447b3e3ee39bf8662d717a3686574cfe1b84d89
-Size (turba-h3-2.1.2.tar.gz) = 1793219 bytes
+SHA1 (turba-h3-2.1.4.tar.gz) = 92b462224ef537aa9095bed7bfb72d80a3feb7ea
+RMD160 (turba-h3-2.1.4.tar.gz) = 8b5d8ab08bac54230b29428a4172a48bffe2ea93
+Size (turba-h3-2.1.4.tar.gz) = 1809857 bytes