Author: drazzib Date: 2011-03-27 12:14:04 +0000 (Sun, 27 Mar 2011) New Revision: 13460
Added: trunk/aspectj/debian/libaspectj-java-doc.doc-base.aspectj5rt-api trunk/aspectj/debian/libaspectj-java-doc.doc-base.runtime-api trunk/aspectj/debian/libaspectj-java-doc.doc-base.weaver-api trunk/aspectj/debian/libaspectj-java-doc.install trunk/aspectj/debian/patches/07_javadoc_links.diff Removed: trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api Modified: trunk/aspectj/debian/aspectj-doc.docs trunk/aspectj/debian/changelog trunk/aspectj/debian/control trunk/aspectj/debian/local.properties trunk/aspectj/debian/patches/series trunk/aspectj/debian/rules Log: * 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. Deleted: trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -1,9 +0,0 @@ -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/* Deleted: trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -1,9 +0,0 @@ -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/* Deleted: trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -1,9 +0,0 @@ -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/* Modified: trunk/aspectj/debian/aspectj-doc.docs =================================================================== --- trunk/aspectj/debian/aspectj-doc.docs 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/aspectj-doc.docs 2011-03-27 12:14:04 UTC (rev 13460) @@ -3,6 +3,3 @@ 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 Modified: trunk/aspectj/debian/changelog =================================================================== --- trunk/aspectj/debian/changelog 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/changelog 2011-03-27 12:14:04 UTC (rev 13460) @@ -1,3 +1,21 @@ +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 <draz...@debian.org> Tue, 15 Mar 2011 23:54:31 +0100 + aspectj (1.6.9+dfsg-1) unstable; urgency=low * New upstream release. Modified: trunk/aspectj/debian/control =================================================================== --- trunk/aspectj/debian/control 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/control 2011-03-27 12:14:04 UTC (rev 13460) @@ -5,29 +5,65 @@ Uploaders: Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org> Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs 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, html2text, maven-repo-helper -Standards-Version: 3.9.0 + junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), html2text, maven-repo-helper, default-jdk-doc, + libasm3-java-doc +Standards-Version: 3.9.1 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 +Depends: ${misc:Depends}, libaspectj-java (= ${source:Version}), + default-jre-headless | java2-runtime-headless +Description: aspect-oriented extension for Java - tools 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 CLI tools of aspectj (aj5, ajc, ajbrowser). +Package: libaspectj-java +Architecture: all +Replaces: aspectj (<< 1.6.10+dfsg-1) +Conflicts: aspectj (<< 1.6.10+dfsg-1) +Depends: ${misc:Depends} +Suggests: aspectj +Description: aspect-oriented extension for Java - library + 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 JAR libraries of aspectj. + Package: aspectj-doc Section: doc Architecture: all Depends: ${misc:Depends} +Suggests: libaspectj-java-doc 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. + This package provides AspectJ Programming Guide, Diagnosis Guide and + Development Environment Guide and Development Kit Developer's Notebook. + +Package: libaspectj-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: default-jdk-doc, libasm3-java-doc +Replaces: aspectj-doc (<< 1.6.10+dfsg-1) +Conflicts: aspectj-doc (<< 1.6.10+dfsg-1) +Suggests: aspectj-doc +Description: aspect-oriented extension for Java - API 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 Javadoc of JAR libraries of aspectj. Copied: trunk/aspectj/debian/libaspectj-java-doc.doc-base.aspectj5rt-api (from rev 13422, trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api) =================================================================== --- trunk/aspectj/debian/libaspectj-java-doc.doc-base.aspectj5rt-api (rev 0) +++ trunk/aspectj/debian/libaspectj-java-doc.doc-base.aspectj5rt-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -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/libaspectj-java/api-aspectj5rt/index.html +Files: /usr/share/doc/libaspectj-java/api-aspectj5rt/* Copied: trunk/aspectj/debian/libaspectj-java-doc.doc-base.runtime-api (from rev 13422, trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api) =================================================================== --- trunk/aspectj/debian/libaspectj-java-doc.doc-base.runtime-api (rev 0) +++ trunk/aspectj/debian/libaspectj-java-doc.doc-base.runtime-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -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/libaspectj-java/api-runtime/index.html +Files: /usr/share/doc/libaspectj-java/api-runtime/* Copied: trunk/aspectj/debian/libaspectj-java-doc.doc-base.weaver-api (from rev 13422, trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api) =================================================================== --- trunk/aspectj/debian/libaspectj-java-doc.doc-base.weaver-api (rev 0) +++ trunk/aspectj/debian/libaspectj-java-doc.doc-base.weaver-api 2011-03-27 12:14:04 UTC (rev 13460) @@ -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/libaspectj-java/api-weaver/index.html +Files: /usr/share/doc/libaspectj-java/api-weaver/* Copied: trunk/aspectj/debian/libaspectj-java-doc.install (from rev 13422, trunk/aspectj/debian/aspectj-doc.docs) =================================================================== --- trunk/aspectj/debian/libaspectj-java-doc.install (rev 0) +++ trunk/aspectj/debian/libaspectj-java-doc.install 2011-03-27 12:14:04 UTC (rev 13460) @@ -0,0 +1,3 @@ +org.aspectj/modules/aj-build/dist/docs/doc/aspectj5rt-api/* /usr/share/doc/libaspectj-java/api-aspectj5rt/ +org.aspectj/modules/aj-build/dist/docs/doc/runtime-api/* /usr/share/doc/libaspectj-java/api-runtime/ +org.aspectj/modules/aj-build/dist/docs/doc/weaver-api/* /usr/share/doc/libaspectj-java/api-weaver/ Modified: trunk/aspectj/debian/local.properties =================================================================== --- trunk/aspectj/debian/local.properties 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/local.properties 2011-03-27 12:14:04 UTC (rev 13460) @@ -1,8 +1,3 @@ -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 Added: trunk/aspectj/debian/patches/07_javadoc_links.diff =================================================================== --- trunk/aspectj/debian/patches/07_javadoc_links.diff (rev 0) +++ trunk/aspectj/debian/patches/07_javadoc_links.diff 2011-03-27 12:14:04 UTC (rev 13460) @@ -0,0 +1,40 @@ +Description: Fix Javadoc links to use local + files (from default-jdk-doc and libasm3-java-doc). +Forwarded: no +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2011-03-16 +--- a/org.aspectj/modules/docs/build.xml ++++ b/org.aspectj/modules/docs/build.xml +@@ -252,10 +252,12 @@ + classpath="${@{module}.classpath}" + packagenames="${@{module}.packagenames}" + > +- <link offline="true" +- href="http://java.sun.com/j2se/1.5/docs/api"; +- packagelistLoc="${docs.src.dir}/jdk15-packages.txt" ++ <link ++ href="/usr/share/doc/default-jdk-doc/api/" + /> ++ <link ++ href="/usr/share/doc/libasm3-java-doc/api/" ++ /> + </javadoc> + </sequential> + </macrodef> +--- a/org.aspectj/modules/docs/docs.build.properties ++++ b/org.aspectj/modules/docs/docs.build.properties +@@ -18,12 +18,8 @@ + + weaver.classpath=\ + ${aspectj.modules.dir}/lib/bcel/bcel.jar;\ +-${aspectj.modules.dir}/asm/bin;\ +-${aspectj.modules.dir}/bridge/bin;\ +-${aspectj.modules.dir}/runtime/bin;\ +-${aspectj.modules.dir}/util/bin;\ +-${aspectj.modules.dir}/testing-util/bin;\ +-${aspectj.modules.dir}/aj-build/jars/asm.jar;\ ++${aspectj.modules.dir}/lib/asm/asm-3.1.jar;\ ++${aspectj.modules.dir}/aj-build/jars/org.aspectj.matcher.jar;\ + ${aspectj.modules.dir}/aj-build/jars/bridge.jar;\ + ${aspectj.modules.dir}/aj-build/jars/runtime.jar;\ + ${aspectj.modules.dir}/aj-build/jars/util.jar;\ Modified: trunk/aspectj/debian/patches/series =================================================================== --- trunk/aspectj/debian/patches/series 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/patches/series 2011-03-27 12:14:04 UTC (rev 13460) @@ -3,3 +3,4 @@ 04_use_xsltproc_for_doc.diff 05_build_classpath.diff ant_0_8_fix.diff +07_javadoc_links.diff Modified: trunk/aspectj/debian/rules =================================================================== --- trunk/aspectj/debian/rules 2011-03-26 11:52:22 UTC (rev 13459) +++ trunk/aspectj/debian/rules 2011-03-27 12:14:04 UTC (rev 13460) @@ -31,9 +31,6 @@ 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 - VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//') pre-build:: debian/stamp-bootstrap @@ -76,12 +73,6 @@ # Setup our local.properties cp debian/local.properties $(MODULES)/build - # 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 @@ -109,14 +100,16 @@ for f in $(AJ_SCRIPTS) ; do \ dh_install $$f /usr/bin ; \ done - mh_installpom -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom - mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjrt.pom \ + +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 -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjtools.pom - mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjtools.pom \ + 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 -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjweaver.pom - mh_installjar -paspectj -e$(VERSION) -l org.aspectj/modules/build/aspectjweaver.pom \ + 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:: _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
