Author: doko Date: 2007-01-06 15:24:46 +0100 (Sat, 06 Jan 2007) New Revision: 2913
Modified: trunk/libpgjava/debian/changelog trunk/libpgjava/debian/control trunk/libpgjava/debian/patches/01_BuildXml.patch trunk/libpgjava/debian/patches/02_PSQLException_JDK13.patch trunk/libpgjava/debian/rules Log: * New upstream version, supporting Postgresql 8.2. * Build using java-gcj-compat-dev. Modified: trunk/libpgjava/debian/changelog =================================================================== --- trunk/libpgjava/debian/changelog 2007-01-04 08:19:04 UTC (rev 2912) +++ trunk/libpgjava/debian/changelog 2007-01-06 14:24:46 UTC (rev 2913) @@ -1,3 +1,10 @@ +libpgjava (8.2-504-1) unstable; urgency=low + + * New upstream version, supporting Postgresql 8.2. + * Build using java-gcj-compat-dev. + + -- Matthias Klose <[EMAIL PROTECTED]> Sat, 6 Jan 2007 15:03:58 +0100 + libpgjava (8.1-405-1) unstable; urgency=low * Drop support for the old jdbc2 driver (can be reverted if wanted) Modified: trunk/libpgjava/debian/control =================================================================== --- trunk/libpgjava/debian/control 2007-01-04 08:19:04 UTC (rev 2912) +++ trunk/libpgjava/debian/control 2007-01-06 14:24:46 UTC (rev 2913) @@ -2,21 +2,21 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stefan Gybas <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]> -Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libxerces2-java -Standards-Version: 3.6.2 +Uploaders: Stefan Gybas <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>, Matthias Klose <[EMAIL PROTECTED]> +Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, java-gcj-compat-dev, ant, libxerces2-java +Standards-Version: 3.7.2 Package: libpg-java Architecture: all Section: libs Priority: optional -Depends: kaffe | java1-runtime | java2-runtime -Suggests: postgresql (>= 7.2) +Depends: java-gcj-compat | java1-runtime | java2-runtime +Suggests: postgresql (>= 8.2) Conflicts: libpgjava (<= 7.4.7-3) Provides: libpgjava Replaces: libpgjava Description: Java database (JDBC) driver for PostgreSQL - Java classes for communication with the PostgreSQL 7.2 up to 8.0 database + Java classes for communication with the PostgreSQL 7.2 up to 8.2 database backend (local or remote) using JDBC. This package contains two Java archives (JARs), one that supports JDBC 2.0 (for JDK 1.3 and up) and one that supports JDBC 3.0 and SSL (for JDK 1.4 and up). Modified: trunk/libpgjava/debian/patches/01_BuildXml.patch =================================================================== --- trunk/libpgjava/debian/patches/01_BuildXml.patch 2007-01-04 08:19:04 UTC (rev 2912) +++ trunk/libpgjava/debian/patches/01_BuildXml.patch 2007-01-06 14:24:46 UTC (rev 2913) @@ -1,5 +1,5 @@ ---- build.xml.orig 2005-06-24 18:20:08.000000000 +0200 -+++ build.xml 2005-06-24 19:04:03.000000000 +0200 +--- build.xml.orig 2006-11-29 05:00:15.000000000 +0100 ++++ build.xml 2007-01-06 15:12:57.000000000 +0100 @@ -32,6 +32,9 @@ <property file="build.properties"/> @@ -9,20 +9,15 @@ + -Djdbc2=true or -Djdbc3=true <condition property="jdbc2"> <or> - <equals arg1="${ant.java.version}" arg2="1.2"/> -@@ -43,7 +46,7 @@ - </condition> - <condition property="jdbc3g"> - <equals arg1="${ant.java.version}" arg2="1.5"/> + <equals arg1="${java.specification.version}" arg2="1.2"/> +@@ -59,10 +62,13 @@ + <isset property="jdbc3g" /> + <isset property="jdbc4" /> + </or> - </condition> + </condition>--> - <condition property="jdbc3any"> - <or> - <isset property="jdbc3" /> -@@ -52,7 +55,10 @@ - </condition> - <available property="datasource" classname="javax.sql.DataSource"/> + <available property="datasourceclass" classname="javax.sql.DataSource"/> - <available property="ssl" classname="javax.net.ssl.SSLContext"/> + <!-- Comment out so no SSL decision is done - this way + we can request SSL inclusion during build explicit with @@ -31,7 +26,7 @@ <available property="junit" classname="junit.framework.Test"/> <available property="junit.task" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> -@@ -107,8 +113,8 @@ +@@ -111,8 +117,8 @@ <available classname="org.postgresql.Driver" property="old.driver.present" /> <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" /> @@ -42,8 +37,8 @@ <!-- This is the core of the driver. It is common for all versions. --> <include name="${package}/*.java" /> <include name="${package}/core/**" /> -@@ -225,6 +231,15 @@ - <not><equals arg1="${jdbc3any}" arg2="true" /></not> +@@ -277,6 +283,15 @@ + <not><equals arg1="${jdbc3plus}" arg2="true" /></not> </condition> + <condition property="InitCause" value=""> @@ -58,7 +53,7 @@ <!-- determine the ssl status --> <condition property="ssl_config" value=""> <equals arg1="${ssl}" arg2="true"/> -@@ -251,6 +266,7 @@ +@@ -306,6 +321,7 @@ <filter token="DEF_PGPORT" value="${def_pgport}" /> <filter token="SSL" value="${ssl_config}" /> <filter token="NOINITCAUSE" value="${noInitCause}" /> Modified: trunk/libpgjava/debian/patches/02_PSQLException_JDK13.patch =================================================================== --- trunk/libpgjava/debian/patches/02_PSQLException_JDK13.patch 2007-01-04 08:19:04 UTC (rev 2912) +++ trunk/libpgjava/debian/patches/02_PSQLException_JDK13.patch 2007-01-06 14:24:46 UTC (rev 2913) @@ -1,18 +1,18 @@ ---- org/postgresql/util/PSQLException.java.in.orig 2005-06-24 19:47:01.000000000 +0200 -+++ org/postgresql/util/PSQLException.java.in 2005-06-24 19:47:41.000000000 +0200 -@@ -21,7 +21,8 @@ +--- org/postgresql/util/PSQLException.java.in~ 2005-11-24 03:29:23.000000000 +0100 ++++ org/postgresql/util/PSQLException.java.in 2007-01-06 15:16:39.000000000 +0100 +@@ -22,7 +22,8 @@ public PSQLException(String msg, PSQLState state, Throwable cause) { super(addCauseToMessage(msg, cause), state == null ? null : state.getState()); - initCause(cause); // Calls either the 1.4 Throwable impl or our impl below. + @NOINITCAUSE@ initCauseA(cause); // Calls either the 1.4 Throwable impl or our impl below. + @INITCAUSE@ initCause(cause); - if (Driver.logDebug) - Driver.debug("Exception: " + this); -@@ -60,7 +61,7 @@ } +@@ -70,7 +71,7 @@ + } + // Dummy initCause() for pre-1.4 JVMs - @NOINITCAUSE@ public void initCause(Throwable cause) { + @NOINITCAUSE@ public void initCauseA(Throwable cause) { Modified: trunk/libpgjava/debian/rules =================================================================== --- trunk/libpgjava/debian/rules 2007-01-04 08:19:04 UTC (rev 2912) +++ trunk/libpgjava/debian/rules 2007-01-06 14:24:46 UTC (rev 2913) @@ -4,18 +4,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -export JAVA_HOME := /usr/lib/kaffe +export JAVA_HOME := /usr/lib/jvm/java-gcj UPSTREAM_VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) clean:: rm -f org/postgresql/Driver.java org/postgresql/util/PSQLException.java postgresql-jdbc*.jar rm -rf build jars java + find -name '*.class' | xargs -r rm -f build: - #chmod -x example/corba/stock.idl to fix lintian/linda warning - chmod -x example/corba/stock.idl - # move jdbc2 interfaces to the source directory #cp -r debian/jdbc2_interfaces/* . _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
