[pkg-java] r10212 - trunk/libhibernate3-java/debian
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Mon Aug 31 20:09:13 UTC 2009
Author: drazzib-guest
Date: 2009-08-31 20:09:12 +0000 (Mon, 31 Aug 2009)
New Revision: 10212
Added:
trunk/libhibernate3-java/debian/README.source
trunk/libhibernate3-java/debian/libhibernate3-java-doc.doc-base
trunk/libhibernate3-java/debian/libhibernate3-java-doc.install
Removed:
trunk/libhibernate3-java/debian/README.Debian-source
trunk/libhibernate3-java/debian/libhibernate3-java-doc.docs
Modified:
trunk/libhibernate3-java/debian/build.xml
trunk/libhibernate3-java/debian/changelog
trunk/libhibernate3-java/debian/control
trunk/libhibernate3-java/debian/copyright
trunk/libhibernate3-java/debian/rules
Log:
[libhibernate3-java]
[ Damien Raude-Morvan ]
* Add myself as Uploaders
* Build with java-gcj-compat-dev instead of default-jdk (OpenJDK-6) as
Hibernate FTBFS with JDBC4 API. (Closes: #543085)
<http://opensource.atlassian.com/projects/hibernate/browse/HHH-2412>
* Bump Standards-Version to 3.8.3:
- Move to "java" section of Debian archive
- Move debian/README.Debian-source to debian/README.source
- Describe quilt patch system in debian/README.source
* debian/control:
- Move ant and java-gcj-compat-dev to B-D-I (needed for clean target)
- Fix Vcs-Svn field (use svn access instead of svn+ssh)
- Add ${misc:Depends} for every binary package
* debian/copyright:
- Update copyright years
- Update files locations regarding upstream tarball
- Use LGPL-2.1 instead of LGPL symlink
* Javadoc API:
- Install Javadoc API to /usr/share/doc/libhibernate3-java/api/
- Register with doc-base
Deleted: trunk/libhibernate3-java/debian/README.Debian-source
===================================================================
--- trunk/libhibernate3-java/debian/README.Debian-source 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/README.Debian-source 2009-08-31 20:09:12 UTC (rev 10212)
@@ -1,13 +0,0 @@
-libhibernate3-java
-==================
-
-The upstream supplied source package contains binary jar files and
-pre-built documentation. Currently no clean source distribution
-exists. Therefore, the upstream sources were modified to comply with
-the Debian Free Software Guidelines.
-
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varunhiremath at gmail.com>, Sat, 10 Nov 2007 15:31:20 +0530
Added: trunk/libhibernate3-java/debian/README.source
===================================================================
--- trunk/libhibernate3-java/debian/README.source (rev 0)
+++ trunk/libhibernate3-java/debian/README.source 2009-08-31 20:09:12 UTC (rev 10212)
@@ -0,0 +1,23 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
+Repacked upstream tarball
+=========================
+
+The upstream supplied source package contains binary jar files and
+pre-built documentation. Currently no clean source distribution
+exists. Therefore, the upstream sources were modified to comply with
+the Debian Free Software Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the
+debian/orig-tar.sh file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>, Sat, 10 Nov 2007 15:31:20 +0530
Modified: trunk/libhibernate3-java/debian/build.xml
===================================================================
--- trunk/libhibernate3-java/debian/build.xml 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/build.xml 2009-08-31 20:09:12 UTC (rev 10212)
@@ -33,7 +33,7 @@
<mkdir dir="${class.dir}"/>
<javac srcdir="${core.source.dir}" destdir="${class.dir}"
- debug="true" source="1.5"/>
+ debug="true" source="1.5" nowarn="true"/>
<javac srcdir="${ehcache.source.dir}" destdir="${class.dir}"
debug="true" nowarn="true" source="1.5"/>
Modified: trunk/libhibernate3-java/debian/changelog
===================================================================
--- trunk/libhibernate3-java/debian/changelog 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/changelog 2009-08-31 20:09:12 UTC (rev 10212)
@@ -1,12 +1,32 @@
libhibernate3-java (3.3.1.GA+dak1-4) unstable; urgency=low
- UNRELEASED
- * Really switch to default-java. (Closes: #543085)
+ [ Torsten Werner ]
* Set nowarn="true" in javac task in debian/build.xml.
* Add asm to DEB_JARS in debian/rules.
- -- Torsten Werner <twerner at debian.org> Sun, 23 Aug 2009 22:24:28 +0200
+ [ Damien Raude-Morvan ]
+ * Add myself as Uploaders
+ * Build with java-gcj-compat-dev instead of default-jdk (OpenJDK-6) as
+ Hibernate FTBFS with JDBC4 API. (Closes: #543085)
+ <http://opensource.atlassian.com/projects/hibernate/browse/HHH-2412>
+ * Bump Standards-Version to 3.8.3:
+ - Move to "java" section of Debian archive
+ - Move debian/README.Debian-source to debian/README.source
+ - Describe quilt patch system in debian/README.source
+ * debian/control:
+ - Move ant and java-gcj-compat-dev to B-D-I (needed for clean target)
+ - Fix Vcs-Svn field (use svn access instead of svn+ssh)
+ - Add ${misc:Depends} for every binary package
+ * debian/copyright:
+ - Update copyright years
+ - Update files locations regarding upstream tarball
+ - Use LGPL-2.1 instead of LGPL symlink
+ * Javadoc API:
+ - Install Javadoc API to /usr/share/doc/libhibernate3-java/api/
+ - Register with doc-base
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 31 Aug 2009 21:48:32 +0200
+
libhibernate3-java (3.3.1.GA+dak1-3) unstable; urgency=low
* Build jboss-cache2, c3p0 and proxool components.
Modified: trunk/libhibernate3-java/debian/control
===================================================================
--- trunk/libhibernate3-java/debian/control 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/control 2009-08-31 20:09:12 UTC (rev 10212)
@@ -1,23 +1,24 @@
Source: libhibernate3-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt
-Build-Depends-Indep: ant, ant-optional, antlr, glassfish-javaee,
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>,
+ Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: debhelper (>= 5), cdbs, quilt, java-gcj-compat-dev, ant
+Build-Depends-Indep: ant-optional, antlr, glassfish-javaee,
junit, libasm-java, libcglib2.1-java, libcommons-collections3-java,
libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java,
libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java,
- default-jdk, libjboss-jmx-java, libjboss-system-java, libjboss-cache1-java,
+ libjboss-jmx-java, libjboss-system-java, libjboss-cache1-java,
libjboss-cache2-java, libslf4j-java, libjgroups-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
Homepage: http://www.hibernate.org
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libhibernate3-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhibernate3-java
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhibernate3-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhibernate3-java/
Package: libhibernate3-java
Architecture: all
-Depends: default-jre-headless | java5-runtime-headless, antlr, glassfish-javaee,
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, antlr, glassfish-javaee,
junit, libasm-java, libcglib2.1-java, libcommons-collections3-java,
libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java,
libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java,
@@ -37,6 +38,7 @@
Package: libhibernate3-java-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: libhibernate3-java
Description: Relational Persistence for Idiomatic Java (documentation)
Hibernate is a powerful, high performance object/relational persistence
Modified: trunk/libhibernate3-java/debian/copyright
===================================================================
--- trunk/libhibernate3-java/debian/copyright 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/copyright 2009-08-31 20:09:12 UTC (rev 10212)
@@ -11,7 +11,7 @@
Steve Ebersole <steveebersole at users.sourceforge.net>
Christian Bauer <turin42 at users.sourceforge.net>
-Copyright: (C) 2006, 2007, Red Hat Middleware, LLC.
+Copyright: Copyright 2006-2008, Red Hat Middleware, LLC.
License:
@@ -26,18 +26,17 @@
Lesser General Public License for more details.
On Debian GNU/Linux system you can find a copy of this license in
-`/usr/share/common-licenses/LGPL'.
+`/usr/share/common-licenses/LGPL-2.1'.
--------
Files:
- src/org/hibernate/exception/ExceptionUtils.java
- src/org/hibernate/exception/Nestable.java
- src/org/hibernate/exception/NestableDelegate.java
- src/org/hibernate/exception/NestableException.java
- src/org/hibernate/exception/NestableRuntimeException.java
- src/org/hibernate/util/FastHashMap.java
- src/org/hibernate/util/SerializationHelper.java
+ project/core/src/main/java/org/hibernate/exception/ExceptionUtils.java
+ project/core/src/main/java/org/hibernate/exception/Nestable.java
+ project/core/src/main/java/org/hibernate/exception/NestableDelegate.java
+ project/core/src/main/java/org/hibernate/exception/NestableException.java
+ project/core/src/main/java/org/hibernate/exception/NestableRuntimeException.java
+ project/core/src/main/java/org/hibernate/util/FastHashMap.java
Copyright (c) 2002-2003 The Apache Software Foundation. All rights reserved.
@@ -88,8 +87,8 @@
--------
Files:
- src/org/hibernate/cache/EhCache.java
- src/org/hibernate/cache/EhCacheProvider.java
+ project/cache-ehcache/src/main/java/org/hibernate/cache/EhCache.java
+ project/cache-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java
Copyright 2003-2006 Greg Luck, Jboss Inc
@@ -98,6 +97,6 @@
On Debian GNU/Linux system you can find the complete text of the
Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
-The Debian packaging is (C) 2007, Torsten Werner <twerner at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is Copyright 2007, Torsten Werner <twerner at debian.org>
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: trunk/libhibernate3-java/debian/libhibernate3-java-doc.doc-base
===================================================================
--- trunk/libhibernate3-java/debian/libhibernate3-java-doc.doc-base (rev 0)
+++ trunk/libhibernate3-java/debian/libhibernate3-java-doc.doc-base 2009-08-31 20:09:12 UTC (rev 10212)
@@ -0,0 +1,9 @@
+Document: libhibernate3-java
+Title: API Javadoc for libhibernate3-java
+Author: Hibernate 3.x Developers
+Abstract: This is the API Javadoc provided by the Hibernate 3.x library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libhibernate3-java/api/index.html
+Files: /usr/share/doc/libhibernate3-java/api/*
Deleted: trunk/libhibernate3-java/debian/libhibernate3-java-doc.docs
===================================================================
--- trunk/libhibernate3-java/debian/libhibernate3-java-doc.docs 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/libhibernate3-java-doc.docs 2009-08-31 20:09:12 UTC (rev 10212)
@@ -1 +0,0 @@
-javadoc/*
Copied: trunk/libhibernate3-java/debian/libhibernate3-java-doc.install (from rev 10211, trunk/libhibernate3-java/debian/libhibernate3-java-doc.docs)
===================================================================
--- trunk/libhibernate3-java/debian/libhibernate3-java-doc.install (rev 0)
+++ trunk/libhibernate3-java/debian/libhibernate3-java-doc.install 2009-08-31 20:09:12 UTC (rev 10212)
@@ -0,0 +1 @@
+javadoc/* /usr/share/doc/libhibernate3-java/api/
Modified: trunk/libhibernate3-java/debian/rules
===================================================================
--- trunk/libhibernate3-java/debian/rules 2009-08-31 03:16:18 UTC (rev 10211)
+++ trunk/libhibernate3-java/debian/rules 2009-08-31 20:09:12 UTC (rev 10212)
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/default-java
+JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILD_TARGET := jar javadoc
DEB_JARS := ant-antlr ant-junit antlr asm asm-attrs ehcache cglib commons-collections3 \
@@ -13,9 +13,8 @@
jgroups-all
install/libhibernate3-java::
- install -m 644 -D hibernate3.jar \
- debian/libhibernate3-java/usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/hibernate3.jar
+ dh_install hibernate3.jar /usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java/hibernate3-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/hibernate3.jar
get-orig-source:
uscan --upstream-version 0 --rename
More information about the pkg-java-commits
mailing list