[pkg-java] r10757 - in trunk/aspectj/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-10-04 14:48:51 +0000 (Sun, 04 Oct 2009)
New Revision: 10757

Modified:
   trunk/aspectj/debian/changelog
   trunk/aspectj/debian/control
   trunk/aspectj/debian/patches/02_use_gjdoc.diff
Log:
* New upstream release.
  - Update 02_use_gjdoc.diff patch
* Update my email address

Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog	2009-10-03 18:15:16 UTC (rev 10756)
+++ trunk/aspectj/debian/changelog	2009-10-04 14:48:51 UTC (rev 10757)
@@ -1,3 +1,11 @@
+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 ]

Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control	2009-10-03 18:15:16 UTC (rev 10756)
+++ trunk/aspectj/debian/control	2009-10-04 14:48:51 UTC (rev 10757)
@@ -2,7 +2,7 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>
+Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 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

Modified: trunk/aspectj/debian/patches/02_use_gjdoc.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_gjdoc.diff	2009-10-03 18:15:16 UTC (rev 10756)
+++ trunk/aspectj/debian/patches/02_use_gjdoc.diff	2009-10-04 14:48:51 UTC (rev 10757)
@@ -1,7 +1,8 @@
 Description: Use gjdoc when invoking ajdoc
 Author: Thomas Girard <thomas.g.girard at free.fr>
+Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: no
-Last-Update: 2009-08-18
+Last-Update: 2009-10-04
 --- a/org.aspectj/modules/ajdoc/.classpath
 +++ b/org.aspectj/modules/ajdoc/.classpath
 @@ -7,6 +7,7 @@
@@ -14,53 +15,52 @@
  	<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
-@@ -21,10 +21,21 @@
-  * @author Mik Kersten
-  */
- class JavadocRunner {
-+	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());
-+			}
-+		}
-+	}
- 	
+@@ -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};
+-			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 +76,13 @@
+ 		} 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 {
+ 			// 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};
+ 				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.");
+-				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});
-@@ -90,6 +100,9 @@
-             // 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 );
-     }
+ 				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());
++                       }
++               }
++       }
+ }