Author: drazzib Date: 2011-03-27 12:37:22 +0000 (Sun, 27 Mar 2011) New Revision: 13461
Added: tags/aspectj/1.6.11+dfsg-1/ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs tags/aspectj/1.6.11+dfsg-1/debian/changelog tags/aspectj/1.6.11+dfsg-1/debian/control tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.aspectj5rt-api tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.runtime-api tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.weaver-api tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.install tags/aspectj/1.6.11+dfsg-1/debian/local.properties tags/aspectj/1.6.11+dfsg-1/debian/patches/07_javadoc_links.diff tags/aspectj/1.6.11+dfsg-1/debian/patches/series tags/aspectj/1.6.11+dfsg-1/debian/rules Removed: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.aspectj5rt-api tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.runtime-api tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.weaver-api tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs tags/aspectj/1.6.11+dfsg-1/debian/changelog tags/aspectj/1.6.11+dfsg-1/debian/control tags/aspectj/1.6.11+dfsg-1/debian/local.properties tags/aspectj/1.6.11+dfsg-1/debian/patches/series tags/aspectj/1.6.11+dfsg-1/debian/rules Log: [svn-buildpackage] Tagging aspectj 1.6.11+dfsg-1 Deleted: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.aspectj5rt-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.aspectj5rt-api 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.aspectj5rt-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.runtime-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.runtime-api 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.runtime-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.weaver-api =================================================================== --- trunk/aspectj/debian/aspectj-doc.doc-base.weaver-api 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.doc-base.weaver-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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/* Deleted: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs =================================================================== --- trunk/aspectj/debian/aspectj-doc.docs 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,8 +0,0 @@ -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 Copied: tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs (from rev 13460, trunk/aspectj/debian/aspectj-doc.docs) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/aspectj-doc.docs 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,5 @@ +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 Deleted: tags/aspectj/1.6.11+dfsg-1/debian/changelog =================================================================== --- trunk/aspectj/debian/changelog 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/changelog 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,150 +0,0 @@ -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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Sun, 12 Feb 2006 14:45:25 +0100 - -aspectj (1.1.1-1) unstable; urgency=low - - * New upstream release. - - -- Takashi Okamoto <[email protected]> Mon, 3 May 2004 18:51:19 +0900 - -aspectj (1.0.6-2) unstable; urgency=low - - * Recompile to fix breakage. - * New maintainer. - - -- James LewisMoss <[email protected]> Mon, 19 Aug 2002 10:37:21 -0400 - -aspectj (1.0.6-1) unstable; urgency=low - - * New upstream release - - -- Takashi Okamoto <[email protected]> Sat, 27 Jul 2002 14:17:29 +0900 - -aspectj (1.0.4-1) unstable; urgency=low - - * Initial Release. - - -- Takashi Okamoto <[email protected]> Fri, 21 Jun 2002 16:38:31 +0900 Copied: tags/aspectj/1.6.11+dfsg-1/debian/changelog (from rev 13460, trunk/aspectj/debian/changelog) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/changelog (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/changelog 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,168 @@ +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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Sun, 12 Feb 2006 14:45:25 +0100 + +aspectj (1.1.1-1) unstable; urgency=low + + * New upstream release. + + -- Takashi Okamoto <[email protected]> Mon, 3 May 2004 18:51:19 +0900 + +aspectj (1.0.6-2) unstable; urgency=low + + * Recompile to fix breakage. + * New maintainer. + + -- James LewisMoss <[email protected]> Mon, 19 Aug 2002 10:37:21 -0400 + +aspectj (1.0.6-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto <[email protected]> Sat, 27 Jul 2002 14:17:29 +0900 + +aspectj (1.0.4-1) unstable; urgency=low + + * Initial Release. + + -- Takashi Okamoto <[email protected]> Fri, 21 Jun 2002 16:38:31 +0900 Deleted: tags/aspectj/1.6.11+dfsg-1/debian/control =================================================================== --- trunk/aspectj/debian/control 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/control 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,33 +0,0 @@ -Source: aspectj -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> -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 -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. Copied: tags/aspectj/1.6.11+dfsg-1/debian/control (from rev 13460, trunk/aspectj/debian/control) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/control (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/control 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,69 @@ +Source: aspectj +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> +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), 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}, 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 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: tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.aspectj5rt-api (from rev 13460, trunk/aspectj/debian/libaspectj-java-doc.doc-base.aspectj5rt-api) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.aspectj5rt-api (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.aspectj5rt-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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: tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.runtime-api (from rev 13460, trunk/aspectj/debian/libaspectj-java-doc.doc-base.runtime-api) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.runtime-api (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.runtime-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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: tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.weaver-api (from rev 13460, trunk/aspectj/debian/libaspectj-java-doc.doc-base.weaver-api) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.weaver-api (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.doc-base.weaver-api 2011-03-27 12:37:22 UTC (rev 13461) @@ -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: tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.install (from rev 13460, trunk/aspectj/debian/libaspectj-java-doc.install) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.install (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/libaspectj-java-doc.install 2011-03-27 12:37:22 UTC (rev 13461) @@ -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/ Deleted: tags/aspectj/1.6.11+dfsg-1/debian/local.properties =================================================================== --- trunk/aspectj/debian/local.properties 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/local.properties 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,9 +0,0 @@ -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 Copied: tags/aspectj/1.6.11+dfsg-1/debian/local.properties (from rev 13460, trunk/aspectj/debian/local.properties) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/local.properties (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/local.properties 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,4 @@ +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 Copied: tags/aspectj/1.6.11+dfsg-1/debian/patches/07_javadoc_links.diff (from rev 13460, trunk/aspectj/debian/patches/07_javadoc_links.diff) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/patches/07_javadoc_links.diff (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/patches/07_javadoc_links.diff 2011-03-27 12:37:22 UTC (rev 13461) @@ -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 <[email protected]> +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;\ Deleted: tags/aspectj/1.6.11+dfsg-1/debian/patches/series =================================================================== --- trunk/aspectj/debian/patches/series 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/patches/series 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,5 +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 Copied: tags/aspectj/1.6.11+dfsg-1/debian/patches/series (from rev 13460, trunk/aspectj/debian/patches/series) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/patches/series (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/patches/series 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,6 @@ +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 Deleted: tags/aspectj/1.6.11+dfsg-1/debian/rules =================================================================== --- trunk/aspectj/debian/rules 2011-03-16 20:33:24 UTC (rev 13434) +++ tags/aspectj/1.6.11+dfsg-1/debian/rules 2011-03-27 12:37:22 UTC (rev 13461) @@ -1,141 +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 - -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 - -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 - - # 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 - mh_installpom -paspectj -e$(VERSION) org.aspectj/modules/build/aspectjrt.pom - mh_installjar -paspectj -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 \ - 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 \ - 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.11+dfsg-1/debian/rules (from rev 13460, trunk/aspectj/debian/rules) =================================================================== --- tags/aspectj/1.6.11+dfsg-1/debian/rules (rev 0) +++ tags/aspectj/1.6.11+dfsg-1/debian/rules 2011-03-27 12:37:22 UTC (rev 13461) @@ -0,0 +1,134 @@ +#!/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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
