Author: varun
Date: 2008-05-20 04:48:23 +0000 (Tue, 20 May 2008)
New Revision: 6476
Modified:
trunk/libjboss-aop-java/debian/build.xml
trunk/libjboss-aop-java/debian/changelog
trunk/libjboss-aop-java/debian/rules
Log:
Merge jboss-aspects.jar into jboss-aop.jar to avoid conflicts with
libjboss-aspects-java (Closes: #480690)
Modified: trunk/libjboss-aop-java/debian/build.xml
===================================================================
--- trunk/libjboss-aop-java/debian/build.xml 2008-05-19 10:41:07 UTC (rev
6475)
+++ trunk/libjboss-aop-java/debian/build.xml 2008-05-20 04:48:23 UTC (rev
6476)
@@ -49,7 +49,10 @@
<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="${aspects.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>
Modified: trunk/libjboss-aop-java/debian/changelog
===================================================================
--- trunk/libjboss-aop-java/debian/changelog 2008-05-19 10:41:07 UTC (rev
6475)
+++ trunk/libjboss-aop-java/debian/changelog 2008-05-20 04:48:23 UTC (rev
6476)
@@ -1,3 +1,10 @@
+libjboss-aop-java (2.0.0.CR8-2) unstable; urgency=low
+
+ * Merge jboss-aspects.jar into jboss-aop.jar to avoid conflicts with
+ libjboss-aspects-java (Closes: #480690)
+
+ -- Varun Hiremath <[EMAIL PROTECTED]> Tue, 20 May 2008 10:06:36 +0530
+
libjboss-aop-java (2.0.0.CR8-1) unstable; urgency=low
* New update release
Modified: trunk/libjboss-aop-java/debian/rules
===================================================================
--- trunk/libjboss-aop-java/debian/rules 2008-05-19 10:41:07 UTC (rev
6475)
+++ trunk/libjboss-aop-java/debian/rules 2008-05-20 04:48:23 UTC (rev
6476)
@@ -15,8 +15,6 @@
install/libjboss-aop-java::
install -m 644 -D 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 jboss-aspects.jar
$(DEB_DESTDIR)/usr/share/java/jboss-aspects-$(DEB_UPSTREAM_VERSION).jar
- dh_link /usr/share/java/jboss-aspects-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/jboss-aspects.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
