[pkg-java] r3794 - in trunk/aspectj/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-07-04 21:29:55 +0000 (Wed, 04 Jul 2007)
New Revision: 3794

Modified:
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
   trunk/aspectj/debian/rules
Log:
make patch 04 -p1 compliant. Remove unneed jars. Use *our* bootstrapped jars.


Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-07-04 18:56:34 UTC (rev 3793)
+++ trunk/aspectj/debian/cvs-get.sh	2007-07-04 21:29:55 UTC (rev 3794)
@@ -39,6 +39,10 @@
 rm -Rf $TMPDIR/org.aspectj/modules/lib/regexp
 rm -Rf $TMPDIR/org.aspectj/modules/lib/saxon
 rm -Rf $TMPDIR/org.aspectj/modules/lib/test
+rm -Rf $TMPDIR/org.aspectj/modules/build/products/tools/dist/lib
+rm -f  $TMPDIR/org.aspectj/modules/docs/sandbox/aopalliance/aopalliance.jar
+rm -f  $TMPDIR/org.aspectj/modules/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
+rm -f  $TMPDIR/org.aspectj/modules/docs/teaching/exercises/junit.jar
 
 echo "generating ../aspectj_$VERSION.orig.tar.gz"
 tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj

Modified: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-07-04 18:56:34 UTC (rev 3793)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff	2007-07-04 21:29:55 UTC (rev 3794)
@@ -1,5 +1,5 @@
---- org.aspectj/modules/docs/build.xml-	2007-07-04 20:24:07.000000000 +0200
-+++ org.aspectj/modules/docs/build.xml	2007-07-04 20:30:28.000000000 +0200
+--- aspectj.orig/org.aspectj/modules/docs/build.xml
++++ aspectj/org.aspectj/modules/docs/build.xml
 @@ -69,10 +69,6 @@
          <property name="nochunk.xsl.source"
                    location="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-07-04 18:56:34 UTC (rev 3793)
+++ trunk/aspectj/debian/rules	2007-07-04 21:29:55 UTC (rev 3794)
@@ -51,6 +51,9 @@
 	# Also symlink gjdoc.jar
 	$(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar $(MODULES)/lib
 
+	# Use out bootstrapped jars
+	$(LN_S) ../../../../lib/aspectj/lib $(MODULES)/build/products/tools/dist/lib
+
 .PHONY: bootstrap
 bootstrap: bootstrap-stamp
 
@@ -83,6 +86,10 @@
 	rm -Rf $(MODULES)/lib/regexp
 	rm -Rf $(MODULES)/lib/saxon
 	rm -Rf $(MODULES)/lib/test
+	rm -Rf $(MODULES)/build/products/tools/dist/lib
+	rm -Rf $(MODULES)/docs/sandbox/aopalliance/aopalliance.jar
+	rm -Rf $(MODULES)/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
+	rm -Rf $(MODULES)/docs/teaching/exercises/junit.jar
 
 	rm -f $(MODULES)/lib/gnu-classpath-tools-gjdoc.jar