head 1.19; access; symbols OPENPKG_E1_MP_HEAD:1.9 OPENPKG_E1_MP:1.9 OPENPKG_E1_MP_2_STABLE:1.9.2.2 OPENPKG_E1_FP:1.9.2.2 OPENPKG_2_STABLE_MP:1.9 OPENPKG_2_STABLE_20061018:1.9.2.2 OPENPKG_2_STABLE:1.9.0.2; locks; strict; comment @# @; 1.19 date 2009.10.08.21.18.22; author rse; state Exp; branches; next 1.18; commitid b0KHndwSO2sFbM6u; 1.18 date 2009.08.11.17.35.54; author rse; state Exp; branches; next 1.17; commitid C0C7RShwNtcXOiZt; 1.17 date 2009.05.18.20.38.57; author rse; state Exp; branches; next 1.16; commitid SkmHRDphhg99zoOt; 1.16 date 2009.04.21.18.53.10; author rse; state Exp; branches; next 1.15; commitid D8tiNEvOl0nFQUKt; 1.15 date 2009.03.27.11.45.08; author rse; state Exp; branches; next 1.14; commitid yvTsD0vPufyEhFHt; 1.14 date 2008.09.22.19.21.40; author rse; state Exp; branches; next 1.13; commitid auncKHRqwR4XMNjt; 1.13 date 2008.06.07.08.07.23; author rse; state Exp; branches; next 1.12; commitid qYdcdnJMldUQuZ5t; 1.12 date 2007.10.23.15.51.15; author cs; state Exp; branches; next 1.11; commitid 20iLFTzwtmAnoJCs; 1.11 date 2007.05.17.15.53.19; author rse; state Exp; branches; next 1.10; commitid nNTmyDCn8uQXviis; 1.10 date 2007.01.22.08.33.02; author rse; state Exp; branches; next 1.9; commitid aAqM4QqM37p6Mt3s; 1.9 date 2006.09.03.13.23.06; author rse; state Exp; branches 1.9.2.1; next 1.8; commitid jOVs8q76lJYBUnLr; 1.8 date 2006.09.02.09.44.56; author rse; state Exp; branches; next 1.7; commitid ihNNeER5fNVKJeLr; 1.7 date 2006.08.06.08.59.23; author rse; state Exp; branches; next 1.6; commitid SV7ZGoAZvDcWlLHr; 1.6 date 2006.06.11.19.59.18; author rse; state Exp; branches; next 1.5; commitid GFPdS6fLyP6WNCAr; 1.5 date 2006.06.09.20.27.03; author rse; state Exp; branches; next 1.4; commitid EAfEKVSNQ5Uq1nAr; 1.4 date 2006.04.05.06.59.25; author rse; state Exp; branches; next 1.3; commitid goGSm6OlUAnUDWrr; 1.3 date 2006.03.07.20.57.25; author rse; state Exp; branches; next 1.2; commitid cobSHNtoIjWbdior; 1.2 date 2006.03.07.20.06.55; author rse; state Exp; branches; next 1.1; commitid lJYw0dOqinBRVhor; 1.1 date 2006.03.07.17.37.51; author rse; state Exp; branches; next ; commitid wqZ8huBF1RvJ6hor; 1.9.2.1 date 2006.09.03.13.23.06; author rse; state dead; branches; next 1.9.2.2; commitid iZxwRSmmWscPXUQr; 1.9.2.2 date 2006.10.16.14.55.22; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.19 log @modifying package: python-db-2.5 20090930 -> 20091008 @ text @Index: psycopg2-2.0.13/psycopg/config.h --- psycopg2-2.0.13/psycopg/config.h.orig 2009-04-26 14:09:21 +0200 +++ psycopg2-2.0.13/psycopg/config.h 2009-10-08 22:31:01 +0200 @@@@ -140,10 +140,11 @@@@ #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun) /* what's this, we have no round function either? */ -static double round(double num) +static double my_round(double num) { return (num >= 0) ? floor(num + 0.5) : ceil(num - 0.5); } +#define round(num) my_round(num) #endif /* postgresql < 7.4 does not have PQfreemem */ Index: psycopg2-2.0.13/setup.py --- psycopg2-2.0.13/setup.py.orig 2009-10-04 23:37:14 +0200 +++ psycopg2-2.0.13/setup.py 2009-10-08 23:15:48 +0200 @@@@ -203,6 +203,9 @@@@ os.path.join(self.get_pg_config("libdir"), "libpq.a")) else: self.libraries.append("pq") + self.libraries.append("ssl") + self.libraries.append("crypto") + self.libraries.append("crypt") try: self.library_dirs.append(self.get_pg_config("libdir")) @ 1.18 log @modifying package: python-db-2.5 20090702 -> 20090811 @ text @d1 4 a4 4 Index: psycopg2-2.0.12/psycopg/config.h --- psycopg2-2.0.12/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.12/psycopg/config.h 2007-05-17 17:50:16 +0200 @@@@ -115,10 +115,11 @@@@ d6 1 a6 1 #if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) d17 10 a26 10 Index: psycopg2-2.0.12/setup.py --- psycopg2-2.0.12/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.12/setup.py 2007-05-17 17:51:26 +0200 @@@@ -191,6 +191,9 @@@@ self.include_dirs.append(".") self.libraries.append("pq") + self.libraries.append("ssl") + self.libraries.append("crypto") + self.libraries.append("crypt") @ 1.17 log @modifying package: python-db-2.5 20090506 -> 20090518 @ text @d1 3 a3 3 Index: psycopg2-2.0.11/psycopg/config.h --- psycopg2-2.0.11/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.11/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.11/setup.py --- psycopg2-2.0.11/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.11/setup.py 2007-05-17 17:51:26 +0200 @ 1.16 log @modifying package: python-db-2.5 20090327 -> 20090421 @ text @d1 3 a3 3 Index: psycopg2-2.0.10/psycopg/config.h --- psycopg2-2.0.10/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.10/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.10/setup.py --- psycopg2-2.0.10/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.10/setup.py 2007-05-17 17:51:26 +0200 @ 1.15 log @modifying package: python-db-2.5 20090223 -> 20090327 @ text @d1 3 a3 3 Index: psycopg2-2.0.9/psycopg/config.h --- psycopg2-2.0.9/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.9/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.9/setup.py --- psycopg2-2.0.9/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.9/setup.py 2007-05-17 17:51:26 +0200 @ 1.14 log @fix patch and add SQLObject @ text @d1 3 a3 3 Index: psycopg2-2.0.8/psycopg/config.h --- psycopg2-2.0.8/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.8/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.8/setup.py --- psycopg2-2.0.8/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.8/setup.py 2007-05-17 17:51:26 +0200 @ 1.13 log @fix packaging @ text @d1 3 a3 3 Index: psycopg2-2.0.7/psycopg/config.h --- psycopg2-2.0.7/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.7/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.7/setup.py --- psycopg2-2.0.7/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.7/setup.py 2007-05-17 17:51:26 +0200 @ 1.12 log @unbreak build of pysqlite; upgrade of psycopg2 @ text @d1 3 a3 3 Index: psycopg2-2.0.6/psycopg/config.h --- psycopg2-2.0.6/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.6/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.6/setup.py --- psycopg2-2.0.6/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.6/setup.py 2007-05-17 17:51:26 +0200 @ 1.11 log @modifying package: python-db-2.5 20070308 -> 20070517 @ text @d1 3 a3 3 Index: psycopg2-2.0.6b2/psycopg/config.h --- psycopg2-2.0.6b2/psycopg/config.h.orig 2007-04-11 14:12:37 +0200 +++ psycopg2-2.0.6b2/psycopg/config.h 2007-05-17 17:50:16 +0200 d17 3 a19 3 Index: psycopg2-2.0.6b2/setup.py --- psycopg2-2.0.6b2/setup.py.orig 2007-04-11 17:03:50 +0200 +++ psycopg2-2.0.6b2/setup.py 2007-05-17 17:51:26 +0200 @ 1.10 log @modifying package: python-db-2.5 20070114 -> 20070122 @ text @d1 4 a4 4 Index: psycopg2-2.0.6b1/psycopg/config.h --- psycopg2-2.0.6b1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.6b1/psycopg/config.h 2006-03-07 21:54:38 +0100 @@@@ -104,10 +104,11 @@@@ d6 1 a6 1 #if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) d17 4 a20 4 Index: psycopg2-2.0.6b1/setup.py --- psycopg2-2.0.6b1/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.6b1/setup.py 2006-03-07 21:54:38 +0100 @@@@ -143,6 +143,9 @@@@ d22 1 a22 1 self.include_dirs.append(".") d27 1 a27 1 @ 1.9 log @modifying package: python-db-2.4 20060902 -> 20060903 @ text @d1 3 a3 3 Index: psycopg2-2.0.5.1/psycopg/config.h --- psycopg2-2.0.5.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.5.1/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0.5.1/setup.py --- psycopg2-2.0.5.1/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.5.1/setup.py 2006-03-07 21:54:38 +0100 @ 1.9.2.1 log @file python-db.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:22 +0000 @ text @d1 29 @ 1.9.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 29 Index: psycopg2-2.0.5.1/psycopg/config.h --- psycopg2-2.0.5.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.5.1/psycopg/config.h 2006-03-07 21:54:38 +0100 @@@@ -104,10 +104,11 @@@@ #if defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) /* what's this, we have no round function either? */ -static double round(double num) +static double my_round(double num) { return (num >= 0) ? floor(num + 0.5) : ceil(num - 0.5); } +#define round(num) my_round(num) #endif /* postgresql < 7.4 does not have PQfreemem */ Index: psycopg2-2.0.5.1/setup.py --- psycopg2-2.0.5.1/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.5.1/setup.py 2006-03-07 21:54:38 +0100 @@@@ -143,6 +143,9 @@@@ self.include_dirs.append(".") self.libraries.append("pq") + self.libraries.append("ssl") + self.libraries.append("crypto") + self.libraries.append("crypt") try: self.library_dirs.append(self.get_pg_config("libdir")) @ 1.8 log @modifying package: python-db-2.4 20060828 -> 20060902 @ text @d1 3 a3 3 Index: psycopg2-2.0.5/psycopg/config.h --- psycopg2-2.0.5/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.5/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0.5/setup.py --- psycopg2-2.0.5/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.5/setup.py 2006-03-07 21:54:38 +0100 @ 1.7 log @upgrade PgSQL binding; fix Oracle binding; add a second contributed Oracle binding (untested) @ text @d1 3 a3 3 Index: psycopg2-2.0.4/psycopg/config.h --- psycopg2-2.0.4/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.4/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0.4/setup.py --- psycopg2-2.0.4/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.4/setup.py 2006-03-07 21:54:38 +0100 @ 1.6 log @modifying package: python-db-2.4 20060609 -> 20060611 @ text @d1 3 a3 3 Index: psycopg2-2.0.2/psycopg/config.h --- psycopg2-2.0.2/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.2/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0.2/setup.py --- psycopg2-2.0.2/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.2/setup.py 2006-03-07 21:54:38 +0100 @ 1.5 log @modifying package: python-db-2.4 20060524 -> 20060609 @ text @d1 3 a3 3 Index: psycopg2-2.0.1/psycopg/config.h --- psycopg2-2.0.1/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0.1/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0.1/setup.py --- psycopg2-2.0.1/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0.1/setup.py 2006-03-07 21:54:38 +0100 @ 1.4 log @modifying package: python-db-2.4 20060328 -> 20060405 @ text @d1 3 a3 3 Index: psycopg2-2.0b8/psycopg/config.h --- psycopg2-2.0b8/psycopg/config.h.orig 2006-02-11 19:56:19 +0100 +++ psycopg2-2.0b8/psycopg/config.h 2006-03-07 21:54:38 +0100 d17 3 a19 3 Index: psycopg2-2.0b8/setup.py --- psycopg2-2.0b8/setup.py.orig 2006-02-11 19:58:38 +0100 +++ psycopg2-2.0b8/setup.py 2006-03-07 21:54:38 +0100 @ 1.3 log @fix SQLite module building by removing nasty setuptools stuff @ text @a29 28 Index: pysqlite-2.1.3/setup.py --- pysqlite-2.1.3/setup.py.orig 2006-02-02 01:15:04 +0100 +++ pysqlite-2.1.3/setup.py 2006-03-07 21:55:19 +0100 @@@@ -23,10 +23,11 @@@@ import glob, os, sys -from ez_setup import use_setuptools -use_setuptools() +#from ez_setup import use_setuptools +#use_setuptools() -from setuptools import setup, Extension, Command +#from setuptools import setup, Extension, Command +from distutils.core import setup, Extension, Command # If you need to change anything, it should be enough to change setup.cfg. @@@@ -115,9 +116,7 @@@@ platforms = "ALL", url = "http://pysqlite.org/", download_url = "http://initd.org/tracker/pysqlite/wiki/PysqliteDownloads", - test_suite = "pysqlite2.test.suite", cmdclass = {"build_docs": DocBuilder}, - extras_require = {"build_docs": ["docutils", "SilverCity"]}, # Description of the modules and packages in the distribution package_dir = {"pysqlite2": "pysqlite2"}, @ 1.2 log @fix building under some platforms where crypt(3) is not in libc @ text @d3 1 a3 1 +++ psycopg2-2.0b8/psycopg/config.h 2006-03-07 17:39:30 +0100 d17 1 d19 1 a19 1 +++ psycopg2-2.0b8/setup.py 2006-03-07 17:44:25 +0100 d30 28 @ 1.1 log @ops, forgot to commit corresponding patch file @ text @a16 1 Index: psycopg2-2.0b8/setup.py d19 1 a19 1 @@@@ -143,6 +143,8 @@@@ d25 1 @