Author: twerner
Date: 2009-09-08 19:30:21 +0000 (Tue, 08 Sep 2009)
New Revision: 10323
Added:
trunk/libjboss-aop-java/debian/patches/build.diff
Removed:
trunk/libjboss-aop-java/debian/ant.properties
trunk/libjboss-aop-java/debian/build.xml
Modified:
trunk/libjboss-aop-java/debian/changelog
trunk/libjboss-aop-java/debian/patches/series
trunk/libjboss-aop-java/debian/rules
Log:
* new upstream version (Closes: #543073)
* Use upstream provided build.xml.
* Install jboss-aop-client.jar, too.
Deleted: trunk/libjboss-aop-java/debian/ant.properties
===================================================================
--- trunk/libjboss-aop-java/debian/ant.properties 2009-09-07 23:50:45 UTC
(rev 10322)
+++ trunk/libjboss-aop-java/debian/ant.properties 2009-09-08 19:30:21 UTC
(rev 10323)
@@ -1,11 +0,0 @@
-project.name=jboss-aop
-class.dir=classes
-source.dir=src
-
-aspect-framework.dir=aspect-framework
-aspects.dir=aspects
-aspect-deployer.dir=aspect-deployer
-
-aspect-framework.jar=jboss-aop.jar
-aspects.jar=jboss-aspects.jar
-aspect-deployer.jar=jboss-aspect-deployer.jar
Deleted: trunk/libjboss-aop-java/debian/build.xml
===================================================================
--- trunk/libjboss-aop-java/debian/build.xml 2009-09-07 23:50:45 UTC (rev
10322)
+++ trunk/libjboss-aop-java/debian/build.xml 2009-09-08 19:30:21 UTC (rev
10323)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${source.dir}/${aspects.dir}/${class.dir}" quiet="true"/>
- <delete dir="${source.dir}/${aspect-framework.dir}/${class.dir}"
quiet="true"/>
- <delete dir="${source.dir}/${aspects-deployer.dir}/${class.dir}"
quiet="true"/>
- <delete file="${aspects.jar}" quiet="true"/>
- <delete file="${aspect-framework.jar}" quiet="true"/>
- <delete file="${aspect-deployer.jar}" quiet="true"/>
- </target>
-
- <target name="jar">
- <mkdir dir="${source.dir}/${aspect-framework.dir}/${class.dir}"/>
- <jjtree
target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/pointcut.jjt"
- javacchome="/usr/share/java/"
-
outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
- <javacc
target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/pointcut.jj"
- javacchome="/usr/share/java/" static="false" debugparser="true"
-
outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
- <jjtree
target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/typeExpression.jjt"
- javacchome="/usr/share/java/"
-
outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
- <javacc
target="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/typeExpression.jj"
- javacchome="/usr/share/java/" static="false" debugparser="true"
-
outputdirectory="${source.dir}/${aspect-framework.dir}/main/org/jboss/aop/pointcut/ast/"/>
- <javac srcdir="${source.dir}/${aspect-framework.dir}/main"
- destdir="${source.dir}/${aspect-framework.dir}/${class.dir}"
- debug="true" source="1.5"/>
-
- <jar jarfile="${aspect-framework.jar}">
- <fileset dir="${source.dir}/${aspect-framework.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
-
-<!-- <mkdir dir="${source.dir}/${aspect-deployer.dir}/${class.dir}"/> -->
-<!-- <javac srcdir="${source.dir}/${aspect-deployer.dir}/main"
destdir="${source.dir}/${aspect-deployer.dir}/${class.dir}" -->
-<!-- debug="true" source="1.5" classpath="${aspect-framework.jar}" /> -->
-
-<!-- <jar jarfile="${aspect-deployer.jar}"> -->
-<!-- <fileset dir="${source.dir}/${aspect-deployer.dir}/${class.dir}">
-->
-<!-- <include name="**"/> -->
-<!-- </fileset> -->
-<!-- </jar> -->
-
- <mkdir dir="${source.dir}/${aspects.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${aspects.dir}/main"
destdir="${source.dir}/${aspects.dir}/${class.dir}"
- debug="true" source="1.5" classpath="${aspect-framework.jar}"/>
-
- <jar jarfile="${aspect-framework.jar}">
- <fileset dir="${source.dir}/${aspect-framework.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- <fileset dir="${source.dir}/${aspects.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
-</project>
Modified: trunk/libjboss-aop-java/debian/changelog
===================================================================
--- trunk/libjboss-aop-java/debian/changelog 2009-09-07 23:50:45 UTC (rev
10322)
+++ trunk/libjboss-aop-java/debian/changelog 2009-09-08 19:30:21 UTC (rev
10323)
@@ -1,10 +1,12 @@
libjboss-aop-java (2.1.3.GA-1) unstable; urgency=low
UNRELEASED
- * new upstream version
+ * new upstream version (Closes: #543073)
* Switch to default-java.
+ * Use upstream provided build.xml.
+ * Install jboss-aop-client.jar, too.
- -- Torsten Werner <[email protected]> Sun, 30 Aug 2009 04:06:11 +0200
+ -- Torsten Werner <[email protected]> Tue, 08 Sep 2009 21:24:53 +0200
libjboss-aop-java (2.0.0.SP1-1) unstable; urgency=low
Added: trunk/libjboss-aop-java/debian/patches/build.diff
===================================================================
--- trunk/libjboss-aop-java/debian/patches/build.diff
(rev 0)
+++ trunk/libjboss-aop-java/debian/patches/build.diff 2009-09-08 19:30:21 UTC
(rev 10323)
@@ -0,0 +1,21 @@
+TODO: pluggable-instrumentor does not build for unknown reasons
+
+Index: libjboss-aop-java-2.1.3.GA/build.xml
+===================================================================
+--- libjboss-aop-java-2.1.3.GA.orig/build.xml 2009-09-08 21:27:11.000000000
+0200
++++ libjboss-aop-java-2.1.3.GA/build.xml 2009-09-08 21:27:36.000000000
+0200
+@@ -150,14 +150,6 @@
+ <fileset file="docs/jboss-aop_1_0.dtd"/>
+ <fileset file ="${build.etc}/jbossorg-eula.txt"/>
+ </jar>
+- <jar jarfile="${build.lib}/pluggable-instrumentor.jar"
+- manifest="${build.etc}/pluggable-instrumentor.mf">
+- <fileset dir="${build.classes}">
+- <!-- Include everything else -->
+- <include
name="org/jboss/aop/standalone/PluggableInstrumentor.class"/>
+- </fileset>
+- <fileset file ="${build.etc}/jbossorg-eula.txt"/>
+- </jar>
+ <!-- Build the jboss-aop-client.jar needed for EJB 3-->
+ <jar jarfile="${build.lib}/jboss-aop-client.jar"
+ manifest="${build.etc}/default.mf">
Modified: trunk/libjboss-aop-java/debian/patches/series
===================================================================
--- trunk/libjboss-aop-java/debian/patches/series 2009-09-07 23:50:45 UTC
(rev 10322)
+++ trunk/libjboss-aop-java/debian/patches/series 2009-09-08 19:30:21 UTC
(rev 10323)
@@ -1,2 +1,3 @@
enum.diff
#catch_exception.diff
+build.diff
Modified: trunk/libjboss-aop-java/debian/rules
===================================================================
--- trunk/libjboss-aop-java/debian/rules 2009-09-07 23:50:45 UTC (rev
10322)
+++ trunk/libjboss-aop-java/debian/rules 2009-09-08 19:30:21 UTC (rev
10323)
@@ -5,16 +5,17 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_BUILD_TARGET := jars15
DEB_JARS := javassist trove qdox junit javacc ant-nodeps bsh
log4j-1.2 servlet-api\
jboss-common jboss-j2ee concurrent jboss-deployment
jboss-test commons-logging \
jboss-remoting jboss-microcontainer jboss-jmx
jboss-system jboss-transaction \
jboss-ejb3x jboss-reflect jboss-metadata
install/libjboss-aop-java::
- install -m 644 -D jboss-aop.jar
$(DEB_DESTDIR)/usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar
+ install -m 644 -D output/lib/jboss-aop.jar
$(DEB_DESTDIR)/usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar
dh_link /usr/share/java/jboss-aop-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/jboss-aop.jar
+ install -m 644 -D output/lib/jboss-aop-client.jar
$(DEB_DESTDIR)/usr/share/java/jboss-aop-client-$(DEB_UPSTREAM_VERSION).jar
+ dh_link /usr/share/java/jboss-aop-client-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/jboss-aop-client.jar
get-orig-source:
-uscan --upstream-version 0
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
