From da0a83afc6f4f4c2d316066caaf7f8f29559f654 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 4 May 2013 23:52:45 +0000
Subject: [PATCH] Update to 2.5:

What's new in psycopg 2.5
-------------------------

New features:

- Added :ref:`JSON adaptation <adapt-json>`.
- Added :ref:`support for PostgreSQL 9.2 range types <adapt-range>`.
- `connection` and `cursor` objects can be used in ``with`` statements
  as context managers as specified by recent |DBAPI|_ extension.
- Added `~psycopg2.extensions.Diagnostics` object to get extended info
  from a database error.  Many thanks to Matthew Woodcraft for the
  implementation (:ticket:`#149`).
- Added `connection.cursor_factory` attribute to customize the default
  object returned by `~connection.cursor()`.
- Added support for backward scrollable cursors. Thanks to Jon Nelson
  for the initial patch (:ticket:`#108`).
- Added a simple way to :ref:`customize casting of composite types
  <adapt-composite>` into Python objects other than namedtuples.
  Many thanks to Ronan Dunklau and Tobias Oberstein for the feature
  development.
- `connection.reset()` implemented using :sql:`DISCARD ALL` on server
  versions supporting it.

Bug fixes:

- Properly cleanup memory of broken connections (:ticket:`#148`).
- Fixed bad interaction of ``setup.py`` with other dependencies in
  Distribute projects on Python 3 (:ticket:`#153`).

Other changes:

- Added support for Python 3.3.
- Dropped support for Python 2.4. Please use Psycopg 2.4.x if you need it.
- `~psycopg2.errorcodes` map updated to PostgreSQL 9.2.
- Dropped Zope adapter from source repository. ZPsycopgDA now has its own
  project at <http://github.com/psycopg/ZPsycopgDA>.
---
 databases/py-psycopg2/Makefile |  6 +++---
 databases/py-psycopg2/PLIST    | 11 ++++++++++-
 databases/py-psycopg2/distinfo |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index af5e4a62357c2..2a2e7fe874c89 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2012/12/16 16:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2013/05/04 23:52:45 wiz Exp $
 
-DISTNAME=	psycopg2-2.4.6
+DISTNAME=	psycopg2-2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
-MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-4/
+MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-5/
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://initd.org/psycopg/
diff --git a/databases/py-psycopg2/PLIST b/databases/py-psycopg2/PLIST
index c2e0f27c09ce0..09f28da91089b 100644
--- a/databases/py-psycopg2/PLIST
+++ b/databases/py-psycopg2/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/08 20:21:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/05/04 23:52:45 wiz Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/psycopg2/__init__.py
 ${PYSITELIB}/psycopg2/__init__.pyc
 ${PYSITELIB}/psycopg2/__init__.pyo
+${PYSITELIB}/psycopg2/_json.py
+${PYSITELIB}/psycopg2/_json.pyc
+${PYSITELIB}/psycopg2/_json.pyo
 ${PYSITELIB}/psycopg2/_psycopg.so
+${PYSITELIB}/psycopg2/_range.py
+${PYSITELIB}/psycopg2/_range.pyc
+${PYSITELIB}/psycopg2/_range.pyo
 ${PYSITELIB}/psycopg2/errorcodes.py
 ${PYSITELIB}/psycopg2/errorcodes.pyc
 ${PYSITELIB}/psycopg2/errorcodes.pyo
@@ -82,6 +88,9 @@ ${PYSITELIB}/psycopg2/tests/test_types_basic.pyo
 ${PYSITELIB}/psycopg2/tests/test_types_extras.py
 ${PYSITELIB}/psycopg2/tests/test_types_extras.pyc
 ${PYSITELIB}/psycopg2/tests/test_types_extras.pyo
+${PYSITELIB}/psycopg2/tests/test_with.py
+${PYSITELIB}/psycopg2/tests/test_with.pyc
+${PYSITELIB}/psycopg2/tests/test_with.pyo
 ${PYSITELIB}/psycopg2/tests/testconfig.py
 ${PYSITELIB}/psycopg2/tests/testconfig.pyc
 ${PYSITELIB}/psycopg2/tests/testconfig.pyo
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 8137ecc7743b4..a8ff71c0ac922 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2012/12/16 16:04:12 wiz Exp $
+$NetBSD: distinfo,v 1.15 2013/05/04 23:52:45 wiz Exp $
 
-SHA1 (psycopg2-2.4.6.tar.gz) = 992ac1170284d1cf94e255784f23909621796ce6
-RMD160 (psycopg2-2.4.6.tar.gz) = aed3763e0c5e0e8e3adc32331cc8767d6ab2002a
-Size (psycopg2-2.4.6.tar.gz) = 667783 bytes
+SHA1 (psycopg2-2.5.tar.gz) = 12fa804b4982da3f2a388654c7827dfa80f01d0a
+RMD160 (psycopg2-2.5.tar.gz) = 9f58dad71642da369caf4e7b009a4025082fc695
+Size (psycopg2-2.5.tar.gz) = 703558 bytes
 SHA1 (patch-psycopg_config.h) = 4678e0c807a07f350317f414b3a47c99e4c38b91