CVS libpgjava/debian
Arnaud Vandyck
avdyk@haydn.debian.org
Thu Apr 21 12:15:02 2005
Update of /cvsroot/pkg-java/libpgjava/debian
In directory haydn:/tmp/cvs-serv14106/debian
Modified Files:
README.Debian changelog control rules
Added Files:
README.jdbc2_interfaces
Log Message:
move to main and several fixes, thanks to Wolfgang
--- /cvsroot/pkg-java/libpgjava/debian/README.Debian 2002/12/03 14:36:45 1.2
+++ /cvsroot/pkg-java/libpgjava/debian/README.Debian 2005/04/21 12:14:20 1.3
@@ -1,7 +1,8 @@
libpgjava Debian package
========================
-This package has been extracted from the postgresql package because of
-its dependency on a Java VM (unfortunately, there's currently no working
-free JVM available). The source tree reflects this, that is why the code
-is three levels down.
+This package has been extracted from the postgresql package because
+it formerly needed a non-free Java VM to build the different versions
+of the JDBC specification.
+
+Today this is just a relict of the past.
--- /cvsroot/pkg-java/libpgjava/debian/changelog 2005/04/04 20:09:25 1.5
+++ /cvsroot/pkg-java/libpgjava/debian/changelog 2005/04/21 12:14:20 1.6
@@ -1,12 +1,34 @@
+libpgjava (7.4.7-2) unstable; urgency=low
+
+ * Build with free vm's:
+ - Updated README.Debian
+ - Included README.jdbc2-interface explaining why these old java.sql.*
+ source files are included, why they are needed and from where they come.
+ * Move to main (closes: #300753)
+ * Added patch to fix jikes compile error in JDBC2 optional classes
+ (02_jikes_jdbc2-optional_compilefix.patch)
+ * Build JDBC2 with optional classes but without SSL support
+ Building with SSL support would prevent running the JDBC2 driver on
+ jdk1.3 runtimes without SSL extensions or using the -Xverify:none flag
+ * Build.xml (03_BuildXml.patch):
+ - Patched to allow explicit selection of JDBC specification
+ with -Djdbc2=true or -Djdbc3=true arguments during build
+ - Patched to allow explicit selection of SSL usage during
+ compile time with -Dssl=true (JDBC2 build has to be built without SSL)
+ - Patched to allow explicit selection of compile target version with
+ -Dtarget=1.3 for JDBC2 and -Dtarget=1.4 for JDBC3
+
+ -- Wolfgang Baer <WBaer@gmx.de> Tue, 19 Apr 2005 20:28:25 +0200
+
libpgjava (7.4.7-1) unstable; urgency=medium
* New upstream release (closes: #275154)
- Changelog mentions jdbc fixes in 7.4.3 and 7.4.4 release
- * Changed debian/rules to only build once to prevent false compilation
+ Changelog mentions jdbc fixes for 7.4.3 and 7.4.4
+ * Changed debian/rules that only build once to prevent false compilation
of jdbc2 driver with jdbc3 classes (closes: #302710)
* avdyk: added Wolfgang and myself to the uploaders
-
- -- Wolfgang Baer <WBaer@gmx.de> Sat, 2 Apr 2005 18:14:29 +0200
+
+ -- Wolfgang Baer <WBaer@gmx.de> Sat, 2 Apr 2005 18:14:29 +0200
libpgjava (7.4.2-1) unstable; urgency=low
--- /cvsroot/pkg-java/libpgjava/debian/control 2005/04/04 20:09:25 1.6
+++ /cvsroot/pkg-java/libpgjava/debian/control 2005/04/21 12:14:20 1.7
@@ -1,16 +1,16 @@
Source: libpgjava
-Section: contrib/libs
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.3, j2sdk1.4, libant1.6-java, libxerces2-java
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.4.PRECVS12-1), libant1.6-java, libxerces2-java
Standards-Version: 3.6.1
Package: libpgjava
Architecture: all
-Section: contrib/libs
+Section: libs
Priority: optional
-Depends: classpath | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime
Suggests: postgresql (>= 7.1.3)
Description: Java database (JDBC) driver for PostgreSQL
Java classes for communication with the PostgreSQL 7.1/7.2/7.3/7.4 database
--- /cvsroot/pkg-java/libpgjava/debian/rules 2005/04/04 20:09:25 1.5
+++ /cvsroot/pkg-java/libpgjava/debian/rules 2005/04/21 12:14:20 1.6
@@ -4,29 +4,23 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# Build using Blackdown's JDK 1.3 and 1.4 Debian packages
-export JITC_PROCESSOR_TYPE=6
-#JAVA13_HOME := /usr/lib/j2sdk1.3-blackdown
-JAVA13_HOME := /usr/lib/j2se/1.3
-#JAVA14_HOME := /usr/lib/j2sdk1.4-sun
-JAVA14_HOME := /usr/lib/j2se/1.4
+JAVA_HOME := /usr/lib/kaffe
ANT_HOME := /usr/share/ant1.6
UPSTREAM_VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
majorversion := $(shell echo $(UPSTREAM_VERSION) | sed 's/^\([0-9][0-9]*\)\..*$$/\1/')
minorversion := $(shell echo $(UPSTREAM_VERSION) | sed 's/^[0-9][0-9]*\.\([0-9][0-9]*\).*$$/\1/')
-
clean::
rm -f postgresql-jdbc*.jar
-cd src/interfaces/jdbc && sh -c "CLASSPATH=$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar \
- $(JAVA13_HOME)/bin/java -Dant.home=$(ANT_HOME) \
+ $(JAVA_HOME)/bin/java -Dant.home=$(ANT_HOME) \
org.apache.tools.ant.Main clean"
-
-
build:
- cd src/interfaces/jdbc && sh -c "CLASSPATH=$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:$(JAVA13_HOME)/lib/tools.jar \
- $(JAVA13_HOME)/bin/java -Dant.home=$(ANT_HOME) \
+ # move jdbc2 interfaces extracted from gnu classpath to the source directory
+ cp -r debian/jdbc2_interfaces/* src/interfaces/jdbc
+ cd src/interfaces/jdbc && sh -c "CLASSPATH=$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar \
+ $(JAVA_HOME)/bin/java -Djdbc2=true -Dtarget=1.3 -Dant.home=$(ANT_HOME) -Dbuild.compiler=jikes \
org.apache.tools.ant.Main jar \
-Dmajor=$(majorversion) -Dminor=$(minorversion) \
-Dfullversion=$(UPSTREAM_VERSION) -Ddef_pgport=5432 \
@@ -34,16 +28,17 @@
mv src/interfaces/jdbc/jars/postgresql.jar postgresql-jdbc2.jar
rm src/interfaces/jdbc/org/postgresql/Driver.java
rm -rf src/interfaces/jdbc/build src/interfaces/jdbc/jars
+ # remove the jdbc2 interfaces classes before jdbc3 driver build
+ rm -rf src/interfaces/jdbc/java
- cd src/interfaces/jdbc && sh -c "CLASSPATH=$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(JAVA14_HOME)/lib/tools.jar:$(JAVA14_HOME)/jre/lib/jsse.jar \
- $(JAVA14_HOME)/bin/java -Dant.home=$(ANT_HOME) \
+ cd src/interfaces/jdbc && sh -c "CLASSPATH=$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar \
+ $(JAVA_HOME)/bin/java -Djdbc3=true -Dtarget=1.4 -Dssl=true -Dant.home=$(ANT_HOME) \
org.apache.tools.ant.Main jar \
-Dmajor=$(majorversion) -Dminor=$(minorversion) \
-Dfullversion=$(UPSTREAM_VERSION) -Ddef_pgport=5432 \
-Denable_debug=true"
mv src/interfaces/jdbc/jars/postgresql.jar postgresql-jdbc3.jar
-
install/libpgjava::
install -m 644 postgresql-jdbc2.jar debian/libpgjava/usr/share/java/postgresql-jdbc2-$(UPSTREAM_VERSION).jar
ln -s postgresql-jdbc2-$(UPSTREAM_VERSION).jar debian/libpgjava/usr/share/java/postgresql-jdbc2.jar