CVS libpgjava/debian

Wolfgang B??r wbaer-guest at haydn.debian.org
Sun Aug 14 13:07:56 UTC 2005


Update of /cvsroot/pkg-java/libpgjava/debian
In directory haydn:/tmp/cvs-serv2976/libpgjava/debian

Modified Files:
	changelog control copyright rules 
Added Files:
	NEWS libpg-java.dirs libpg-java.docs libpg-java.examples 
Removed Files:
	README.Debian libpgjava.dirs libpgjava.docs libpgjava.examples 
Log Message:
libpgjava (8.0-312-1) unstable; urgency=low

  * New upstream release
  * Changed library name to comply with java policy (closes: #275417)
  * Updated everything to the new source package structure
  * Updated copyright license and download location
  * Updated control file for minimum supported version 7.2
  * Deleted README.Debian - no longer needed
  * Dropped patches:
     + 01_getInfo_exception_fix.patch - JDBC 1 no longer implemented
     + 02_jikes_jdbc2-optional_compilefix.patch - no longer needed
  * Modified/New patches:
     + Renamed 03_BuildXml.patch to 01_BuildXml.patch and updated
     + 02_PSQLException_JDK13.patch (depends on 01_BuildXml.patch)
  * postgresql.jar now links to the JDBC 3 jar (added NEWS)
  * Changed build-dep libant1.6-java to ant (control, rules)
  * Standards-Version: 3.6.2 - no changes


--- /cvsroot/pkg-java/libpgjava/debian/changelog	2005/04/21 12:29:24	1.7
+++ /cvsroot/pkg-java/libpgjava/debian/changelog	2005/08/14 13:07:55	1.8
@@ -1,3 +1,31 @@
+libpgjava (8.0-312-1) unstable; urgency=low
+
+  * New upstream release
+    + Supports Postgresql 7.2 up to 8.0 releases
+    + Upstream supplies its own source packages for the jdbc driver 
+      starting with release 8.0 - no longer extracted from postgresql
+  * Changed library name to comply with java policy (closes: #275417)
+    + Added conflicts, replaces with old binary
+    + Changed debian/rules and debhelper files accordingly
+    + Added dummy package libpgjava for transition
+  * Updated everything to the new source package structure
+  * Updated copyright license and download location
+  * Updated control file for minimum supported version 7.2
+  * Deleted README.Debian - no longer needed
+  * Dropped patches:
+    + 01_getInfo_exception_fix.patch - JDBC 1 no longer implemented
+    + 02_jikes_jdbc2-optional_compilefix.patch - no longer needed
+  * Modified/New patches:
+    + Renamed 03_BuildXml.patch to 01_BuildXml.patch and updated
+    + 02_PSQLException_JDK13.patch (depends on 01_BuildXml.patch)
+  * postgresql.jar now links to the JDBC 3 jar (added NEWS)
+  * Changed build-dep libant1.6-java to ant (control, rules)
+  * Standards-Version: 3.6.2 - no changes
+
+  * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Wed, 10 Aug 2005 20:52:08 +0200
+
 libpgjava (7.4.7-3) unstable; urgency=low
 
   * Built with sources...
--- /cvsroot/pkg-java/libpgjava/debian/control	2005/04/21 12:14:20	1.7
+++ /cvsroot/pkg-java/libpgjava/debian/control	2005/08/14 13:07:55	1.8
@@ -3,18 +3,29 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-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
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, kaffe (>= 2:1.1.5-1), ant, libxerces2-java
+Standards-Version: 3.6.2
 
-Package: libpgjava
+Package: libpg-java
 Architecture: all
 Section: libs
 Priority: optional
 Depends: kaffe | java1-runtime | java2-runtime
-Suggests: postgresql (>= 7.1.3)
+Suggests: postgresql (>= 7.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.1/7.2/7.3/7.4 database
+ Java classes for communication with the PostgreSQL 7.2 up to 8.0 database
  backend (local or remote) using JDBC. This package contains two Java archives
- (JARs), one that supports JDBC 2.0 (for JDK 1.2 and up) and one that supports
+ (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).
 
+Package: libpgjava
+Architecture: all
+Section: libs
+Priority: optional
+Depends: libpg-java
+Description: Java database (JDBC) driver for PostgreSQL - transitional package
+ A dummy package for transition to the new libpg-java package. It can be
+ removed after the upgrade.
--- /cvsroot/pkg-java/libpgjava/debian/copyright	2004/04/19 17:52:27	1.2
+++ /cvsroot/pkg-java/libpgjava/debian/copyright	2005/08/14 13:07:55	1.3
@@ -2,31 +2,33 @@
 Tue Mar 31 22:14:59 BST 1998 and is now maintained by Stefan Gybas
 <sgybas at debian.org>.
 
-The upstream archive postgresql-opt-*.tar.gz was downloaded from
-ftp://ftp.postgresql.org/pub/.
+The upstream archive was downloaded from <http://jdbc.postgresql.org/>
 
 Copyright:
 
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
+Copyright (c) 1997-2005, PostgreSQL Global Development Group
+All rights reserved.
 
-Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Portions Copyright (c) 1994, The Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose, without fee, and without a written agreement
-is hereby granted, provided that the above copyright notice and this
-paragraph and the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
-LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
-DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+   of its contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
-PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
--- /cvsroot/pkg-java/libpgjava/debian/rules	2005/04/21 12:14:20	1.6
+++ /cvsroot/pkg-java/libpgjava/debian/rules	2005/08/14 13:07:55	1.7
@@ -4,45 +4,39 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME    := /usr/share/ant1.6
+export JAVA_HOME := /usr/lib/kaffe
 
 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 \
-		$(JAVA_HOME)/bin/java -Dant.home=$(ANT_HOME) \
-		org.apache.tools.ant.Main clean"
+	rm -f org/postgresql/Driver.java org/postgresql/util/PSQLException.java postgresql-jdbc*.jar
+	rm -rf build jars java
+
 build:
-	# 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 \
-		-Denable_debug=true"
-	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 \
-		$(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
-	install -m 644 postgresql-jdbc3.jar debian/libpgjava/usr/share/java/postgresql-jdbc3-$(UPSTREAM_VERSION).jar
-	ln -s postgresql-jdbc3-$(UPSTREAM_VERSION).jar debian/libpgjava/usr/share/java/postgresql-jdbc3.jar
-	ln -s postgresql-jdbc2-$(UPSTREAM_VERSION).jar debian/libpgjava/usr/share/java/postgresql.jar
+	# 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/* .
+
+	# build JDBC 2
+	ant -Djdbc2=true -Dtarget=1.3 -Dbuild.compiler=jikes 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
+
+	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
 



More information about the pkg-java-commits mailing list