Author: rockclimb-guest Date: 2011-02-28 22:49:39 +0000 (Mon, 28 Feb 2011) New Revision: 13365
Added: trunk/libpgjava/debian/libpg-java-doc.javadoc trunk/libpgjava/debian/libpg-java.jlibs trunk/libpgjava/debian/patches/ trunk/libpgjava/debian/patches/link-javadoc.patch trunk/libpgjava/debian/patches/series trunk/libpgjava/debian/source/ trunk/libpgjava/debian/source/format Modified: trunk/libpgjava/debian/changelog trunk/libpgjava/debian/control trunk/libpgjava/debian/copyright trunk/libpgjava/debian/rules trunk/libpgjava/debian/watch Log: Updated for new upstream version. Modified: trunk/libpgjava/debian/changelog =================================================================== --- trunk/libpgjava/debian/changelog 2011-02-28 09:08:13 UTC (rev 13364) +++ trunk/libpgjava/debian/changelog 2011-02-28 22:49:39 UTC (rev 13365) @@ -1,3 +1,16 @@ +libpgjava (8.4-702-1) unstable; urgency=low + + * New upstream release (closes: #612643) + * Build JDBC4 libraries in addition to JDBC3. + * Use debhelper and javahelper rather than cdbs + * Updated Standards-Version to 3.9.1. + * Don't depend on a jre (to match current java package policy) + * Added myself to Uploaders. + * Changed source format to 3.0 (quilt). + * Added a package containing the public API documentation. + + -- Andrew Ross <[email protected]> Sat, 12 Feb 2011 16:41:22 +0000 + libpgjava (8.4-701-1) unstable; urgency=low * New upstream release. Modified: trunk/libpgjava/debian/control =================================================================== --- trunk/libpgjava/debian/control 2011-02-28 09:08:13 UTC (rev 13364) +++ trunk/libpgjava/debian/control 2011-02-28 22:49:39 UTC (rev 13365) @@ -2,24 +2,38 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Matthias Klose <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, java-gcj-compat-dev, ant -Build-Depends-Indep: libxerces2-java -Standards-Version: 3.8.3 +Uploaders: Arnaud Vandyck <[email protected]>, Matthias Klose <[email protected]>, + Michael Koch <[email protected]>, Andrew Ross <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), java-gcj-compat-dev, ant, javahelper (>=0.32~) +Build-Depends-Indep: libxerces2-java, default-jdk, default-jdk-doc +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libpgjava Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libpgjava Homepage: http://jdbc.postgresql.org/ Package: libpg-java Architecture: all -Priority: optional -Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, ${misc:Depends} +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} 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.3 database + Java classes for communication with the PostgreSQL 7.2 up to 8.4 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). + (JARs), one that supports JDBC 3.0 and SSL (for JDK 1.4 and up) and one that + supports JDBC 4.0 and SSL (for JDK 1.6 and up). + +Package: libpg-java-doc +Section: doc +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} +Description: Java database (JDBC) driver for PostgreSQL (documentation) + Java classes for communication with the PostgreSQL 7.2 up to 8.4 database + backend (local or remote) using JDBC. This package contains two Java archives + (JARs), one that supports JDBC 3.0 and SSL (for JDK 1.4 and up) and one that + supports JDBC 4.0 and SSL (for JDK 1.6 and up). + . + This package contains the documentation. Modified: trunk/libpgjava/debian/copyright =================================================================== --- trunk/libpgjava/debian/copyright 2011-02-28 09:08:13 UTC (rev 13364) +++ trunk/libpgjava/debian/copyright 2011-02-28 22:49:39 UTC (rev 13365) @@ -1,12 +1,13 @@ -This package was debianized by Oliver Elphick [email protected] on -Tue Mar 31 22:14:59 BST 1998 and is now maintained by Stefan Gybas -<[email protected]>. +This package was debianized by Oliver Elphick [email protected] on Tue +Mar 31 22:14:59 BST 1998 was previously maintained by Stefan Gybas +<[email protected]> and is now maintained by the Debian Java +Maintainers <[email protected]> team. The upstream archive was downloaded from <http://jdbc.postgresql.org/> Copyright: -Copyright (c) 1997-2005, PostgreSQL Global Development Group +Copyright (c) 1997-2009, PostgreSQL Global Development Group All rights reserved. Redistribution and use in source and binary forms, with or without Added: trunk/libpgjava/debian/libpg-java-doc.javadoc =================================================================== --- trunk/libpgjava/debian/libpg-java-doc.javadoc (rev 0) +++ trunk/libpgjava/debian/libpg-java-doc.javadoc 2011-02-28 22:49:39 UTC (rev 13365) @@ -0,0 +1 @@ +build/publicapi /usr/share/doc/libpg-java-doc/api \ No newline at end of file Added: trunk/libpgjava/debian/libpg-java.jlibs =================================================================== --- trunk/libpgjava/debian/libpg-java.jlibs (rev 0) +++ trunk/libpgjava/debian/libpg-java.jlibs 2011-02-28 22:49:39 UTC (rev 13365) @@ -0,0 +1,2 @@ +postgresql-jdbc3.jar +postgresql-jdbc4.jar Added: trunk/libpgjava/debian/patches/link-javadoc.patch =================================================================== --- trunk/libpgjava/debian/patches/link-javadoc.patch (rev 0) +++ trunk/libpgjava/debian/patches/link-javadoc.patch 2011-02-28 22:49:39 UTC (rev 13365) @@ -0,0 +1,12 @@ +Modify the javadoc build process so it links against the JDK +javadoc. +--- a/build.xml ++++ b/build.xml +@@ -415,6 +415,7 @@ + <include name="ds/common/BaseDataSource.java" /> + <include name="xa/PGXADataSource.java" /> + </fileset> ++ <link href="/usr/share/doc/default-jdk-doc/api" /> + </javadoc> + </target> + Added: trunk/libpgjava/debian/patches/series =================================================================== --- trunk/libpgjava/debian/patches/series (rev 0) +++ trunk/libpgjava/debian/patches/series 2011-02-28 22:49:39 UTC (rev 13365) @@ -0,0 +1 @@ +link-javadoc.patch Modified: trunk/libpgjava/debian/rules =================================================================== --- trunk/libpgjava/debian/rules 2011-02-28 09:08:13 UTC (rev 13364) +++ trunk/libpgjava/debian/rules 2011-02-28 22:49:39 UTC (rev 13365) @@ -1,35 +1,31 @@ #!/usr/bin/make -f -# debian/rules file for libpgjava (uses cdbs) +# debian/rules file for libpgjava (uses debhelper and javahelper) -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +%: + dh $@ --with javahelper -export JAVA_HOME := /usr/lib/jvm/java-gcj -UPSTREAM_VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) +override_dh_auto_build: +# build JDBC 3 with java-gcj + ant clean + JAVA_HOME=/usr/lib/jvm/java-gcj ant -Djdbc3=true -Dtarget=1.4 -Dsource=1.4 -Dssl=true jar + mv jars/postgresql.jar postgresql-jdbc3.jar +# build JDBC 4 with default-java + ant clean + JAVA_HOME=/usr/lib/jvm/default-java ant -Djdbc4=true -Dtarget=1.6 -Dsource=1.6 -Dssl=true jar publicapi + mv jars/postgresql.jar postgresql-jdbc4.jar -build: -# move jdbc2 interfaces to the source directory - #cp -r debian/jdbc2_interfaces/* . -# build JDBC 2 - #ant -Djdbc2=true -Dtarget=1.3 -Dsource=1.3 jar +# remove the created jars in our clean +override_jh_clean: + jh_clean + rm -f postgresql-jdbc3.jar + rm -f postgresql-jdbc4.jar - -mv jars/postgresql.jar postgresql-jdbc2.jar +# add a symlink from postgresql.jar to postgresql-jdbc3.jar +# This maintains compatibility with the previous version of +# this package +override_jh_installlibs: + jh_installlibs + dh_link usr/share/java/postgresql-jdbc3.jar usr/share/java/postgresql.jar -# remove stuff from jdbc2 built including jdbc2 interfaces - -rm org/postgresql/Driver.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-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 - Added: trunk/libpgjava/debian/source/format =================================================================== --- trunk/libpgjava/debian/source/format (rev 0) +++ trunk/libpgjava/debian/source/format 2011-02-28 22:49:39 UTC (rev 13365) @@ -0,0 +1 @@ +3.0 (quilt) Modified: trunk/libpgjava/debian/watch =================================================================== --- trunk/libpgjava/debian/watch 2011-02-28 09:08:13 UTC (rev 13364) +++ trunk/libpgjava/debian/watch 2011-02-28 22:49:39 UTC (rev 13365) @@ -1,2 +1,2 @@ version=3 -http://jdbc.postgresql.org/download.html download/postgresql-jdbc-(.*)\.src\.tar\.gz +http://jdbc.postgresql.org/download.html download/postgresql-jdbc-(8\..*)\.src\.tar\.gz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
