[pkg-java] r6253 - in trunk/gjdoc/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Fri Apr 25 12:24:52 UTC 2008 

Author: mkoch
Date: 2008-04-25 12:24:51 +0000 (Fri, 25 Apr 2008)
New Revision: 6253

Modified:
   trunk/gjdoc/debian/
   trunk/gjdoc/debian/changelog
   trunk/gjdoc/debian/patches/20_com_sun_tools_javadoc_Main.patch
Log:
gjdoc (0.7.9-1) unstable; urgency=low

  * New upstream release
    - updated debian/patches/20_com_sun_tools_javadoc_Main.patch

 -- Michael Koch <konqueror at gmx.de>  Fri, 25 Apr 2008 14:13:36 +0200




Property changes on: trunk/gjdoc/debian
___________________________________________________________________
Name: svn:ignore
   - files
gjdoc
links
stamp-*
*.debhelper
*.pyc
*.substvars

   + files
gjdoc
gjdoc.debhelper.log
links
stamp-*
*.debhelper
*.pyc
*.substvars


Modified: trunk/gjdoc/debian/changelog
===================================================================
--- trunk/gjdoc/debian/changelog	2008-04-25 12:23:30 UTC (rev 6252)
+++ trunk/gjdoc/debian/changelog	2008-04-25 12:24:51 UTC (rev 6253)
@@ -1,3 +1,10 @@
+gjdoc (0.7.9-1) unstable; urgency=low
+
+  * New upstream release
+    - updated debian/patches/20_com_sun_tools_javadoc_Main.patch
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 25 Apr 2008 14:13:36 +0200
+
 gjdoc (0.7.8-10) unstable; urgency=low
 
   * Don't build on alpha, arm, hppa.

Modified: trunk/gjdoc/debian/patches/20_com_sun_tools_javadoc_Main.patch
===================================================================
--- trunk/gjdoc/debian/patches/20_com_sun_tools_javadoc_Main.patch	2008-04-25 12:23:30 UTC (rev 6252)
+++ trunk/gjdoc/debian/patches/20_com_sun_tools_javadoc_Main.patch	2008-04-25 12:24:51 UTC (rev 6253)
@@ -1,94 +1,37 @@
---- /dev/null	2008-01-09 22:41:23.640093256 +0100
-+++ src/com/sun/tools/javadoc/Main.java	2008-02-13 11:45:01.000000000 +0100
-@@ -0,0 +1,33 @@
-+package com.sun.tools.javadoc;
-+
+--- src/com/sun/tools/javadoc/Main.java.orig	2007-05-12 12:40:10.000000000 +0200
++++ src/com/sun/tools/javadoc/Main.java	2008-04-25 14:08:40.000000000 +0200
+@@ -1,9 +1,33 @@
+ package com.sun.tools.javadoc;
+ 
 +import java.io.PrintWriter;
 +
