[pkg-java] r11232 - in trunk/eigenbase-farrago: . debian debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Fri Dec 11 17:56:22 UTC 2009
Author: drazzib
Date: 2009-12-11 17:56:22 +0000 (Fri, 11 Dec 2009)
New Revision: 11232
Added:
trunk/eigenbase-farrago/debian/
trunk/eigenbase-farrago/debian/README.source
trunk/eigenbase-farrago/debian/build.xml
trunk/eigenbase-farrago/debian/changelog
trunk/eigenbase-farrago/debian/compat
trunk/eigenbase-farrago/debian/control
trunk/eigenbase-farrago/debian/copyright
trunk/eigenbase-farrago/debian/patches/
trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff
trunk/eigenbase-farrago/debian/patches/series
trunk/eigenbase-farrago/debian/rules
trunk/eigenbase-farrago/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: trunk/eigenbase-farrago/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/eigenbase-farrago/debian/README.source
===================================================================
--- trunk/eigenbase-farrago/debian/README.source (rev 0)
+++ trunk/eigenbase-farrago/debian/README.source 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,9 @@
+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.
+
Added: trunk/eigenbase-farrago/debian/build.xml
===================================================================
--- trunk/eigenbase-farrago/debian/build.xml (rev 0)
+++ trunk/eigenbase-farrago/debian/build.xml 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<project name="eigenbase-farrago" default="jar" basedir="..">
+
+<target name="init">
+ <property name="src.dir" value="src"/>
+ <property name="build.dir" value="build"/>
+ <property name="jar" value="${build.dir}/eigenbase-properties-${deb.version}.jar"/>
+
+ <mkdir dir="${build.dir}"/>
+
+ <path id="farrago.run.classpath">
+ <pathelement location="/usr/share/java/eigenbase-resgen.jar"/>
+ <pathelement location="/usr/share/java/eigenbase-xom.jar"/>
+ <pathelement location="${build.dir}"/>
+ </path>
+ <property name="farrago.run.classpath" refid="farrago.run.classpath"/>
+ <echo message="${farrago.run.classpath}"/>
+</target>
+
+<target name="define-tasks" depends="init">
+ <taskdef name="resgen" classname="org.eigenbase.resgen.ResourceGenTask">
+ <classpath refid="farrago.run.classpath"/>
+ </taskdef>
+</target>
+
+<target name="clean" depends="init">
+ <delete dir="${build.dir}"/>
+</target>
+
+<target name="generate-res" depends="define-tasks">
+ <!-- Exception classes need to exist for reflection -->
+ <javac
+ srcdir="${src.dir}"
+ destdir="${build.dir}"
+ source="1.4" target="1.4"
+ debug="on" nowarn="on" deprecation="off">
+ <include name="**/EigenbaseException.java" />
+ <include name="**/EigenbaseContextException.java" />
+ <include name="**/EigenbaseFeatureException.java" />
+ <include name="**/SqlValidatorException.java" />
+ </javac>
+ <resgen
+ srcdir="${src.dir}"
+ destdir="${src.dir}"
+ resdir="${build.dir}"
+ style="functor"
+ locales="en_US">
+ <include name="net/sf/farrago/resource/FarragoResource.xml"/>
+ </resgen>
+ <resgen
+ srcdir="${src.dir}"
+ destdir="${src.dir}"
+ resdir="${build.dir}"
+ style="functor"
+ locales="en_US">
+ <include name="net/sf/farrago/resource/FarragoInternalQuery.xml"/>
+ </resgen>
+ <resgen
+ srcdir="${src.dir}"
+ destdir="${src.dir}"
+ resdir="${build.dir}"
+ style="functor"
+ locales="en_US">
+ <include name="org/eigenbase/resource/EigenbaseResource.xml"/>
+ </resgen>
+</target>
+
+<target name="compile" depends="generate-res">
+ <copy file="jdbc4/Unwrappable14.java"
+ tofile="src/org/eigenbase/jdbc4/Unwrappable.java"/>
+ <copy file="jdbc4/UnwrappableRJConnection14.java"
+ tofile="src/org/eigenbase/jdbc4/UnwrappableRJConnection.java"/>
+
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ source="1.5" target="1.5"
+ debug="on" nowarn="on" deprecation="off">
+ <include name="org/eigenbase/util14/**/*.java" />
+ <include name="org/eigenbase/util/property/**/*.java" />
+ <classpath refid="farrago.run.classpath"/>
+ </javac>
+
+ <copy todir="src/org/eigenbase/jdbc4/">
+ <fileset dir="jdbc4" includes="*.java"
+ excludes="Unwrappable*.java"/>
+ </copy>
+<!--
+ <javac srcdir="${src.dir}"
+ destdir="${build.dir}"
+ source="1.5" target="1.5"
+ debug="on" nowarn="on" deprecation="off">
+ <include name="org/eigenbase/**/*.java" />
+ <include name="com/disruptivetech/farrago/volcano/**/*.java" />
+ <exclude name="org/eigenbase/inventory/**/*.java" />
+ <classpath refid="farrago.run.classpath"/>
+ </javac>
+-->
+</target>
+
+<target name="jar" depends="compile">
+ <delete file="${jar}"/>
+
+ <jar jarfile="${jar}"
+ basedir="${build.dir}" />
+
+</target>
+
+</project>
Added: trunk/eigenbase-farrago/debian/changelog
===================================================================
--- trunk/eigenbase-farrago/debian/changelog (rev 0)
+++ trunk/eigenbase-farrago/debian/changelog 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,5 @@
+eigenbase-farrago (0.9.0-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #560234)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 10 Dec 2009 00:34:32 +0100
Added: trunk/eigenbase-farrago/debian/compat
===================================================================
--- trunk/eigenbase-farrago/debian/compat (rev 0)
+++ trunk/eigenbase-farrago/debian/compat 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1 @@
+7
Added: trunk/eigenbase-farrago/debian/control
===================================================================
--- trunk/eigenbase-farrago/debian/control (rev 0)
+++ trunk/eigenbase-farrago/debian/control 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,22 @@
+Source: eigenbase-farrago
+Section: java
+Priority: optional
+Maintainer: Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
+Build-Depends-Indep: libeigenbase-resgen-java
+Standards-Version: 3.8.3
+Vcs-Svn: http://svn.drazzib.com/debian-pkg/eigenbase-farrago/trunk
+Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/eigenbase-farrago/trunk
+Homepage: http://farrago.sourceforge.net/
+
+Package: libeigenbase-farrago-java
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
+ libeigenbase-resgen-java
+Description: Java framework for constructing RDBMS services
+ Farrago is an extensible platform for constructing
+ enterprise-class RDBMS services
+ .
+ Farrago is not an end-user product like MySQL or PostgreSQL.
+ It provides a standards-based pluggable architecture, component library, and
+ toolset for developers of other projects which specialize it.
Added: trunk/eigenbase-farrago/debian/copyright
===================================================================
--- trunk/eigenbase-farrago/debian/copyright (rev 0)
+++ trunk/eigenbase-farrago/debian/copyright 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,58 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Eigenbase Farago
+Maintainer: http://farrago.sourceforge.net/
+Source: http://sourceforge.net/projects/farrago/files/
+
+Files: *
+Copyright: Copyright (C) 2005-2009 The Eigenbase Project
+Copyright: Copyright (C) 2002-2009 SQLstream, Inc.
+Copyright: Copyright (C) 2005-2009 LucidEra, Inc.
+Copyright: Copyright (C) 2003-2009 John V. Sichi
+License: GPL-2+ with linking GPL-incompatible libraries exemption
+
+Files: debian/*
+Copyright: Copyright 2008-2009, Damien Raude-Morvan <drazzib at debian.org>
+License: GPL-2+
+
+License: GPL-2+ with linking GPL-incompatible libraries exemption
+ This software is released under the GNU General Public License,
+ which is reproduced below.
+
+ In addition, as a special exception, The Eigenbase Project gives
+ permission to link the code of this program with the following
+ GPL-incompatible libraries, and distribute linked combinations
+ including all of these:
+
+ - MDR library from Netbeans (or modified versions of MDR that use
+ the same license as MDR--the Sun Public License), including JMI
+ interfaces from Sun Microsystems
+
+ - All standard Java runtime libraries distributed by Sun Microsystems
+ as part of any release of J2SE or J2EE
+
+ - MOF, UML, and CWM model definitions from Object Management Group
+
+ - Apache Commons from the Apache Software Foundation
+
+ - Hibernate and supporting libraries from Red Hat Middleware
+
+ You must obey the GNU General Public License in all respects for all
+ of the code used other than the libraries listed above. If you modify
+ this program, you may extend this exception to your version of the
+ program, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version.
+
+ ======================================================
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version approved by The Eigenbase Project.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ On Debian GNU/Linux system you can find the complete text of the
+ GPL v2 license in `/usr/share/common-licenses/GPL-2'.
Added: trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff
===================================================================
--- trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff (rev 0)
+++ trunk/eigenbase-farrago/debian/patches/properties_java5_api.diff 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,71 @@
+--- a/src/org/eigenbase/util/property/Property.java
++++ b/src/org/eigenbase/util/property/Property.java
+@@ -262,10 +262,10 @@
+ // this is the object to add to list
+ Object o =
+ (trigger.isPersistent()) ? trigger
+- : (Object) new WeakReference /*<Trigger>*/(trigger);
++ : (Object) new WeakReference<Trigger>(trigger);
+
+ // Add a Trigger in the correct group of phases in the list
+- for (ListIterator /*<Object>*/ it = listIterator(); it.hasNext();) {
++ for (ListIterator<Object> it = listIterator(); it.hasNext();) {
+ Trigger t = convert(it.next());
+
+ if (t == null) {
+@@ -324,9 +324,9 @@
+ // a clone) so that we can remove any WeakReference whose
+ // content has become null. Synchronize, per the locking strategy,
+ // while the copy is being made.
+- List /*<Trigger>*/ l = new ArrayList /*<Trigger>*/();
++ List<Trigger> l = new ArrayList <Trigger>();
+ synchronized (property) {
+- for (Iterator /*<Object>*/ it = iterator(); it.hasNext();) {
++ for (Iterator<Object> it = iterator(); it.hasNext();) {
+ Trigger t = convert(it.next());
+ if (t == null) {
+ it.remove();
+--- a/src/org/eigenbase/util/property/TriggerableProperties.java
++++ b/src/org/eigenbase/util/property/TriggerableProperties.java
+@@ -43,8 +43,8 @@
+ //~ Instance fields --------------------------------------------------------
+
+ protected final Map triggers = new HashMap();
+- protected final Map /*<String, Property>*/ properties =
+- new HashMap /*<String, Property>*/();
++ protected final Map<String, Property> properties =
++ new HashMap <String, Property>();
+
+ //~ Constructors -----------------------------------------------------------
+
+@@ -121,7 +121,7 @@
+ */
+ public Property getPropertyDefinition(String path)
+ {
+- final List /*<Property>*/ propertyList = getPropertyList();
++ final List<Property> propertyList = getPropertyList();
+ for (int i = 0; i < propertyList.size(); i++) {
+ Property property = (Property) propertyList.get(i);
+ if (property.getPath().equals(path)) {
+@@ -166,7 +166,7 @@
+ *
+ * @return registered properties
+ */
+- public Collection /*<Property>*/ getProperties()
++ public Collection<Property> getProperties()
+ {
+ return Collections.unmodifiableCollection(properties.values());
+ }
+@@ -176,10 +176,10 @@
+ *
+ * @return List of properties
+ */
+- public List /*<Property>*/ getPropertyList()
++ public List<Property> getPropertyList()
+ {
+ Field [] fields = getClass().getFields();
+- List /*<Property>*/ list = new ArrayList /*<Property>*/();
++ List<Property> list = new ArrayList<Property>();
+ for (int i = 0; i < fields.length; i++) {
+ Field field = fields[i];
+ if (!Modifier.isStatic(field.getModifiers())
Added: trunk/eigenbase-farrago/debian/patches/series
===================================================================
--- trunk/eigenbase-farrago/debian/patches/series (rev 0)
+++ trunk/eigenbase-farrago/debian/patches/series 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1 @@
+properties_java5_api.diff
Added: trunk/eigenbase-farrago/debian/rules
===================================================================
--- trunk/eigenbase-farrago/debian/rules (rev 0)
+++ trunk/eigenbase-farrago/debian/rules 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Ddeb.version=${DEB_UPSTREAM_VERSION}
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_CLEAN_TARGET := clean
+
+install/libeigenbase-farrago-java::
+ dh_install build/eigenbase-properties-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_link usr/share/java/eigenbase-properties-$(DEB_UPSTREAM_VERSION).jar usr/share/java/eigenbase-properties.jar
+
+
+get-orig-source:
+ uscan --force-download --rename --repack
Property changes on: trunk/eigenbase-farrago/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/eigenbase-farrago/debian/watch
===================================================================
--- trunk/eigenbase-farrago/debian/watch (rev 0)
+++ trunk/eigenbase-farrago/debian/watch 2009-12-11 17:56:22 UTC (rev 11232)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/farrago/farrago-src-([\d\.]+).tar.bz2 debian uupdate
More information about the pkg-java-commits
mailing list