tag 639461 patch thanks Hello Peter,
something like the attached patch? Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru postgresql-pljava-1.4.2/debian/changelog postgresql-pljava-1.4.2/debian/changelog --- postgresql-pljava-1.4.2/debian/changelog 2011-07-26 10:49:12.000000000 +0200 +++ postgresql-pljava-1.4.2/debian/changelog 2011-09-06 19:21:48.000000000 +0200 @@ -1,3 +1,10 @@ +postgresql-pljava (1.4.2-4ubuntu1) oneiric; urgency=low + + * debian/pgversions: Build for 9.1 only. Regenerate debian/control. + * Add 9.1_api.patch: Port to 9.1 API. + + -- Martin Pitt <[email protected]> Tue, 06 Sep 2011 19:21:48 +0200 + postgresql-pljava (1.4.2-4) unstable; urgency=low * Apparently, ia64 and hppa need an explicit include path to find jni_md.h. diff -Nru postgresql-pljava-1.4.2/debian/control postgresql-pljava-1.4.2/debian/control --- postgresql-pljava-1.4.2/debian/control 2011-07-26 10:49:26.000000000 +0200 +++ postgresql-pljava-1.4.2/debian/control 2011-09-06 19:21:53.000000000 +0200 @@ -9,12 +10,12 @@ Vcs-Svn: svn://svn.debian.org/pkg-postgresql/trunk/postgresql-pljava/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-postgresql/trunk/postgresql-pljava/ -Package: postgresql-9.0-pljava-gcj +Package: postgresql-9.1-pljava-gcj Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.0 -Provides: postgresql-9.0-pljava -Conflicts: postgresql-9.0-pljava -Description: Java procedural language for PostgreSQL 9.0 +Depends: ${shlibs:Depends}, ${misc:Depends}, postgresql-9.1 +Provides: postgresql-9.1-pljava +Conflicts: postgresql-9.1-pljava +Description: Java procedural language for PostgreSQL 9.1 PL/Java is a loadable procedural language for the PostgreSQL database system that enables the use of the Java language for creating functions and trigger procedures. This variant is compiled using the GNU Compiler diff -Nru postgresql-pljava-1.4.2/debian/patches/9.1_api.patch postgresql-pljava-1.4.2/debian/patches/9.1_api.patch --- postgresql-pljava-1.4.2/debian/patches/9.1_api.patch 1970-01-01 01:00:00.000000000 +0100 +++ postgresql-pljava-1.4.2/debian/patches/9.1_api.patch 2011-09-06 19:19:29.000000000 +0200 @@ -0,0 +1,74 @@ +Description: Port to 9.1 API. +Author: Martin Pitt <[email protected]> +Bug-Debian: http://bugs.debian.org/639461 + +Index: postgresql-pljava/src/C/pljava/Backend.c +=================================================================== +--- postgresql-pljava.orig/src/C/pljava/Backend.c 2011-09-06 19:16:02.775995582 +0200 ++++ postgresql-pljava/src/C/pljava/Backend.c 2011-09-06 19:18:04.105996380 +0200 +@@ -534,9 +534,9 @@ + static void checkIntTimeType(void) + { + #if (PGSQL_MAJOR_VER > 8) +- const char* idt = GetConfigOption("integer_datetimes", true); ++ const char* idt = GetConfigOption("integer_datetimes", true, false); + #else +- const char* idt = GetConfigOption("integer_datetimes"); ++ const char* idt = GetConfigOption("integer_datetimes", false); + #endif + + integerDateTimes = (strcmp(idt, "on") == 0); +@@ -573,7 +573,7 @@ + #if (PGSQL_MAJOR_VER > 8 || (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)) + 0, + #endif +- NULL, NULL); ++ NULL, NULL, NULL); + + DefineCustomStringVariable( + "pljava.classpath", +@@ -587,7 +587,7 @@ + #if (PGSQL_MAJOR_VER > 8 || (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)) + 0, + #endif +- NULL, NULL); ++ NULL, NULL, NULL); + + DefineCustomBoolVariable( + "pljava.debug", +@@ -601,7 +601,7 @@ + #if (PGSQL_MAJOR_VER > 8 || (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)) + 0, + #endif +- NULL, NULL); ++ NULL, NULL, NULL); + + DefineCustomIntVariable( + "pljava.statement_cache_size", +@@ -616,7 +616,7 @@ + #if (PGSQL_MAJOR_VER > 8 || (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)) + 0, + #endif +- NULL, NULL); ++ NULL, NULL, NULL); + + DefineCustomBoolVariable( + "pljava.release_lingering_savepoints", +@@ -630,7 +630,7 @@ + #if (PGSQL_MAJOR_VER > 8 || (PGSQL_MAJOR_VER == 8 && PGSQL_MINOR_VER > 3)) + 0, + #endif +- NULL, NULL); ++ NULL, NULL, NULL); + + EmitWarningsOnPlaceholders("pljava"); + s_firstTimeInit = false; +@@ -811,7 +811,7 @@ + PG_TRY(); + { + #if (PGSQL_MAJOR_VER > 8) +- const char* value = GetConfigOption(key, true); ++ const char* value = GetConfigOption(key, true, false); + #else + const char* value = GetConfigOption(key); + #endif diff -Nru postgresql-pljava-1.4.2/debian/patches/series postgresql-pljava-1.4.2/debian/patches/series --- postgresql-pljava-1.4.2/debian/patches/series 2011-07-12 11:23:11.000000000 +0200 +++ postgresql-pljava-1.4.2/debian/patches/series 2011-09-06 19:15:46.000000000 +0200 @@ -1,3 +1,4 @@ ldflags.patch pic.patch trusted.patch +9.1_api.patch diff -Nru postgresql-pljava-1.4.2/debian/pgversions postgresql-pljava-1.4.2/debian/pgversions --- postgresql-pljava-1.4.2/debian/pgversions 2011-04-15 16:24:17.000000000 +0200 +++ postgresql-pljava-1.4.2/debian/pgversions 2011-09-06 19:09:55.000000000 +0200 @@ -1,2 +1 @@ -8.4 -9.0 +9.1
