Author: drazzib Date: 2010-04-13 18:26:30 +0000 (Tue, 13 Apr 2010) New Revision: 12154
Removed: trunk/aspectj/debian/patches/02_use_gjdoc.diff Modified: trunk/aspectj/debian/changelog trunk/aspectj/debian/control trunk/aspectj/debian/patches/series trunk/aspectj/debian/rules Log: * Upload to unstable (fix FTBFS) * Drop usage of gjdoc (use default-jdk javadoc tool) Modified: trunk/aspectj/debian/changelog =================================================================== --- trunk/aspectj/debian/changelog 2010-04-13 18:21:02 UTC (rev 12153) +++ trunk/aspectj/debian/changelog 2010-04-13 18:26:30 UTC (rev 12154) @@ -1,14 +1,15 @@ -aspectj (1.6.8+dfsg-1) unstable; urgency=low +aspectj (1.6.6+dfsg-4) unstable; urgency=low - UNRELEASED: FTBFS - * Team upload - * New upstream release + [ Torsten Werner ] * Remove Thomas Girard from Uploaders. * Change maintainers into Maintainers. - * Replace gjdoc by gcj-jdk. - -- Torsten Werner <[email protected]> Sun, 11 Apr 2010 22:46:19 +0200 + [ 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: Modified: trunk/aspectj/debian/control =================================================================== --- trunk/aspectj/debian/control 2010-04-13 18:21:02 UTC (rev 12153) +++ trunk/aspectj/debian/control 2010-04-13 18:26:30 UTC (rev 12154) @@ -5,7 +5,7 @@ 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, gcj-jdk, html2text, maven-repo-helper + junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, html2text, maven-repo-helper Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/ Deleted: trunk/aspectj/debian/patches/02_use_gjdoc.diff =================================================================== --- trunk/aspectj/debian/patches/02_use_gjdoc.diff 2010-04-13 18:21:02 UTC (rev 12153) +++ trunk/aspectj/debian/patches/02_use_gjdoc.diff 2010-04-13 18:26:30 UTC (rev 12154) @@ -1,66 +0,0 @@ -Description: Use gjdoc when invoking ajdoc -Author: Thomas Girard <[email protected]> -Author: Damien Raude-Morvan <[email protected]> -Forwarded: no -Last-Update: 2009-10-04 ---- a/org.aspectj/modules/ajdoc/.classpath -+++ b/org.aspectj/modules/ajdoc/.classpath -@@ -7,6 +7,7 @@ - <classpathentry kind="src" path="/util"/> - <classpathentry kind="src" path="testsrc"/> - <classpathentry sourcepath="/lib/junit/junit-src.jar" kind="lib" path="/lib/junit/junit.jar"/> -+ <classpathentry kind="lib" path="/lib/gnu-classpath-tools-gjdoc.jar"/> - <classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/> - <classpathentry kind="var" path="JRE14_LIB"/> - <classpathentry kind="output" path="bin"/> ---- 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()); -+ } -+ } -+ } - } Modified: trunk/aspectj/debian/patches/series =================================================================== --- trunk/aspectj/debian/patches/series 2010-04-13 18:21:02 UTC (rev 12153) +++ trunk/aspectj/debian/patches/series 2010-04-13 18:26:30 UTC (rev 12154) @@ -1,5 +1,4 @@ 01_ajc_xml_typo.diff -02_use_gjdoc.diff 03_use_system_docbook.diff 04_use_xsltproc_for_doc.diff 05_build_classpath.diff Modified: trunk/aspectj/debian/rules =================================================================== --- trunk/aspectj/debian/rules 2010-04-13 18:21:02 UTC (rev 12153) +++ trunk/aspectj/debian/rules 2010-04-13 18:26:30 UTC (rev 12154) @@ -76,9 +76,6 @@ # 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 \ @@ -132,7 +129,6 @@ 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) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
