-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I did not upload the package with the changes, I'm waiting for some
comments about dropping the jdbc2 driver for postgresql.
Cheers,
PS: See #358345 for reference.
Arnaud Vandyck wrote:
> Author: avdyk
> Date: 2006-04-24 16:23:21 +0000 (Mon, 24 Apr 2006)
> New Revision: 2059
>
> Modified:
> trunk/libpgjava/debian/changelog
> trunk/libpgjava/debian/patches/01_BuildXml.patch
> trunk/libpgjava/debian/rules
> Log:
> this patch drop support for jdbc2 and add a source argument in javac task in
> the build.xml
>
> Modified: trunk/libpgjava/debian/changelog
> ===================================================================
> --- trunk/libpgjava/debian/changelog 2006-04-24 13:26:30 UTC (rev 2058)
> +++ trunk/libpgjava/debian/changelog 2006-04-24 16:23:21 UTC (rev 2059)
> @@ -1,3 +1,10 @@
> +libpgjava (8.1-404-2) unstable; urgency=low
> +
> + * Drop support for the old jdbc2 driver (can be reverted if wanted)
> + (closes: #358345).
> +
> + -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 24 Apr 2006 18:08:09 +0200
> +
> libpgjava (8.1-404-1) unstable; urgency=low
>
> * New upstream release (closes: #340739)
>
> Modified: trunk/libpgjava/debian/patches/01_BuildXml.patch
> ===================================================================
> --- trunk/libpgjava/debian/patches/01_BuildXml.patch 2006-04-24 13:26:30 UTC
> (rev 2058)
> +++ trunk/libpgjava/debian/patches/01_BuildXml.patch 2006-04-24 16:23:21 UTC
> (rev 2059)
> @@ -38,7 +38,7 @@
> -
> - <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}"
> debug="${debug}">
> + <!-- Include target flag for explicit specification of target 1.3 or
> 1.4 (JDBC2 = 1.3 / JDBC3 = 1.4) -->
> -+ <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}"
> debug="${debug}" target="${target}">
> ++ <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}"
> debug="${debug}" source="${target}" target="${target}">
> <!-- This is the core of the driver. It is common for all versions.
> -->
> <include name="${package}/*.java" />
> <include name="${package}/core/**" />
>
> Modified: trunk/libpgjava/debian/rules
> ===================================================================
> --- trunk/libpgjava/debian/rules 2006-04-24 13:26:30 UTC (rev 2058)
> +++ trunk/libpgjava/debian/rules 2006-04-24 16:23:21 UTC (rev 2059)
> @@ -13,29 +13,29 @@
> rm -rf build jars java
>
> build:
> - # chmod -x example/corba/stock.idl to fix lintian/linda warning
> + #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/* .
> +# move jdbc2 interfaces to the source directory
> + #cp -r debian/jdbc2_interfaces/* .
>
> - # build JDBC 2
> - ant -Djdbc2=true -Dtarget=1.3 jar
> -
> - mv jars/postgresql.jar postgresql-jdbc2.jar
> -
> - # remove stuff from jdbc2 built including jdbc2 interfaces
> - rm org/postgresql/Driver.java org/postgresql/util/PSQLException.java
> - rm -rf build jars java
> -
> - # build JDBC 3
> - ant -Djdbc3=true -Dtarget=1.4 -Dssl=true jar
> +# build JDBC 2
> + #ant -Djdbc2=true -Dtarget=1.3 -Dsource=1.3 jar
>
> + -mv jars/postgresql.jar postgresql-jdbc2.jar
> +
> +# remove stuff from jdbc2 built including jdbc2 interfaces
> + -rm org/postgresql/Driver.java org/postgresql/util/PSQLException.java
> + -rm -rf build jars java
> +
> +# build JDBC 3
> + ant -Djdbc3=true -Dtarget=1.4 -Dsource=1.4 -Dssl=true jar
> +
> mv jars/postgresql.jar postgresql-jdbc3.jar
>
> install/libpg-java::
> - install -m 644 postgresql-jdbc2.jar
> debian/libpg-java/usr/share/java/postgresql-jdbc2-$(UPSTREAM_VERSION).jar
> - ln -s postgresql-jdbc2-$(UPSTREAM_VERSION).jar
> debian/libpg-java/usr/share/java/postgresql-jdbc2.jar
> + #install -m 644 postgresql-jdbc2.jar
> debian/libpg-java/usr/share/java/postgresql-jdbc2-$(UPSTREAM_VERSION).jar
> + #ln -s postgresql-jdbc2-$(UPSTREAM_VERSION).jar
> debian/libpg-java/usr/share/java/postgresql-jdbc2.jar
> install -m 644 postgresql-jdbc3.jar
> debian/libpg-java/usr/share/java/postgresql-jdbc3-$(UPSTREAM_VERSION).jar
> ln -s postgresql-jdbc3-$(UPSTREAM_VERSION).jar
> debian/libpg-java/usr/share/java/postgresql-jdbc3.jar
> ln -s postgresql-jdbc3-$(UPSTREAM_VERSION).jar
> debian/libpg-java/usr/share/java/postgresql.jar
>
>
> _______________________________________________
> pkg-java-commits mailing list
> pkg-java-commits@lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
>
>
- --
.''`.
: :' :rnaud
`. `'
`-
Java Trap: http://www.gnu.org/philosophy/java-trap.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFETP5p4vzFZu62tMIRAieFAKC+fcMAYhqKSYqmcWgtLIj/oIyUIwCglX3R
cNlnnfv1/Av44s7X2yGcylE=
=XaPN
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