-+public class Main
-+{
-+	public static void main(String[] args)
-+	{
-+		execute(args);
-+	}
+ public class Main
+ {
+ 	 public static void main(String[] args)
+ 	 {
+-	 	gnu.classpath.tools.gjdoc.Main.main(args);
++	 	execute(args);
++	 }
 +
-+	public static int execute(String[] args)
-+	{
-+		return execute("gjdoc", args);
-+	}
++	 public static int execute(String[] args)
++	 {
++	 	return execute("gjdoc", args);
++	 }
 +
-+	public static int execute(String programName, String[] args)
-+	{
-+		return gnu.classpath.tools.gjdoc.Main.execute(programName, args);
-+	}
++	 public static int execute(String programName, String[] args)
++	 {
++	 	return gnu.classpath.tools.gjdoc.Main.execute(programName, args);
++	 }
 +
-+	public static int execute(String programName, String defaultDocletClassName, String[] args)
-+	{
-+		System.out.println("com.sun.tools.javadoc.Main.execute(String,String,String[]) is not implemented");
-+		return -1;
-+	}
++	 public static int execute(String programName, String defaultDocletClassName, String[] args)
++	 {
++	 	System.out.println("com.sun.tools.javadoc.Main.execute(String,String,String[]) is not implemented");
++	 	return -1;
++	 }
 +
-+	public static int execute(String programName, PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter, String defaultDocletClassName, String[] args)
-+	{
-+		System.out.println("com.sun.tools.javadoc.Main.execute(String,PrintWriter,PrintWriter,PrintWriter,String,String[]) is not implemented");
-+		return -1;
-+	}
-+}
---- Makefile.am.orig	2008-02-15 10:02:57.000000000 +0100
-+++ Makefile.am	2008-02-15 10:03:38.000000000 +0100
-@@ -60,6 +60,7 @@
- 	antlr.so
- 
- lib_com_sun_javadoc_la_SOURCES = \
-+	src/com/sun/tools/javadoc/Main.java \
- 	src/com/sun/javadoc/ClassDoc.java \
- 	src/com/sun/javadoc/ConstructorDoc.java \
- 	src/com/sun/javadoc/Doc.java \
-@@ -370,9 +371,10 @@
- 
- com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES)
- 	$(JAR) cf $@ -C classes com/sun/javadoc
-+	$(JAR) uf $@ -C classes com/sun/tools/javadoc
- 
- com-sun-tools-doclets-Taglet-$(VERSION).jar: classes $(com_sun_tools_doclets_Taglet_jar_CLASSES)
--	$(JAR) cf $@ -C classes com/sun/tools
-+	$(JAR) cf $@ -C classes com/sun/tools/doclects
- 
- gjdoc_resources = $(gnu_classpath_tools_gjdoc_jar_CSS) $(gnu_classpath_tools_gjdoc_jar_DTDS) \
- 	$(gnu_classpath_tools_gjdoc_jar_ENTS) $(gnu_classpath_tools_gjdoc_jar_HTML) \
---- Makefile.in.orig	2008-02-15 09:57:59.000000000 +0100
-+++ Makefile.in	2008-02-15 10:01:50.000000000 +0100
-@@ -627,6 +627,7 @@
- 	antlr.so
- 
- lib_com_sun_javadoc_la_SOURCES = \
-+	src/com/sun/tools/javadoc/Main.java \
- 	src/com/sun/javadoc/ClassDoc.java \
- 	src/com/sun/javadoc/ConstructorDoc.java \
- 	src/com/sun/javadoc/Doc.java \
-@@ -2111,6 +2112,13 @@
- @AMDEP_TRUE@@am__fastdepGCJ_FALSE@	DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepGCJ_FALSE@	$(LTGCJCOMPILE) -c -o $@ $<
- 
-+src/com/sun/javadoc/tools/Main.lo: src/com/sun/javadoc/tools/Main.java
-+ at am__fastdepGCJ_TRUE@	$(LIBTOOL) --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -MT src/com/sun/javadoc/tools/Main.lo -MD -MP -MF src/com/sun/javadoc/$(DEPDIR)/tools/Main.Tpo -c -o src/com/sun/javadoc/tools/Main.lo `test -f 'src/com/sun/javadoc/tools/Main.java' || echo '$(srcdir)/'`src/com/sun/javadoc/tools/Main.java
-+ at am__fastdepGCJ_TRUE@	mv -f src/com/sun/javadoc/$(DEPDIR)/tools/Main.Tpo src/com/sun/javadoc/$(DEPDIR)/tools/Main.Plo
-+ at AMDEP_TRUE@@am__fastdepGCJ_FALSE@	source='src/com/sun/javadoc/tools/Main.java' object='src/com/sun/javadoc/tools/Main.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepGCJ_FALSE@	DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepGCJ_FALSE@	$(LIBTOOL) --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -c -o src/com/sun/javadoc/tools/Main.lo `test -f 'src/com/sun/javadoc/tools/Main.java' || echo '$(srcdir)/'`src/com/sun/javadoc/tools/Main.java
-+
- src/com/sun/javadoc/ClassDoc.lo: src/com/sun/javadoc/ClassDoc.java
- @am__fastdepGCJ_TRUE@	$(LIBTOOL) --tag=GCJ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) -MT src/com/sun/javadoc/ClassDoc.lo -MD -MP -MF src/com/sun/javadoc/$(DEPDIR)/ClassDoc.Tpo -c -o src/com/sun/javadoc/ClassDoc.lo `test -f 'src/com/sun/javadoc/ClassDoc.java' || echo '$(srcdir)/'`src/com/sun/javadoc/ClassDoc.java
- @am__fastdepGCJ_TRUE@	mv -f src/com/sun/javadoc/$(DEPDIR)/ClassDoc.Tpo src/com/sun/javadoc/$(DEPDIR)/ClassDoc.Plo
-@@ -3744,9 +3752,10 @@
- 
- com-sun-javadoc-$(VERSION).jar: classes $(com_sun_javadoc_jar_CLASSES)
- 	$(JAR) cf $@ -C classes com/sun/javadoc
-+	$(JAR) cf $@ -C classes com/sun/javadoc -C classes com/sun/tools/javadoc
- 
- com-sun-tools-doclets-Taglet-$(VERSION).jar: classes $(com_sun_tools_doclets_Taglet_jar_CLASSES)
--	$(JAR) cf $@ -C classes com/sun/tools
-+	$(JAR) cf $@ -C classes com/sun/tools/doclets
- 
- gnu-classpath-tools-gjdoc-$(VERSION).jar: $(srcdir)/gjdoc.manifest src/resources/version.properties $(gnu_classpath_tools_gjdoc_jar_CLASSES) $(gnu_classpath_tools_gjdoc_jar_GENCLASSES) $(gjdoc_resources_src)
- 	for res in $(gjdoc_resources) ; \
++	 public static int execute(String programName, PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter, String defaultDocletClassName, String[] args)
++	 {
++	 	System.out.println("com.sun.tools.javadoc.Main.execute(String,PrintWriter,PrintWriter,PrintWriter,String,String[]) is not implemented");
++	 	return -1;
+ 	 }
+ }

More information about the pkg-java-commits mailing list