Author: tgg
Date: 2007-05-19 19:35:48 +0000 (Sat, 19 May 2007)
New Revision: 3527
Modified:
trunk/aspectj/debian/control
trunk/aspectj/debian/cvs-get.sh
trunk/aspectj/debian/rules
Log:
remove asm & commons dependencies
Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control 2007-05-19 19:21:40 UTC (rev 3526)
+++ trunk/aspectj/debian/control 2007-05-19 19:35:48 UTC (rev 3527)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java maintainers <[EMAIL PROTECTED]>
Uploaders: Thomas Girard <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant
(>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, junit (>= 3.8.1)
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant
(>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs,
libcommons-logging-java, junit (>= 3.8.1)
Standards-Version: 3.7.2
Package: aspectj
Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2007-05-19 19:21:40 UTC (rev 3526)
+++ trunk/aspectj/debian/cvs-get.sh 2007-05-19 19:35:48 UTC (rev 3527)
@@ -22,8 +22,10 @@
rm -Rf $TMPDIR/org.aspectj/modules/lib/ant
# and system junit
rm -Rf $TMPDIR/org.aspectj/modules/lib/junit
-# We don't need jython
+# We don't need those
+rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
+rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
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-19 19:21:40 UTC (rev 3526)
+++ trunk/aspectj/debian/rules 2007-05-19 19:35:48 UTC (rev 3527)
@@ -17,8 +17,11 @@
AJ_JUNIT_HOME := modules/lib/junit
AJ_JUNIT_JARS := junit.jar
+AJ_COMMONS_HOME := modules/lib/commons
+AJ_COMMONS_JAR := commons-logging.jar
+
pre-build::
- # We setup Ant symlinks
+ # Setup symlinks: ant
mkdir -p $(AJ_ANT_HOME)/lib
for f in $(AJ_ANT_JARS) ; do \
$(LN_S) /usr/share/ant/lib/$$f $(AJ_ANT_HOME)/lib ; \
@@ -27,12 +30,16 @@
$(LN_S) /usr/share/java/$$f $(AJ_ANT_HOME)/lib ; \
done
- # then JUnit symlinks
+ # JUnit
mkdir -p $(AJ_JUNIT_HOME)
for f in $(AJ_JUNIT_JARS) ; do \
$(LN_S) /usr/share/java/$$f $(AJ_JUNIT_HOME) ; \
done
+ # commons-logging
+ mkdir -p $(AJ_COMMONS_HOME)
+ $(LN_S) /usr/share/java/$(AJ_COMMONS_JAR) $(AJ_COMMONS_HOME)/commons.jar
+
# Setup our local.properties
cp debian/local.properties $(DEB_BUILDDIR)
@@ -43,6 +50,8 @@
rm -Rf $(AJ_ANT_HOME)
rm -Rf $(AJ_JUNIT_HOME)
rm -Rf modules/lib/jython
+ rm -Rf modules/lib/asm
+ rm -Rf modules/lib/commons
rm -f $(DEB_BUILDDIR)/local.properties
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
