[pkg-java] r15486 - in tags/aspectj: . 1.6.12+dfsg-1/debian 1.6.12+dfsg-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Dec 3 01:52:12 UTC 2011
Author: drazzib
Date: 2011-12-03 01:52:11 +0000 (Sat, 03 Dec 2011)
New Revision: 15486
Added:
tags/aspectj/1.6.12+dfsg-1/
tags/aspectj/1.6.12+dfsg-1/debian/changelog
tags/aspectj/1.6.12+dfsg-1/debian/patches/series
tags/aspectj/1.6.12+dfsg-1/debian/patches/use_system_asm.diff
tags/aspectj/1.6.12+dfsg-1/debian/rules
Removed:
tags/aspectj/1.6.12+dfsg-1/debian/changelog
tags/aspectj/1.6.12+dfsg-1/debian/patches/series
tags/aspectj/1.6.12+dfsg-1/debian/rules
Log:
[svn-buildpackage] Tagging aspectj 1.6.12+dfsg-1
Deleted: tags/aspectj/1.6.12+dfsg-1/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2011-12-02 16:13:00 UTC (rev 15484)
+++ tags/aspectj/1.6.12+dfsg-1/debian/changelog 2011-12-03 01:52:11 UTC (rev 15486)
@@ -1,175 +0,0 @@
-aspectj (1.6.11+dfsg-2) unstable; urgency=low
-
- * Readd B-D on itself (libaspectj-java) since the bootstrap phase still
- need part of iajc ant task to build everything (Closes: #628322).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 28 May 2011 22:08:47 +0200
-
-aspectj (1.6.11+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Updated Standards-Version to 3.9.1 (no changes needed).
- * Fix local Javadoc links:
- - d/patches/07_javadoc_links.diff: Use locally installed
- javadoc packages and hyperlink with them.
- - d/control: Add B-D on default-java-doc and libasm3-java-doc.
- * d/control: Drop B-D on itself (our new bootstrap infrastructure doesn't need
- that anymore).
- * Split packages into :
- - aspectj: only contains CLI tools.
- - libaspectj-java: JAR librairies for /usr/share/java.
- - libaspectj-java-doc: 4 API's Javadoc.
- - aspectj-doc: Programming Guides and SDK Documentation.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 15 Mar 2011 23:54:31 +0100
-
-aspectj (1.6.9+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Updated Standards-Version to 3.9.0 (no changes needed).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 07 Jul 2010 00:34:32 +0200
-
-aspectj (1.6.6+dfsg-4) unstable; urgency=low
-
- [ Torsten Werner ]
- * Remove Thomas Girard from Uploaders.
- * Change maintainers into Maintainers.
-
- [ Damien Raude-Morvan ]
- * Upload to unstable (fix FTBFS)
- * Drop usage of gjdoc (use default-jdk javadoc tool)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 13 Apr 2010 20:21:51 +0200
-
-aspectj (1.6.6+dfsg-3) unstable; urgency=low
-
- * Add Maven support:
- - debian/control: Build-Depends on maven-repo-helper
- - debian/rules: Use mh_installpoms and mh_installjar
- - Remove debian/aspectj.install
- * debian/README.source: Remove stuff about quilt
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 21 Mar 2010 00:18:12 +0100
-
-aspectj (1.6.6+dfsg-2) unstable; urgency=low
-
- * Fix FTBFS (fix ant.lib.path declaration):
- - New ant_0_8_fix.diff patch (Closes: #571341).
- * Updated Standards-Version to 3.8.4 (no changes needed).
- * Use 3.0 (quilt) source format.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 27 Feb 2010 14:24:57 +0100
-
-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 <drazzib at debian.org> 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 <drazzib at drazzib.com> 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 <konqueror at gmx.de> 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 <thomas.g.girard at free.fr> 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 <myon at debian.org> 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 <myon at debian.org> Sun, 12 Feb 2006 14:45:25 +0100
-
-aspectj (1.1.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Takashi Okamoto <tora at debian.org> Mon, 3 May 2004 18:51:19 +0900
-
-aspectj (1.0.6-2) unstable; urgency=low
-
- * Recompile to fix breakage.
- * New maintainer.
-
- -- James LewisMoss <dres at debian.org> Mon, 19 Aug 2002 10:37:21 -0400
-
-aspectj (1.0.6-1) unstable; urgency=low
-
- * New upstream release
-
- -- Takashi Okamoto <tora at debian.org> Sat, 27 Jul 2002 14:17:29 +0900
-
-aspectj (1.0.4-1) unstable; urgency=low
-
- * Initial Release.
-
- -- Takashi Okamoto <tora at debian.org> Fri, 21 Jun 2002 16:38:31 +0900
Copied: tags/aspectj/1.6.12+dfsg-1/debian/changelog (from rev 15485, trunk/aspectj/debian/changelog)
===================================================================
--- tags/aspectj/1.6.12+dfsg-1/debian/changelog (rev 0)
+++ tags/aspectj/1.6.12+dfsg-1/debian/changelog 2011-12-03 01:52:11 UTC (rev 15486)
@@ -0,0 +1,182 @@
+aspectj (1.6.12+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 03 Dec 2011 02:43:45 +0100
+
+aspectj (1.6.11+dfsg-2) unstable; urgency=low
+
+ * Readd B-D on itself (libaspectj-java) since the bootstrap phase still
+ need part of iajc ant task to build everything (Closes: #628322).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 28 May 2011 22:08:47 +0200
+
+aspectj (1.6.11+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.9.1 (no changes needed).
+ * Fix local Javadoc links:
+ - d/patches/07_javadoc_links.diff: Use locally installed
+ javadoc packages and hyperlink with them.
+ - d/control: Add B-D on default-java-doc and libasm3-java-doc.
+ * d/control: Drop B-D on itself (our new bootstrap infrastructure doesn't need
+ that anymore).
+ * Split packages into :
+ - aspectj: only contains CLI tools.
+ - libaspectj-java: JAR librairies for /usr/share/java.
+ - libaspectj-java-doc: 4 API's Javadoc.
+ - aspectj-doc: Programming Guides and SDK Documentation.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 15 Mar 2011 23:54:31 +0100
+
+aspectj (1.6.9+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated Standards-Version to 3.9.0 (no changes needed).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 07 Jul 2010 00:34:32 +0200
+
+aspectj (1.6.6+dfsg-4) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Remove Thomas Girard from Uploaders.
+ * Change maintainers into Maintainers.
+
+ [ Damien Raude-Morvan ]
+ * Upload to unstable (fix FTBFS)
+ * Drop usage of gjdoc (use default-jdk javadoc tool)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 13 Apr 2010 20:21:51 +0200
+
+aspectj (1.6.6+dfsg-3) unstable; urgency=low
+
+ * Add Maven support:
+ - debian/control: Build-Depends on maven-repo-helper
+ - debian/rules: Use mh_installpoms and mh_installjar
+ - Remove debian/aspectj.install
+ * debian/README.source: Remove stuff about quilt
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 21 Mar 2010 00:18:12 +0100
+
+aspectj (1.6.6+dfsg-2) unstable; urgency=low
+
+ * Fix FTBFS (fix ant.lib.path declaration):
+ - New ant_0_8_fix.diff patch (Closes: #571341).
+ * Updated Standards-Version to 3.8.4 (no changes needed).
+ * Use 3.0 (quilt) source format.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 27 Feb 2010 14:24:57 +0100
+
+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 <drazzib at debian.org> 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 <drazzib at drazzib.com> 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 <konqueror at gmx.de> 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 <thomas.g.girard at free.fr> 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 <myon at debian.org> 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 <myon at debian.org> Sun, 12 Feb 2006 14:45:25 +0100
+
+aspectj (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Takashi Okamoto <tora at debian.org> Mon, 3 May 2004 18:51:19 +0900
+
+aspectj (1.0.6-2) unstable; urgency=low
+
+ * Recompile to fix breakage.
+ * New maintainer.
+
+ -- James LewisMoss <dres at debian.org> Mon, 19 Aug 2002 10:37:21 -0400
+
+aspectj (1.0.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Takashi Okamoto <tora at debian.org> Sat, 27 Jul 2002 14:17:29 +0900
+
+aspectj (1.0.4-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Takashi Okamoto <tora at debian.org> Fri, 21 Jun 2002 16:38:31 +0900
Deleted: tags/aspectj/1.6.12+dfsg-1/debian/patches/series
===================================================================
--- trunk/aspectj/debian/patches/series 2011-12-02 16:13:00 UTC (rev 15484)
+++ tags/aspectj/1.6.12+dfsg-1/debian/patches/series 2011-12-03 01:52:11 UTC (rev 15486)
@@ -1,6 +0,0 @@
-01_ajc_xml_typo.diff
-03_use_system_docbook.diff
-04_use_xsltproc_for_doc.diff
-05_build_classpath.diff
-ant_0_8_fix.diff
-07_javadoc_links.diff
Copied: tags/aspectj/1.6.12+dfsg-1/debian/patches/series (from rev 15485, trunk/aspectj/debian/patches/series)
===================================================================
--- tags/aspectj/1.6.12+dfsg-1/debian/patches/series (rev 0)
+++ tags/aspectj/1.6.12+dfsg-1/debian/patches/series 2011-12-03 01:52:11 UTC (rev 15486)
@@ -0,0 +1,7 @@
+01_ajc_xml_typo.diff
+03_use_system_docbook.diff
+04_use_xsltproc_for_doc.diff
+05_build_classpath.diff
+ant_0_8_fix.diff
+07_javadoc_links.diff
+use_system_asm.diff
Copied: tags/aspectj/1.6.12+dfsg-1/debian/patches/use_system_asm.diff (from rev 15485, trunk/aspectj/debian/patches/use_system_asm.diff)
===================================================================
--- tags/aspectj/1.6.12+dfsg-1/debian/patches/use_system_asm.diff (rev 0)
+++ tags/aspectj/1.6.12+dfsg-1/debian/patches/use_system_asm.diff 2011-12-03 01:52:11 UTC (rev 15486)
@@ -0,0 +1,34 @@
+Description: Use system ASM3 instead of AspectJ copy
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Updated: 2011-11-23
+Forwarded: no
+Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+===================================================================
+--- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
++++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/AsmDetector.java
+@@ -24,8 +24,8 @@
+
+ static {
+ try {
+- Class<?> reader = Class.forName("aj.org.objectweb.asm.ClassReader");
+- Class<?> visitor = Class.forName("aj.org.objectweb.asm.ClassVisitor");
++ Class<?> reader = Class.forName("org.objectweb.asm.ClassReader");
++ Class<?> visitor = Class.forName("org.objectweb.asm.ClassVisitor");
+ Method m = reader.getMethod("accept", new Class[] { visitor, Integer.TYPE });
+ isAsmAround = m != null;
+ } catch (Exception e) {
+Index: b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+===================================================================
+--- a/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
++++ b/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+@@ -15,8 +15,8 @@
+ import org.aspectj.weaver.UnresolvedType;
+ import org.aspectj.weaver.World;
+
+-import aj.org.objectweb.asm.ClassReader;
+-import aj.org.objectweb.asm.ClassWriter;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassWriter;
+
+ /**
+ * Uses asm to add the stack map attribute to methods in a class. The class is passed in as pure byte data and then a reader/writer
Deleted: tags/aspectj/1.6.12+dfsg-1/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2011-12-02 16:13:00 UTC (rev 15484)
+++ tags/aspectj/1.6.12+dfsg-1/debian/rules 2011-12-03 01:52:11 UTC (rev 15486)
@@ -1,134 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.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
-
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
-
-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
-
- # 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/libaspectj-java::
- mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom
- mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjrt.pom \
- org.aspectj/modules/aj-build/dist/tools/lib/aspectjrt.jar
- mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjtools.pom
- mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjtools.pom \
- org.aspectj/modules/aj-build/dist/tools/lib/aspectjtools.jar
- mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjweaver.pom
- mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjweaver.pom \
- org.aspectj/modules/aj-build/dist/tools/lib/aspectjweaver.jar
-
-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 $(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
- -rm -rf debian/tmp
-
-.PHONY: get-orig-source
-get-orig-source:
- sh debian/cvs-get.sh
Copied: tags/aspectj/1.6.12+dfsg-1/debian/rules (from rev 15485, trunk/aspectj/debian/rules)
===================================================================
--- tags/aspectj/1.6.12+dfsg-1/debian/rules (rev 0)
+++ tags/aspectj/1.6.12+dfsg-1/debian/rules 2011-12-03 01:52:11 UTC (rev 15486)
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.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
+
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
+
+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
+
+ # asm3
+ $(MKDIR) $(AJ_ASM_HOME)
+ $(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.1.jar
+ $(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.3.1.renamed.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/libaspectj-java::
+ mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom
+ mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjrt.pom \
+ org.aspectj/modules/aj-build/dist/tools/lib/aspectjrt.jar
+ mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjtools.pom
+ mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjtools.pom \
+ org.aspectj/modules/aj-build/dist/tools/lib/aspectjtools.jar
+ mh_installpom -plibaspectj-java -e$(VERSION) org.aspectj/modules/build/aspectjweaver.pom
+ mh_installjar -plibaspectj-java -e$(VERSION) -l org.aspectj/modules/build/aspectjweaver.pom \
+ org.aspectj/modules/aj-build/dist/tools/lib/aspectjweaver.jar
+
+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 $(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
+ -rm -rf debian/tmp
+
+.PHONY: get-orig-source
+get-orig-source:
+ sh debian/cvs-get.sh
More information about the pkg-java-commits
mailing list