--- aspectj-1.6.6+dfsg.orig/debian/bootstrap.xml
+++ aspectj-1.6.6+dfsg/debian/bootstrap.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- aspectj-1.6.6+dfsg.orig/debian/ajc
+++ aspectj-1.6.6+dfsg/debian/ajc
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjrt.jar:/usr/share/java/aspectjtools.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+ "${JAVA_OPTS:=-Xmx64M}" \
+ org.aspectj.tools.ajc.Main "$@"
--- aspectj-1.6.6+dfsg.orig/debian/rules
+++ aspectj-1.6.6+dfsg/debian/rules
@@ -0,0 +1,134 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+MODULES := org.aspectj/modules
+DEB_BUILDDIR = $(MODULES)/build
+DEB_ANT_BUILD_TARGET = aspectj
+DEB_JARS = xalan2 ant-junit
+DEB_COMPRESS_EXCLUDE = .pdf .java .xml
+
+MKDIR := mkdir -p
+LN_S := ln -sf
+
+AJ_SCRIPTS := debian/ajc debian/ajbrowser debian/ajdoc debian/aj debian/aj5
+AJ_MANPAGES := debian/ajc.1 debian/ajdoc.1 debian/aj.1 debian/ajbrowser.1
+
+AJ_ANT_HOME := $(MODULES)/lib/ant
+AJ_ANT_JARS := ant.jar ant-junit.jar
+AJ_XML_JARS := xercesImpl.jar xml-apis.jar
+
+AJ_JUNIT_HOME := $(MODULES)/lib/junit
+AJ_JUNIT_JARS := junit.jar
+
+AJ_COMMONS_HOME := $(MODULES)/lib/commons
+AJ_COMMONS_JAR := commons-logging.jar
+
+AJ_ECLIPSE_HOME := $(MODULES)/lib/eclipse
+AJ_BCEL_HOME := $(MODULES)/lib/bcel
+AJ_ASM_HOME := $(MODULES)/lib/asm
+AJ_JROCKIT_HOME := $(MODULES)/lib/ext/jrockit
+
+AJ_BOOT_HOME := $(MODULES)/lib/aspectj
+AJ_BOOT_JARS := aspectjlib.jar aspectjrt.jar aspectjtools.jar
+
+pre-build:: debian/stamp-bootstrap
+
+debian/aj.1: debian/aj.sgml
+ docbook-to-man $< > $@
+
+debian/ajbrowser.1: debian/ajbrowser.sgml
+ docbook-to-man $< > $@
+
+# reuse the DocBook xml documents here to generate manpages.
+debian/%.1: org.aspectj/modules/docs/devGuideDB/%.xml
+ sh debian/manpage_from.sh $< > $@
+
+.PHONY: bootstrap
+bootstrap: debian/stamp-bootstrap
+
+debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
+debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+debian/stamp-bootstrap:
+ # Setup symlinks: ant
+ $(MKDIR) $(AJ_ANT_HOME)/lib
+ for f in $(AJ_ANT_JARS) ; do \
+ $(LN_S) /usr/share/ant/lib/$$f $(AJ_ANT_HOME)/lib ; \
+ done
+ for f in $(AJ_XML_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_ANT_HOME)/lib ; \
+ done
+
+ # JUnit
+ $(MKDIR) $(AJ_JUNIT_HOME)
+ for f in $(AJ_JUNIT_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_JUNIT_HOME) ; \
+ done
+
+ # commons-logging
+ $(MKDIR) $(AJ_COMMONS_HOME)
+ $(LN_S) /usr/share/java/$(AJ_COMMONS_JAR) $(AJ_COMMONS_HOME)/commons.jar
+
+ # Setup our local.properties
+ cp debian/local.properties $(MODULES)/build
+
+ # Also symlink gjdoc.jar
+ $(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar $(MODULES)/lib
+
+ # bootstrap using aspectj itself
+ $(MKDIR) $(AJ_BOOT_HOME)
+ for f in $(AJ_BOOT_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_BOOT_HOME)/lib ; \
+ done
+
+ # asm3
+ $(MKDIR) $(AJ_ASM_HOME)
+ $(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.1.jar
+
+ # eclipse (JDT)
+ $(MKDIR) $(AJ_ECLIPSE_HOME)
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.equinox.common.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.equinox.registry.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.resources.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.runtime.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.jobs.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.osgi.jar
+
+ $(DEB_ANT_INVOKE)
+ touch $@
+
+.PHONY: clean-bootstrap
+clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
+clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+clean-bootstrap:
+ $(DEB_ANT_INVOKE) clean
+ rm -f debian/stamp-bootstrap
+
+install/aspectj:: $(AJ_MANPAGES)
+ for f in $(AJ_SCRIPTS) ; do \
+ dh_install $$f /usr/bin ; \
+ done
+
+install/aspectj-doc::
+ mv org.aspectj/modules/docs/dist/doc/changes.html org.aspectj/modules/docs/dist/doc/changelog.html
+ html2text -o org.aspectj/modules/docs/dist/doc/changelog.txt org.aspectj/modules/docs/dist/doc/changelog.html
+ dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.html
+ dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.txt
+
+clean::
+ rm -Rf $(AJ_ECLIPSE_HOME)
+ rm -Rf $(AJ_BOOT_HOME)/lib/aspectj*.jar
+ rm -Rf $(AJ_ASM_HOME)/asm-3.1.jar
+ rm -f $(MODULES)/lib/gnu-classpath-tools-gjdoc.jar
+ rm -f $(DEB_BUILDDIR)/local.properties $(AJ_MANPAGES)
+ rm -Rf $(AJ_COMMONS_HOME)
+ rm -Rf $(AJ_JUNIT_HOME)
+ rm -Rf $(AJ_ANT_HOME)
+ rm -Rf $(MODULES)/aj-build
+
+.PHONY: get-orig-source
+get-orig-source:
+ sh debian/cvs-get.sh
--- aspectj-1.6.6+dfsg.orig/debian/manpage_from.sh
+++ aspectj-1.6.6+dfsg/debian/manpage_from.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Transforms DocBook .xml documents so that docbook-to-man can grok them.
+#
+if test "a$#" = "a0"; then
+ echo "$0: missing argument" >&2
+ echo "usage: $0 " >&2
+ echo "prepares an AspectJ document for dobook-to-man" >&2
+ exit 2
+fi
+
+NAME=`basename $1`
+NAME=${NAME%.*}
+TMPFILE=`mktemp` || exit 1
+trap "rm -f $TMPFILE" 0
+
+# add the doctype header
+echo '' >> $TMPFILE
+sed -e "s,,$NAME1," < $1 >> $TMPFILE
+docbook-to-man $TMPFILE | sed -e 's# (link to URL \(.*\)) # \1#'
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.weaver-api
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.weaver-api
@@ -0,0 +1,9 @@
+Document: aspectj-doc-weaver-api
+Title: API Javadoc for Aspectj Weaver API
+Author: AspectJ Contributors
+Abstract: This is the API Javadoc provided by the Aspectj Weaver API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/weaver-api/index.html
+Files: /usr/share/doc/aspectj-doc/weaver-api/*
--- aspectj-1.6.6+dfsg.orig/debian/watch
+++ aspectj-1.6.6+dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+dfsg// \
+http://www.eclipse.org/aspectj/downloads.php .*/tools/aspectj/aspectj-([\d\.]+).jar
--- aspectj-1.6.6+dfsg.orig/debian/changelog
+++ aspectj-1.6.6+dfsg/debian/changelog
@@ -0,0 +1,112 @@
+aspectj (1.6.6+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ - Update 02_use_gjdoc.diff patch
+ * Update my email address
+
+ -- Damien Raude-Morvan Sun, 04 Oct 2009 16:37:23 +0200
+
+aspectj (1.6.5+dfsg-1) unstable; urgency=low
+
+ [ Thomas Girard ]
+ * Move to main. Closes: #480132.
+ * Build-Depend on default-jdk.
+
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders
+ * Updated Standards-Version to 3.8.3:
+ - Describe quilt patch system in README.source
+ - Move "aspectj" package to "java" section
+ * Switch to quilt to manage patches:
+ - Use patchsys-quilt.mk in debian/rules
+ - Build-Depends on quilt
+ - Refresh all patches
+ * Extends bootstrap.xml script:
+ - Rebuild jdtcore-for-aspectj.jar from jdtcore-for-aspectj-src.zip
+ Build-Depends on eclipse-platform
+ - Bootstrap using aspectj itself for modules/lib/aspectj/lib/*.jar
+ Build-Depends on aspectj
+ - Rebuild and overwrite build.jar
+ * New 05_build_classpath patch to build AJDT
+ * Add Build-Depends on libasm3-java, eclipse-platform, gjdoc and html2text
+ * Create a DFSG orig tarballs:
+ - Describe removed bits in debian/README.source
+ - Describe embedded code copies in debian/copyright
+ * debian/watch: mangle debian version to remove "+dfsg"
+ * Complete review of debian/copyright
+ * Use debhelper >= 7
+ * Register documentations using doc-base
+
+ -- Damien Raude-Morvan Tue, 18 Aug 2009 20:48:47 +0200
+
+aspectj (1.5.4-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * New upstream version. Closes: #459363
+ * Updated Standards-Version to 3.7.3.
+ * Added myself to Uploaders.
+
+ [ Thomas Girard ]
+ * Add Homepage: control field, and convert XS-Vcs-* to Vcs-*.
+
+ [ Mark Howard ]
+ * debian/watch: added.
+
+ -- Michael Koch Sat, 05 Jan 2008 23:31:47 -0100
+
+aspectj (1.5.3-1) unstable; urgency=low
+
+ * New maintainer. Closes: #352521.
+ * New upstream release. Closes: #286087.
+ * AspectJ 5 builds cleanly with gcj. Closes: #397559.
+ * Bump debhelper level to 5.
+ * Convert debian/rules to cdbs.
+ * Build manpages from the DocBook documentation.
+ * Install wrapper scripts for ajdoc, aj, and aj5.
+ * Add XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control.
+ * Update debian/copyright.
+
+ -- Thomas Girard Sun, 19 Aug 2007 12:16:17 +0200
+
+aspectj (1.1.1-2) unstable; urgency=low
+
+ * QA upload orphaning the package.
+ * Use debhelper 4.
+ * Bump Standards-Version (no change).
+
+ -- Christoph Berg Sat, 17 Jun 2006 12:43:40 +0200
+
+aspectj (1.1.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Allow building with blackdown-j2sdk1.4 and ibm-j2sdk1.4
+ (Closes: #306661, #274833).
+ * Fix maintainer address (Closes: #330744).
+ * Fix description typos (Closes: #249592).
+
+ -- Christoph Berg Sun, 12 Feb 2006 14:45:25 +0100
+
+aspectj (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Takashi Okamoto Mon, 3 May 2004 18:51:19 +0900
+
+aspectj (1.0.6-2) unstable; urgency=low
+
+ * Recompile to fix breakage.
+ * New maintainer.
+
+ -- James LewisMoss Mon, 19 Aug 2002 10:37:21 -0400
+
+aspectj (1.0.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto Sat, 27 Jul 2002 14:17:29 +0900
+
+aspectj (1.0.4-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Takashi Okamoto Fri, 21 Jun 2002 16:38:31 +0900
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.pdguide
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.pdguide
@@ -0,0 +1,11 @@
+Document: aspectj-doc-pdguide
+Title: AspectJ Problem Diagnosis Guide
+Author: AspectJ Contributors
+Abstract: This guide describes how to configure the AspectJ compiler/weaver to
+ provide information for diagnosing problems in the input programs, the
+ compiler/weaver or its configuration.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/pdguide/index.html
+Files: /usr/share/doc/aspectj-doc/pdguide/*
--- aspectj-1.6.6+dfsg.orig/debian/ajdoc
+++ aspectj-1.6.6+dfsg/debian/ajdoc
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+guess_java_home() {
+ if test "a$JAVA_HOME" = "a"; then
+ JAVACMD=${JAVACMD:-`which java`}
+ JAVACMD=`readlink -f $JAVACMD`
+
+ if echo "$JAVACMD" | grep -E '^/usr/bin/gij-' >/dev/null;
+ then
+ # gij special case
+ JAVA_HOME=/usr/lib/jvm/java-gcj
+ else
+ JAVA_HOME=${JAVACMD%%/jre/bin/java}
+ JAVA_HOME=${JAVA_HOME%%/bin/java}
+ fi
+
+ if ! test -f "$JAVA_HOME/lib/tools.jar"; then
+ echo "$0: could not guess JAVA_HOME! Please define it" >&2
+ exit 1
+ fi
+ fi
+}
+
+AJPATH=/usr/share/java/aspectjtools.jar
+
+guess_java_home
+
+if test "a$JAVA_HOME" = "a/usr/lib/jvm/java-gcj";
+then
+ TOOLS_JAR=/usr/share/java/gnu-classpath-tools-gjdoc.jar:"$JAVA_HOME/lib/tools.jar"
+else
+ TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
+fi
+
+exec "$JAVACMD" -classpath "$AJPATH:$TOOLS_JAR${CLASSPATH:+:$CLASSPATH}" \
+ ${JAVA_OPTS:=-Xmx64M} \
+ org.aspectj.tools.ajdoc.Main "$@"
--- aspectj-1.6.6+dfsg.orig/debian/compat
+++ aspectj-1.6.6+dfsg/debian/compat
@@ -0,0 +1 @@
+7
--- aspectj-1.6.6+dfsg.orig/debian/README.source
+++ aspectj-1.6.6+dfsg/debian/README.source
@@ -0,0 +1,70 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
+Original AspectJ tarball repack
+===============================
+
+The shell script cvs-get.sh (or debian/rules get-orig-source) retrieves
+the sources from CVS and apply the following rules:
+
+Remove
+------
+Remove unlicenced files:
+ * all "testsrc" and "testdata" from orig tarball
+ * org.aspectj/modules/tests/
+ * org.aspectj/modules/testing/
+ * org.aspectj/modules/docs/test/
+ * org.aspectj/org.aspectj.ajdt.core/scripts/*.py
+
+Remove non-free docs:
+ * org.aspectj/modules/docs/dist/doc/examples
+ * org.aspectj/modules/docs/sandbox/
+ * org.aspectj/modules/docs/teaching/
+ * all *.ppt/*.vsd/*.doc/*.pdf binary files
+
+Remove binary libs : #1 we use Debian version of them
+ * org.aspectj/modules/lib/ant
+ * org.aspectj/modules/lib/junit
+ * org.aspectj/modules/lib/commons
+ * org.aspectj/modules/lib/asm
+
+Remove binary libs : #2 rebuild them during "bootstrap" target
+(see bootstrap.xml)
+ * org.aspectj/modules/bcel-builder/
+ * org.aspectj/modules/lib/bcel/bcel*.jar
+ * org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+
+Remove binary libs : #3 uneeded
+ * org.aspectj/modules/lib/docbook
+ * org.aspectj/modules/lib/jdiff
+ * org.aspectj/modules/lib/jython
+ * org.aspectj/modules/lib/regexp
+ * org.aspectj/modules/lib/saxon
+ * org.aspectj/modules/lib/test
+
+Remove binary copy of AspectJ (bootstrap using symlink to existing aspectj):
+ * org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
+
+Remove (JRockit is non-free JVM):
+ * org.aspectj/modules/lib/ext/jrockit
+ * org.aspectj/modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
+
+
+Keep
+------
+Empty jars (needed by upstream build but made empty):
+ * org.aspectj/modules/build/products/tools/dist/lib/org.aspectj.matcher.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjweaver.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjtools.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjrt.jar
+
+Bootstrap jars (rebuild and overwritten during "bootstrap" target):
+(see bootstrap.xml)
+ * org.aspectj/modules/lib/build/build.jar
--- aspectj-1.6.6+dfsg.orig/debian/cvs-get.sh
+++ aspectj-1.6.6+dfsg/debian/cvs-get.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# AspectJ make no source release; so we need to check sources from CVS.
+#
+# This scripts retrieves the version specified in debian/changelog,
+# transforming it into an AspectJ CVS tag. (For instance `1.5.3' is changed to
+# `V1_5_3_final'.) The script then removes stuff we don't need.
+#
+# To keep everything from the checkout invoke this script with `keep'
+#
+set -e
+
+TMPDIR=`mktemp -t -d aspectj-cvs.XXXXXXXXXX` || exit 1
+trap "rm -Rf $TMPDIR" 0
+VERSION=$(dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed "s/-\(.*\)$//")
+TAG="V`echo $VERSION | sed "s/\+dfsg//" | tr . _`"
+ORIGDIR="$TMPDIR/aspectj-$VERSION"
+
+CVSROOT=":pserver:anonymous@dev.eclipse.org:/cvsroot/tools"
+
+echo "retrieving AspectJ sources tagged $TAG"
+mkdir $ORIGDIR || exit 1
+(cd $ORIGDIR && cvs -d $CVSROOT export -r$TAG org.aspectj/modules >/dev/null 2>&1)
+
+if test "a$1" = "akeep"; then
+ echo "keeping all files"
+else
+ echo "removing unneeded files"
+ find $ORIGDIR/org.aspectj -name .cvsignore -delete
+
+ # Remove unlicenced files
+ find $ORIGDIR/org.aspectj -type d -name "testdata" | xargs rm -rf
+ find $ORIGDIR/org.aspectj -type d -name "testsrc" | xargs rm -rf
+ rm -rf $ORIGDIR/org.aspectj/modules/tests/
+ rm -rf $ORIGDIR/org.aspectj/modules/testing/
+ rm -rf $ORIGDIR/org.aspectj/modules/org.aspectj.ajdt.core/scripts/*.py
+
+ # Remove non-free docs
+ rm -rf $ORIGDIR/org.aspectj/modules/docs/dist/doc/examples
+ rm -rf $ORIGDIR/org.aspectj/modules/docs/sandbox/
+ rm -rf $ORIGDIR/org.aspectj/modules/docs/teaching/
+ rm -rf $ORIGDIR/org.aspectj/modules/docs/test/
+ find $ORIGDIR/org.aspectj -type f -name "*.doc" -delete
+ find $ORIGDIR/org.aspectj -type f -name "*.pdf" -delete
+ find $ORIGDIR/org.aspectj -type f -name "*.ppt" -delete
+ find $ORIGDIR/org.aspectj -type f -name "*.vsd" -delete
+
+ # We'll use Debian version of these
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/ant
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/junit
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/commons
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/asm
+
+ # Keep sources only, rebuild them at package build time
+ rm -rf $ORIGDIR/org.aspectj/modules/bcel-builder/
+ rm -f $ORIGDIR/org.aspectj/modules/lib/bcel/bcel*.jar
+ rm -f $ORIGDIR/org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+ # NOTE:this jar is rebuild after initial bootstrap
+ #rm -f $ORIGDIR/org.aspectj/modules/lib/build/build.jar
+
+ # Bootstrap using symlink to existing aspectj
+ rm -f $ORIGDIR/org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
+
+ # The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
+ # See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co
+ (cd $ORIGDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar jrockit-src.zip)
+ rm -f $ORIGDIR/org.aspectj/modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
+
+ # These ones are not needed
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/docbook
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/jdiff
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/jython
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/regexp
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/saxon
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/test
+fi
+
+echo "generating ../aspectj_$VERSION.orig.tar.gz"
+tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz aspectj-$VERSION
--- aspectj-1.6.6+dfsg.orig/debian/aj5
+++ aspectj-1.6.6+dfsg/debian/aj5
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjweaver.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+ -javaagent:$AJPATH "$@"
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.progguide
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.progguide
@@ -0,0 +1,11 @@
+Document: aspectj-doc-progguide
+Title: AspectJ Programming Guide
+Author: AspectJ Contributors
+Abstract: This programming guide describes the AspectJ language.
+ A companion guide describes the tools which are part of the AspectJ
+ development environment
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/progguide/index.html
+Files: /usr/share/doc/aspectj-doc/progguide/*
--- aspectj-1.6.6+dfsg.orig/debian/aspectj.links
+++ aspectj-1.6.6+dfsg/debian/aspectj.links
@@ -0,0 +1 @@
+usr/share/man/man1/aj.1 usr/share/man/man1/aj5.1
--- aspectj-1.6.6+dfsg.orig/debian/ajbrowser
+++ aspectj-1.6.6+dfsg/debian/ajbrowser
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjrt.jar:/usr/share/java/aspectjtools.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+ "${JAVA_OPTS:=-Xmx64M}" \
+ org.aspectj.tools.ajbrowser.Main "$@"
--- aspectj-1.6.6+dfsg.orig/debian/jar_from_src_zip.xml
+++ aspectj-1.6.6+dfsg/debian/jar_from_src_zip.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.devguide
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.devguide
@@ -0,0 +1,10 @@
+Document: aspectj-doc-devguide
+Title: AspectJ Development Environment Guide
+Author: AspectJ Contributors
+Abstract: This guide describes how to build and deploy AspectJ programs
+ using the AspectJ tools and facilities.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/devguide/index.html
+Files: /usr/share/doc/aspectj-doc/devguide/*
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.docs
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.docs
@@ -0,0 +1,8 @@
+org.aspectj/modules/aj-build/dist/docs/doc/README*
+org.aspectj/modules/aj-build/dist/docs/doc/devguide
+org.aspectj/modules/aj-build/dist/docs/doc/progguide
+org.aspectj/modules/aj-build/dist/docs/doc/pdguide
+org.aspectj/modules/aj-build/dist/docs/doc/adk15notebook
+org.aspectj/modules/aj-build/dist/docs/doc/aspectj5rt-api
+org.aspectj/modules/aj-build/dist/docs/doc/runtime-api
+org.aspectj/modules/aj-build/dist/docs/doc/weaver-api
--- aspectj-1.6.6+dfsg.orig/debian/aspectj.manpages
+++ aspectj-1.6.6+dfsg/debian/aspectj.manpages
@@ -0,0 +1,4 @@
+debian/ajc.1
+debian/ajdoc.1
+debian/aj.1
+debian/ajbrowser.1
--- aspectj-1.6.6+dfsg.orig/debian/ajbrowser.sgml
+++ aspectj-1.6.6+dfsg/debian/ajbrowser.sgml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ ajbrowser
+ 1
+
+
+
+ ajbrowser
+ GUI to compile programs with ajc and navigate
+ crosscutting structure
+
+
+
+
+ ajbrowser
+
+ file.lst
+ arg
+
+
+
+
+
+ DESCRIPTION
+
+ The
+ ajbrowser launches the browser when
+ specifying no arguments or some numbers of build configuration
+ files (suffix .lst). Otherwise the
+ compiler ajc is invoked.
+
+ The AspectJ Browser can edit program source files, compile
+ using the AspectJ compiler ajc, run a program,
+ and graphically navigate the program's crosscutting
+ structure.
+
+
+
+
+ SEE ALSO
+
+
+ ajc1
+
+
+
+
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.runtime-api
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.runtime-api
@@ -0,0 +1,9 @@
+Document: aspectj-doc-runtime-api
+Title: API Javadoc for Aspectj Runtime API
+Author: AspectJ Contributors
+Abstract: This is the API Javadoc provided by the AspectJ Runtime API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/runtime-api/index.html
+Files: /usr/share/doc/aspectj-doc/runtime-api/*
--- aspectj-1.6.6+dfsg.orig/debian/aj
+++ aspectj-1.6.6+dfsg/debian/aj
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+AJPATH=/usr/share/java/aspectjweaver.jar
+
+exec "${JAVACMD:=java}" -classpath "$AJPATH${CLASSPATH:+:$CLASSPATH}" \
+ -Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader \
+ "-Daj.class.path=$ASPECTPATH${CLASSPATH:+:$CLASSPATH}" \
+ "-Daj.aspect.path=$ASPECTPATH" \
+ "$@"
--- aspectj-1.6.6+dfsg.orig/debian/control
+++ aspectj-1.6.6+dfsg/debian/control
@@ -0,0 +1,33 @@
+Source: aspectj
+Section: java
+Priority: optional
+Maintainer: Debian Java maintainers
+Uploaders: Thomas Girard , Michael Koch , Damien Raude-Morvan
+Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs, quilt
+Build-Depends-Indep: libxalan2-java, libcommons-logging-java, libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man,
+ junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc, html2text
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/
+Homepage: http://www.eclipse.org/aspectj
+
+Package: aspectj
+Architecture: all
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Description: A seamless aspect-oriented extension for Java
+ 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
+Depends: ${misc:Depends}
+Description: aspect-oriented extension for Java - documentation
+ 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.
+ .
+ This package provides the documentation for aspectj.
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.aspectj5rt-api
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.aspectj5rt-api
@@ -0,0 +1,9 @@
+Document: aspectj-doc-aspectj5rt-api
+Title: API Javadoc for Aspectj Runtime Library
+Author: AspectJ Contributors
+Abstract: This is the API Javadoc provided by the AspectJ Runtime Library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/aspectj5rt-api/index.html
+Files: /usr/share/doc/aspectj-doc/aspectj5rt-api/*
--- aspectj-1.6.6+dfsg.orig/debian/local.properties
+++ aspectj-1.6.6+dfsg/debian/local.properties
@@ -0,0 +1,9 @@
+build.version=1.6.5
+build.version.base=1.6
+build.version.long=1.6.5
+build.version.short=1.6.5
+
+java11.home=/usr/lib/jvm/java-6-openjdk
+java13.home=/usr/lib/jvm/java-6-openjdk
+java14.home=/usr/lib/jvm/java-6-openjdk
+java15.home=/usr/lib/jvm/java-6-openjdk
--- aspectj-1.6.6+dfsg.orig/debian/copyright
+++ aspectj-1.6.6+dfsg/debian/copyright
@@ -0,0 +1,364 @@
+This package was debianized by Takashi Okamoto on
+Fri, 21 Jun 2002 16:38:31 +0900. And taken over by James LewisMoss
+ on 19 Aug 2002. It is now co-maintained by the
+Debian Java Maintainers .
+
+It was downloaded from <:pserver:anonymous@dev.eclipse.org:/cvsroot/tools>
+using the script debian/cvs-get.sh.
+
+Tarball repack:
+ See debian/README.source and debian/cvs-get.sh
+
+=====================
+Embedded code copies:
+
+ org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+ (also in eclipse-jdt Debian package)
+ refered as "modified JDT Core for AspectJ"
+
+ Modified JDT Core Compiler with some ".aj" files which are used to
+ include aspect code fragments in the JDT Core Compiler.
+ This special JDT Core Compiler is also moved to another package
+ org.aspect.org.eclipse instead of org.eclipse and included during build
+ in aspectjtools.jar
+
+ org.aspectj/modules/lib/bcel/bcel-src.zip
+ org.aspectj/modules/lib/bcel/bcel-verifier-src.zip
+ (also in libbcel-java)
+ refered as "modified BCEL for AspectJ"
+
+ This fork of BCEL code base is significantly modified to work with AspectJ.
+ In others words, AspectJ can't work with libbcel-java included in Debian
+ and this library cannot be modified to work with AspectJ without side
+ effect for others dependencies.
+ This forked BCEL is also moved to another package
+ org.aspect.org.apache instead of org.apache and included during build
+ in aspectjtools.jar
+=====================
+
+
+Authors:
+ Adrian Colyer
+ Alexandre Vasseur
+ Andrew Clement (aka Andy Clement)
+ Andrew Huff
+ David Knibb
+ Erik Hilsdale
+ George Harley
+ Helen Hawkins
+ Jim Hugunin
+ Linton Ye
+ Matthew Webster
+ Martin Lippert
+ Mik Kersten
+ Ron Bodkin
+ Weston Isberg
+
+Copyright Holders of aspectj:
+ 1997-2002 Xerox Corporation
+ 1998-2002 Palo Alto Research Center, Incorporated (PARC)
+ 2000-2006 IBM Corporation and others
+ 2001-2002 The Apache Software Foundation (for BCEL source code)
+ 2005-2008 Adrian Colyer
+ 2005-2008 Alexandre Vasseur
+ 2002-2009 Andrew Clement (aka Andy Clement)
+ 2005 Andrew Huff
+ 2005 David Knibb
+ 2002 Erik Hilsdale
+ 2003-2005 George Harley
+ 2003-2007 Helen Hawkins
+ 2004-2006 Jim Hugunin
+ 2007 Linton Ye
+ 2005-2006 Matthew Webster
+ 2004 Martin Lippert
+ 2003,2005 Mik Kersten
+ 2002,2005 Ron Bodkin
+ 2003-2005 Weston Isberg
+
+Copyright Holders of embedded "modified JDT Core for AspectJ":
+ Copyright (c) 2000, 2007 IBM Corporation and others
+ Copyright (c) 2002,2003 Palo Alto Research Center, Incorporated (PARC).
+ Copyright (c) 2004, 2006 Ben Konrath
+ Copyright (c) 2005, 2007 BEA Systems, Inc.
+ Copyright (c) 2006 Red Hat Incorporated
+
+Copyright Holders of embedded "modified BCEL for AspectJ":
+ Copyright (c) 2001-2002 The Apache Software Foundation
+ Copyright (c) 2004 IBM Corporation and others
+
+License applicable to "AspectJ"
+(all files in org.aspectj/modules/)
+and to "modified JDT Core for AspectJ"
+(org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip):
+
+ Eclipse Public License - v 1.0
+
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
+ PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates'
+ from a Contributor if it was added to the Program by such Contributor itself
+ or anyone acting on such Contributor's behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license
+ agreement, and (ii) are not derivative works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any,
+ and such derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of
+ the Contribution and the Program if, at the time the Contribution is added
+ by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license shall
+ not apply to any other combinations which include the Contribution. No
+ hardware per se is licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is required to
+ allow Recipient to distribute the Program, it is Recipient's responsibility
+ to acquire that license before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are offered
+ by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
+ or through a medium customarily used for software exchange.
+
+ When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+ Contributors may not remove or alter any copyright notices contained within
+ the Program.
+
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore,
+ if a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such Commercial
+ Contributor in connection with its distribution of the Program in a commercial
+ product offering. The obligations in this section do not apply to any claims
+ or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor to control, and cooperate with the
+ Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such claim
+ at its own expense.
+
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+ AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+ EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+ CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+ PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement ,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs or
+ equipment, and unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by
+ the parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipient's obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement, but
+ in order to avoid inconsistency the Agreement is copyrighted and may only
+ be modified in the following manner. The Agreement Steward reserves the
+ right to publish new versions (including revisions) of this Agreement from
+ time to time. No one other than the Agreement Steward has the right to
+ modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to distribute
+ the Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+ rights or licenses to the intellectual property of any Contributor under
+ this Agreement, whether expressly, by implication, estoppel or otherwise.
+ All rights in the Program not expressly granted under this Agreement are
+ reserved.
+
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to
+ this Agreement will bring a legal action under this Agreement more than
+ one year after the cause of action arose. Each party waives its rights to
+ a jury trial in any resulting litigation.
+
+License applicable to "modified BCEL for AspectJ"
+(in org.aspectj/modules/lib/bcel/bcel-src.zip
+and org.aspectj/modules/lib/bcel/bcel-verifier-src.zip):
+
+ The Apache Software License, Version 1.1
+
+ Copyright (c) 2001 The Apache Software Foundation. All rights
+ reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache" and "Apache Software Foundation" and
+ "Apache BCEL" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache",
+ "Apache BCEL", nor may "Apache" appear in their name, without
+ prior written permission of the Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Software Foundation. For more
+ information on the Apache Software Foundation, please see
+ .
--- aspectj-1.6.6+dfsg.orig/debian/aspectj.install
+++ aspectj-1.6.6+dfsg/debian/aspectj.install
@@ -0,0 +1 @@
+org.aspectj/modules/aj-build/dist/tools/lib/aspectj*.jar usr/share/java
--- aspectj-1.6.6+dfsg.orig/debian/aspectj-doc.doc-base.adk15notebook
+++ aspectj-1.6.6+dfsg/debian/aspectj-doc.doc-base.adk15notebook
@@ -0,0 +1,9 @@
+Document: aspectj-doc-adk15notebook
+Title: AspectJ 5 Development Kit Developer's Notebook
+Author: AspectJ Contributors
+Abstract: This guide describes the changes to the AspectJ language in AspectJ 5.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/aspectj-doc/adk15notebook/index.html
+Files: /usr/share/doc/aspectj-doc/adk15notebook/*
--- aspectj-1.6.6+dfsg.orig/debian/aj.sgml
+++ aspectj-1.6.6+dfsg/debian/aj.sgml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ aj
+ 1
+
+
+
+ aj, aj5
+ command-line launchers for load-time weaving
+
+
+
+
+ aj
+ Options
+
+ arg...
+
+
+
+
+ aj5
+ Options
+
+ arg
+
+
+
+
+
+ DESCRIPTION
+
+ The
+ aj command runs Java programs in Java 1.4 or
+ later by setting up
+ WeavingURLClassLoader as the system class
+ loader, to do load-time bytecode weaving.
+
+ The
+ aj5 command runs Java programs using AspectJ Java5 JVMTI
+ agent to do load-time bytecode weaving.
+
+ The arguments are the same as those used to launch the Java program.
+ Users should define the environment variables
+ CLASSPATH and
+ ASPECTPATH.
+
+
+
--- aspectj-1.6.6+dfsg.orig/debian/patches/01_ajc_xml_typo.diff
+++ aspectj-1.6.6+dfsg/debian/patches/01_ajc_xml_typo.diff
@@ -0,0 +1,16 @@
+Description: Fix small typo in Docbook XML
+Author: Thomas Girard
+Forwarded; no
+Last-Update: 2009-08-19
+--- a/org.aspectj/modules/docs/devGuideDB/ajc.xml
++++ b/org.aspectj/modules/docs/devGuideDB/ajc.xml
+@@ -45,8 +45,8 @@
+ (For a discussion of what affected types might be required,
+ see The AspectJ
+ Programming Guide, Implementation Appendix.)
+-
+
++
+ To specify sources, you can list source files as arguments or use the
+ options -sourceroots or -inpath.
+ If there are multiple sources for any type, the result is undefined
--- aspectj-1.6.6+dfsg.orig/debian/patches/03_use_system_docbook.diff
+++ aspectj-1.6.6+dfsg/debian/patches/03_use_system_docbook.diff
@@ -0,0 +1,19 @@
+Description: Use Debian system XSL Docbook stylesheets
+Author: Thomas Girard
+Forwarded: not-needed
+Last-Update: 2009-08-18
+--- a/org.aspectj/modules/docs/build.xml
++++ b/org.aspectj/modules/docs/build.xml
+@@ -64,10 +64,10 @@
+
+
+
+
+
+
+Forwarded: no
+Last-Update: 2009-08-18
+--- a/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
++++ b/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
+@@ -17,5 +17,11 @@
+
+
+
++
++
++
++
++
++
+
+
--- aspectj-1.6.6+dfsg.orig/debian/patches/02_use_gjdoc.diff
+++ aspectj-1.6.6+dfsg/debian/patches/02_use_gjdoc.diff
@@ -0,0 +1,66 @@
+Description: Use gjdoc when invoking ajdoc
+Author: Thomas Girard
+Author: Damien Raude-Morvan
+Forwarded: no
+Last-Update: 2009-10-04
+--- a/org.aspectj/modules/ajdoc/.classpath
++++ b/org.aspectj/modules/ajdoc/.classpath
+@@ -7,6 +7,7 @@
+
+
+
++
+
+
+
+--- a/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
++++ b/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
+@@ -24,7 +24,7 @@
+
+ static boolean has14ToolsAvailable() {
+ try {
+- Class jdMainClass = com.sun.tools.javadoc.Main.class;
++ Class jdMainClass = getJavadocMainClass();
+ Class[] paramTypes = new Class[] { String[].class };
+ jdMainClass.getMethod("execute", paramTypes);
+ } catch (NoClassDefFoundError e) {
+@@ -65,14 +65,13 @@
+
+ try {
+ // for JDK 1.4 and above call the execute method...
+- Class jdMainClass = com.sun.tools.javadoc.Main.class;
++ Class jdMainClass = getJavadocMainClass();
+ Method executeMethod = null;
+ try {
+ Class[] paramTypes = new Class[] { String[].class };
+ executeMethod = jdMainClass.getMethod("execute", paramTypes);
+ } catch (NoSuchMethodException e) {
+- com.sun.tools.javadoc.Main.main(javadocargs);
+- // throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
++ throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
+ }
+ try {
+ executeMethod.invoke(null, new Object[] { javadocargs });
+@@ -89,7 +88,22 @@
+ // Do nothing since we expect it to be thrown
+ // System.out.println( ">> se: " + se.getMessage() );
+ }
++ catch ( NoClassDefFoundError nf ) {
++ throw new RuntimeException("Failed to invoke javadoc");
++ }
+ // Set the security manager back
+ // System.setSecurityManager(defaultSecurityManager);
+ }
++
++ private static Class getJavadocMainClass() throws NoClassDefFoundError {
++ try {
++ return Class.forName("com.sun.tools.javadoc.Main");
++ } catch (ClassNotFoundException nf1) {
++ try {
++ return Class.forName("gnu.classpath.tools.gjdoc.Main");
++ } catch (ClassNotFoundException nf2) {
++ throw new NoClassDefFoundError(nf2.getMessage());
++ }
++ }
++ }
+ }
--- aspectj-1.6.6+dfsg.orig/debian/patches/series
+++ aspectj-1.6.6+dfsg/debian/patches/series
@@ -0,0 +1,5 @@
+01_ajc_xml_typo.diff
+02_use_gjdoc.diff
+03_use_system_docbook.diff
+04_use_xsltproc_for_doc.diff
+05_build_classpath.diff
--- aspectj-1.6.6+dfsg.orig/debian/patches/04_use_xsltproc_for_doc.diff
+++ aspectj-1.6.6+dfsg/debian/patches/04_use_xsltproc_for_doc.diff
@@ -0,0 +1,92 @@
+Description: Use "xsltproc" to process Docbook transformation
+Author: Thomas Girard
+Forwarded: not-needed
+Last-Update: 2009-08-18
+--- a/org.aspectj/modules/docs/build.xml
++++ b/org.aspectj/modules/docs/build.xml
+@@ -69,10 +69,6 @@
+
+-
+-
+
+
+
+@@ -274,7 +270,7 @@
+ value="${nochunk.xsl.source}"
+ />
+
+-
+
+@@ -360,6 +356,9 @@
+
++
+
+
+
+@@ -373,7 +372,7 @@
+
+-
+
+@@ -484,13 +483,13 @@
+
+
+
+@@ -501,20 +500,21 @@
+ includes="${xml-html-copy}"
+ />
+
+-
+
+
+-
+-
++
++
++
++
++
++
++
+
+-
+-
+-
+-
++
++
+
+
+