Update to 2.3

----
v2.3
----

[jan] Change group field in shares table to work with LDAP groups (Bug 6883).
[jan] Fix exporting address books with country fields as vCards (Bug 7372).
[mjr] Make sure we use all address books when searching via the api and the
      user's addressbooks pref is empty (Bug 7357).
[mjr] Correctly calculate the age of time objects (Bug 7330).


--------
v2.3-RC1
--------

[jan] Improve vCard EMAIL field parsing (Bug 7281).
[jan] Correctly import and export address extensions (Bug 7279).
[jan] Export full country names to vCard addresses.
[jan] Respect precedence of multiple vCard properties (Request 7122).
[jan] Remove deleted address books from address book preference (Request 6938).
[jan] Export LABEL properties to vCard if address fields are available.
[gwr] Add support for storing public PGP keys when using Kolab.
[gwr] Add support for adding addresses from IMP when using Kolab.
[jan] Add configuration option for an alternative name field.
[jan] Add support for image fields to SQL driver (requires Horde 3.3).
[jan] Add more default field mappings for CSV import (Request 6901).
[jan] Update field names for Outlook 2003 export (Request 6901).
[jan] Improve logic which entries to show in the sidebar menu.
[jan] Add support for the category form field (Request 6884).
[jan] Fix sorting so that sort order is always reflected correctly,
      independent of name format.
[jan] Add Basque translation (Euskal Herriko Unibertsitatea EHU/UPV
      <xabier.arrieta@ehu.es>).
[jan] Add ability to mark a contact as your own and API method to export it.
[jan] Fix importing phone numbers from Synthesis clients (Bug 7011).
[mjr] Fix issue with searching composite fields when the number of search terms
      is less than the number of composed fields (Bug 6796)
[cjh] Allow importing multiple address into an email field if allow_multi
      is set to true on the field in attributes.php (Bug 6897).
[mjr] Remove user permissions on all shares when deleting a user.
[jan] Fix searching of client address books that have been disabled in the
      preferences (Bug 6961).
[mjr] Fix issue with removeUserData api that caused the deleted user's
      address books to not be deleted as well as remove an erroneous error
      notification (Bug 6969).
[cjh] Fix the column selector/sorter in IE (Bug 6912).

3 files changed, 16 insertions, 8 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 14dcab16c79..dfb4ac15872 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2008/07/31 19:54:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.31 2008/10/12 12:06:52 adrianp Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
-PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/turba/ \
 		ftp://ftp.horde.org/pub/turba/
@@ -21,7 +20,7 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.2.1
+TURBAVER=	2.3
 PAXDIRS=	lib locale po scripts templates themes js
 USE_TOOLS+=	pax perl:run
 
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index e360cc57bae..c41dc45af47 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/07/31 19:54:04 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/10/12 12:06:52 adrianp Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -79,7 +79,9 @@ share/horde/turba/lib/tests/ListTest.php
 share/horde/turba/lib/tests/ListViewTest.php
 share/horde/turba/lib/tests/TestBase.php
 share/horde/turba/lib/tests/ViewBrowseTest.php
+share/horde/turba/lib/tests/az.png
 share/horde/turba/lib/tests/bug_6518.phpt
+share/horde/turba/lib/tests/bug5476.phpt
 share/horde/turba/lib/tests/import.ldif
 share/horde/turba/lib/tests/importCRLF.ldif
 share/horde/turba/lib/tests/ldif_exportFile.phpt
@@ -101,6 +103,8 @@ share/horde/turba/locale/en_US/help.xml
 share/horde/turba/locale/es_ES/LC_MESSAGES/turba.mo
 share/horde/turba/locale/es_ES/help.xml
 share/horde/turba/locale/et_EE/LC_MESSAGES/turba.mo
+share/horde/turba/locale/eu_ES/LC_MESSAGES/turba.mo
+share/horde/turba/locale/eu_ES/help.xml
 share/horde/turba/locale/fa_IR/LC_MESSAGES/turba.mo
 share/horde/turba/locale/fa_IR/help.xml
 share/horde/turba/locale/fi_FI/LC_MESSAGES/turba.mo
@@ -146,6 +150,7 @@ share/horde/turba/po/de_DE.po
 share/horde/turba/po/el_GR.po
 share/horde/turba/po/es_ES.po
 share/horde/turba/po/et_EE.po
+share/horde/turba/po/eu_ES.po
 share/horde/turba/po/fa_IR.po
 share/horde/turba/po/fi_FI.po
 share/horde/turba/po/fr_FR.po
@@ -195,7 +200,9 @@ share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_sql_schema.php
+share/horde/turba/scripts/upgrades/2.2.1_to_2.3.sql
 share/horde/turba/scripts/upgrades/2007-06-17_flatten_shares.php
+share/horde/turba/scripts/upgrades/2008-09-23_fix_group_uid.sql
 share/horde/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
 share/horde/turba/scripts/upgrades/create_default_histories.php
 share/horde/turba/scripts/upgrades/public_to_horde_share.php
@@ -341,6 +348,8 @@ share/horde/turba/view.php
 @dirrm share/horde/turba/locale/fi_FI
 @dirrm share/horde/turba/locale/fa_IR/LC_MESSAGES
 @dirrm share/horde/turba/locale/fa_IR
+@dirrm share/horde/turba/locale/eu_ES/LC_MESSAGES
+@dirrm share/horde/turba/locale/eu_ES
 @dirrm share/horde/turba/locale/et_EE/LC_MESSAGES
 @dirrm share/horde/turba/locale/et_EE
 @dirrm share/horde/turba/locale/es_ES/LC_MESSAGES
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 4357e9c688e..3751ba0f85c 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2008/06/17 21:29:59 adrianp Exp $
+$NetBSD: distinfo,v 1.14 2008/10/12 12:06:52 adrianp Exp $
 
-SHA1 (turba-h3-2.2.1.tar.gz) = 571ae7b8dfff709879937ae22174ebcf3cd7556c
-RMD160 (turba-h3-2.2.1.tar.gz) = 95293a3672a8448a49a549f56e0b0139be6da343
-Size (turba-h3-2.2.1.tar.gz) = 2245123 bytes
+SHA1 (turba-h3-2.3.tar.gz) = 1efe5d975f22bf71db9ef7550a5231dbcccc5017
+RMD160 (turba-h3-2.3.tar.gz) = 177b7868c0d39b2c250e3b9d6d5115172838851b
+Size (turba-h3-2.3.tar.gz) = 2354452 bytes