[pkg-java] r3554 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-29 21:22:53 +0000 (Tue, 29 May 2007)
New Revision: 3554

Modified:
   trunk/aspectj/debian/control
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/rules
Log:
rearrange order in rm, drop regexp as it is not needed


Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control	2007-05-29 19:49:48 UTC (rev 3553)
+++ trunk/aspectj/debian/control	2007-05-29 21:22:53 UTC (rev 3554)
@@ -10,15 +10,16 @@
 Architecture: all
 Depends: java-gcj-compat | java2-runtime | java1-runtime
 Description: A seamless aspect-oriented extension for Java
- Aspectj enables the clean modularization of crosscutting concerns
+ AspectJ enables the clean modularization of crosscutting concerns
  such as: error checking and handling, synchronization, context-sensitive
  behavior, performance optimizations, monitoring and logging, debugging
  support, multi-object protocols.
 
 Package: aspectj-doc
+Section: doc
 Architecture: all
 Description: documentation for aspectj
- Aspectj enables the clean modularization of crosscutting concerns
+ AspectJ enables the clean modularization of crosscutting concerns
  such as: error checking and handling, synchronization, context-sensitive
  behavior, performance optimizations, monitoring and logging, debugging
  support, multi-object protocols.

Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-05-29 19:49:48 UTC (rev 3553)
+++ trunk/aspectj/debian/cvs-get.sh	2007-05-29 21:22:53 UTC (rev 3554)
@@ -13,23 +13,26 @@
 CVSROOT=":pserver:anonymous at dev.eclipse.org:/cvsroot/tools"
 
 echo "retrieving AspectJ sources tagged $TAG"
-(cd $TMPDIR &&
-    cvs -d $CVSROOT export -r$TAG org.aspectj/modules >/dev/null 2>&1)
+(cd $TMPDIR && cvs -d $CVSROOT export -r$TAG org.aspectj/modules >/dev/null 2>&1)
 
 echo "removing unneeded files"
 find $TMPDIR/org.aspectj -name .cvsignore | xargs -r rm
-# Prefer system ant
+
+# We'll use Debian version of these
 rm -Rf $TMPDIR/org.aspectj/modules/lib/ant
-# and system junit
 rm -Rf $TMPDIR/org.aspectj/modules/lib/junit
-# We don't need those
-rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
+rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
+
+# Keep sources only, rebuild them at package build time
 rm -Rf $TMPDIR/org.aspectj/modules/lib/build
-rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
-rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
-rm -Rf $TMPDIR/org.aspectj/modules/lib/jdiff
 rm -Rf $TMPDIR/org.aspectj/modules/lib/bcel/bcel.jar
 (cd $TMPDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar)
 
+# These ones are not needed
+rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
+rm -Rf $TMPDIR/org.aspectj/modules/lib/jdiff
+rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
+rm -Rf $TMPDIR/org.aspectj/modules/lib/regexp
+
 echo "generating ../aspectj_$VERSION.orig.tar.gz"
 tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-05-29 19:49:48 UTC (rev 3553)
+++ trunk/aspectj/debian/rules	2007-05-29 21:22:53 UTC (rev 3554)
@@ -68,13 +68,17 @@
 clean::
 	rm -Rf $(AJ_ANT_HOME)
 	rm -Rf $(AJ_JUNIT_HOME)
-	rm -Rf modules/lib/jython
-	rm -Rf modules/lib/asm
+	rm -Rf $(AJ_COMMONS_HOME)
+
 	rm -Rf modules/lib/build
-	rm -Rf modules/lib/commons
-	rm -Rf modules/lib/jdiff
 	rm -Rf modules/lib/bcel/bcel.jar
 	(cd modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt managementapi-jrockit81.jar)
+
+	rm -Rf modules/lib/asm
+	rm -Rf modules/lib/jdiff
+	rm -Rf modules/lib/jython
+	rm -Rf modules/lib/regexp
+
 	rm -f modules/lib/gnu-classpath-tools-gjdoc.jar
 
 	rm -f $(DEB_BUILDDIR)/local.properties