Dear all,
Please find attached a patch against the current packaging svn
svn://svn.debian.org/pkg-eucalyptus/gwt/trunk .
It make it possible to build gwt-dev.jar .
I'll continue working towards building gwt-user.jar (when I get the
chance), but I wanted to share my work in case people were tackling
the issue.
Regards,
Alex
diff -Nru -x .svn gwt-debian/debian//build.xml gwt-2.4.0/debian//build.xml
--- gwt-debian/debian//build.xml 2011-08-24 09:32:53.930142995 +0200
+++ gwt-2.4.0/debian//build.xml 2011-08-31 17:07:06.734142050 +0200
@@ -4,7 +4,6 @@
<target name="build">
<ant dir="dev/"/>
- <ant dir="dev/linux/"/>
<ant dir="user/"/>
<ant dir="servlet/"/>
</target>
diff -Nru -x .svn gwt-debian/debian//control gwt-2.4.0/debian//control
--- gwt-debian/debian//control 2011-08-24 09:32:53.926142396 +0200
+++ gwt-2.4.0/debian//control 2011-08-31 14:33:14.462142063 +0200
@@ -12,7 +12,10 @@
libecj-java,
libswt-gtk-3-java, libswt-gtk-3-java-gcj,
junit
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
+ eclipse-jdt,
+ libguava-java, libhtmlunit-java, libhtmlunit-core-js-java,
+ libjetty-java, libprotobuf-java, libcommons-logging-java
+Build-Depends: ant, ant-contrib, debhelper (>= 5), cdbs (>= 0.4.5.3)
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/pkg-eucalyptus/gwt/trunk
Vcs-Browser: http://svn.debian.org/websvn/pkg-eucalyptus/gwt
diff -Nru -x .svn gwt-debian/debian//patches/build.patch gwt-2.4.0/debian//patches/build.patch
--- gwt-debian/debian//patches/build.patch 2011-08-24 09:32:53.826142269 +0200
+++ gwt-2.4.0/debian//patches/build.patch 2011-08-31 17:11:13.982150089 +0200
@@ -4,8 +4,10 @@
Authors: Thierry Carrez <thierry.car...@ubuntu.com>, Charles Plessy <ple...@debian.org>
Forwarded: no
---- a/common.ant.xml
-+++ b/common.ant.xml
+Index: gwt-2.4.0/common.ant.xml
+===================================================================
+--- gwt-2.4.0.orig/common.ant.xml 2011-08-31 17:10:36.782643293 +0200
++++ gwt-2.4.0/common.ant.xml 2011-08-31 17:10:39.522642565 +0200
@@ -47,7 +47,7 @@
<property name="gwt.threadsPerProcessor" value="1" />
<property name="gwt.threadCount" value="1" />
@@ -26,6 +28,15 @@
<!-- Platform identification -->
<condition property="build.host.islinux">
<and>
+@@ -125,7 +121,7 @@
+ <!-- Pulls in tasks defined in ant-contrib, i.e. foreach -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+- <pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
++ <pathelement location="/usr/share/java/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+
@@ -142,6 +138,7 @@
<presetdef name="gwt.ant">
<ant inheritall="false" target="${target}">
@@ -34,8 +45,10 @@
<propertyref name="gwt.version" />
<propertyref name="gwt.junit.port" />
<propertyref name="gwt.remote.browsers" />
---- a/dev/build.xml
-+++ b/dev/build.xml
+Index: gwt-2.4.0/dev/build.xml
+===================================================================
+--- gwt-2.4.0.orig/dev/build.xml 2011-08-31 17:10:36.826643405 +0200
++++ gwt-2.4.0/dev/build.xml 2011-08-31 17:10:39.534641229 +0200
@@ -26,8 +26,6 @@
<src path="core/test" />
<classpath>
@@ -112,7 +125,41 @@
</outofdate>
</target>
-@@ -232,7 +170,6 @@
+@@ -212,19 +150,27 @@
+ <include name="com/google/gwt/util/**"/>
+ <include name="org/eclipse/jdt/**"/>
+ <classpath>
+- <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+- <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
+- <pathelement location="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
+- <pathelement location="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
++ <pathelement location="/usr/share/java/ecj.jar" />
++ <pathelement location="/usr/lib/eclipse/plugins/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar" />
++ <pathelement location="/usr/share/java/commons-collections3.jar" />
++ <pathelement location="/usr/share/java/guava.jar" />
+ </classpath>
+ </gwt.javac>
+ </target>
+
+- <target name="compile" depends="compiler.standalone, build.alldeps.jar" description="Compiles this project">
++ <target name="compile" depends="compiler.standalone" description="Compiles this project">
+ <gwt.javac srcdir="" excludes="${filter.pattern}">
+ <src path="core/src" />
+ <classpath>
+- <pathelement location="${alldeps.jar}" />
++ <pathelement location="/usr/share/java/commons-collections3.jar" />
++ <pathelement location="/usr/share/java/servlet-api-2.5.jar" />
++ <pathelement location="/usr/share/java/htmlunit.jar" />
++ <pathelement location="/usr/share/java/htmlunit-core-js.jar" />
++ <pathelement location="/usr/share/java/jetty.jar" />
++ <pathelement location="/usr/share/java/jetty-util.jar" />
++ <pathelement location="/usr/share/java/protobuf.jar" />
++ <pathelement location="/usr/share/java/commons-logging.jar" />
++ <pathelement location="/usr/lib/eclipse/plugins/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar" />
+ </classpath>
+ </gwt.javac>
+ <copy todir="${javac.out}">
+@@ -232,7 +178,6 @@
</copy>
<!-- Files with hardcoded version information must be filtered -->
@@ -120,8 +167,51 @@
<condition property="filter.uptodate">
<and>
<available file="${filter.sentinel}" />
---- a/dev/common.ant.xml
-+++ b/dev/common.ant.xml
+@@ -302,6 +247,7 @@
+ <property.ensure name="gwt.tools.soyc" location="${gwt.root}/tools/soyc-vis" />
+ <target name="build" depends="compile" description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}" />
++ <mkdir dir="${target.dir}" />
+ <outofdate>
+ <sourcefiles>
+ <fileset dir="core/src">
+@@ -311,7 +257,6 @@
+ <fileset dir="core/super" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
+ <fileset dir="${project.build}/bin" />
+- <fileset file="${project.build}/alldeps.jar" />
+ <fileset file="${gwt.tools.soyc}/classLevel.css"/>
+ <fileset file="${gwt.tools.soyc}/roundedCorners.css"/>
+ </sourcefiles>
+@@ -319,14 +264,13 @@
+ <fileset file="${project.lib}"/>
+ </targetfiles>
+ <sequential>
+- <gwt.jar>
++ <jar destfile="${project.lib}">
+ <fileset dir="core/src">
+ <exclude name="**/package.html"/>
+ <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin -->
+ </fileset>
+ <fileset dir="core/super" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
+- <zipfileset src="${alldeps.jar}" />
+
+ <zipfileset file="${gwt.tools.soyc}/classLevel.css" prefix="com/google/gwt/soyc/resources/"/>
+ <zipfileset file="${gwt.tools.soyc}/roundedCorners.css" prefix="com/google/gwt/soyc/resources/"/>
+@@ -334,7 +278,7 @@
+ <manifest>
+ <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+ </manifest>
+- </gwt.jar>
++ </jar>
+ </sequential>
+ </outofdate>
+ </target>
+Index: gwt-2.4.0/dev/common.ant.xml
+===================================================================
+--- gwt-2.4.0.orig/dev/common.ant.xml 2011-08-31 17:10:36.810643573 +0200
++++ gwt-2.4.0/dev/common.ant.xml 2011-08-31 17:10:39.534641229 +0200
@@ -8,15 +8,16 @@
<target name="compile" description="Compile all java files">
<mkdir dir="${javac.out}" />
@@ -149,14 +239,16 @@
<manifest>
<attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
---- a/user/build.xml
-+++ b/user/build.xml
+Index: gwt-2.4.0/user/build.xml
+===================================================================
+--- gwt-2.4.0.orig/user/build.xml 2011-08-31 17:10:36.798644884 +0200
++++ gwt-2.4.0/user/build.xml 2011-08-31 17:11:08.262141960 +0200
@@ -53,7 +53,7 @@
<property name="gwt.i18n.test.InnerClassChar" value="dollar"/>
<!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev.jar" />
-+ <property.ensure name="gwt.dev.jar" location="${target.dir}/gwt-dev-linux-${artifactVersion}.jar" />
++ <property.ensure name="gwt.dev.jar" location="${target.dir}/gwt-dev-${artifactVersion}.jar" />
<!--
Classpaths added for test cases
diff -Nru -x .svn gwt-debian/debian//patches/build-protobuf-class gwt-2.4.0/debian//patches/build-protobuf-class
--- gwt-debian/debian//patches/build-protobuf-class 1970-01-01 01:00:00.000000000 +0100
+++ gwt-2.4.0/debian//patches/build-protobuf-class 2011-08-31 16:31:07.726142573 +0200
@@ -0,0 +1,47 @@
+Index: gwt-2.4.0/dev/build.xml
+===================================================================
+--- gwt-2.4.0.orig/dev/build.xml 2011-08-31 16:30:45.098642017 +0200
++++ gwt-2.4.0/dev/build.xml 2011-08-31 16:31:05.146142066 +0200
+@@ -17,6 +17,11 @@
+ <delete failonerror="false">
+ <fileset dir="${gwt.build.lib}" includes="gwt-dev.jar"/>
+ </delete>
++
++ <!-- Restore protobuf generated file as source dist -->
++ <copy file="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java.orig"
++ tofile="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java"
++ preservelastmodified="true" failonerror="false" />
+ </target>
+
+ <target name="compile.tests" depends="build, compile.emma.if.enabled, build.alldeps.jar" description="Compiles the test code for this project">
+@@ -158,7 +163,7 @@
+ </gwt.javac>
+ </target>
+
+- <target name="compile" depends="compiler.standalone" description="Compiles this project">
++ <target name="compile" depends="compiler.standalone, generate.remotemessageproto.java" description="Compiles this project">
+ <gwt.javac srcdir="" excludes="${filter.pattern}">
+ <src path="core/src" />
+ <classpath>
+@@ -191,16 +196,16 @@
+ </target>
+
+ <target name="generate.remotemessageproto.java">
++ <!-- Backup file from source dist -->
++ <copy file="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java"
++ tofile="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java.orig"
++ preservelastmodified="true" />
++
+ <!-- Generate the java code -->
+ <exec executable="protoc" failonerror="true">
+ <arg value="--java_out=core/src"/>
+ <arg value="./core/src/com/google/gwt/dev/shell/remoteui/remotemessage.proto"/>
+ </exec>
+-
+- <!-- Rebase the java code to match the rebased protobuf library -->
+- <replace file="./core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java">
+- <replacefilter token="com.google.protobuf" value="com.google.gwt.dev.protobuf"/>
+- </replace>
+ </target>
+
+ <target name="checkstyle" description="Static analysis of source">
diff -Nru -x .svn gwt-debian/debian//patches/build-with-jdt35 gwt-2.4.0/debian//patches/build-with-jdt35
--- gwt-debian/debian//patches/build-with-jdt35 1970-01-01 01:00:00.000000000 +0100
+++ gwt-2.4.0/debian//patches/build-with-jdt35 2011-08-30 12:47:01.538642029 +0200
@@ -0,0 +1,139 @@
+Index: gwt-2.4.0/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java 2011-04-28 15:57:23.000000000 +0200
++++ gwt-2.4.0/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java 2011-08-30 12:46:52.014143804 +0200
+@@ -410,7 +410,7 @@
+ // Turn off all warnings, saves some memory / speed.
+ options.reportUnusedDeclaredThrownExceptionIncludeDocCommentReference = false;
+ options.reportUnusedDeclaredThrownExceptionExemptExceptionAndThrowable = false;
+- options.warningThreshold = 0;
++ options.suppressWarnings = true;
+ options.inlineJsrBytecode = true;
+ return options;
+ }
+Index: gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java 2010-07-29 01:37:27.000000000 +0200
++++ gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java 2011-08-30 12:46:52.014143804 +0200
+@@ -126,7 +126,7 @@
+ break;
+
+ case Binding.TYPE_PARAMETER :
+- ((TypeVariableBinding) type).resolve(environment);
++ ((TypeVariableBinding) type).resolve();
+ break;
+
+ case Binding.GENERIC_TYPE :
+@@ -595,7 +595,7 @@
+ pendingVariable = false;
+ int colon = CharOperation.indexOf(':', typeSignature, i);
+ char[] variableName = CharOperation.subarray(typeSignature, i, colon);
+- variables.add(new TypeVariableBinding(variableName, this, rank++));
++ variables.add(new TypeVariableBinding(variableName, this, rank++, this.environment));
+ }
+ }
+ }
+@@ -793,7 +793,7 @@
+ // NOTE: member types of binary types are resolved when needed
+ public TypeVariableBinding getTypeVariable(char[] variableName) {
+ TypeVariableBinding variable = super.getTypeVariable(variableName);
+- variable.resolve(this.environment);
++ variable.resolve();
+ return variable;
+ }
+ private void initializeTypeVariable(TypeVariableBinding variable, TypeVariableBinding[] existingVariables, SignatureWrapper wrapper, char[][][] missingTypeNames) {
+@@ -932,7 +932,7 @@
+ }
+ }
+ for (int i = method.typeVariables.length; --i >= 0;) {
+- method.typeVariables[i].resolve(this.environment);
++ method.typeVariables[i].resolve();
+ }
+ method.modifiers &= ~ExtraCompilerModifiers.AccUnresolved;
+ return method;
+@@ -981,7 +981,7 @@
+ return this.typeVariables;
+
+ for (int i = this.typeVariables.length; --i >= 0;)
+- this.typeVariables[i].resolve(this.environment);
++ this.typeVariables[i].resolve();
+ this.tagBits &= ~TagBits.HasUnresolvedTypeVariables;
+ return this.typeVariables;
+ }
+Index: gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java 2011-01-06 15:20:30.000000000 +0100
++++ gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java 2011-08-30 12:46:52.054141836 +0200
+@@ -736,7 +736,7 @@
+ this.declaringClass.storeAnnotations(this, annotations);
+ }
+ public void setAnnotations(AnnotationBinding[] annotations, AnnotationBinding[][] parameterAnnotations, Object defaultValue) {
+- this.declaringClass.storeAnnotationHolder(this, AnnotationHolder.storeAnnotations(annotations, parameterAnnotations, defaultValue));
++ this.declaringClass.storeAnnotationHolder(this, AnnotationHolder.storeAnnotations(annotations, parameterAnnotations, defaultValue, null));
+ }
+ public void setDefaultValue(Object defaultValue) {
+ MethodBinding originalMethod = this.original();
+@@ -851,7 +851,7 @@
+ */
+ public final char[] signature(ClassFile classFile) {
+ if (signature != null) {
+- if ((this.tagBits & TagBits.ContainsNestedTypesInSignature) != 0) {
++ if ((this.tagBits & TagBits.ContainsNestedTypeReferences) != 0) {
+ // we need to record inner classes references
+ boolean isConstructor = isConstructor();
+ TypeBinding[] targetParameters = this.parameters;
+@@ -918,7 +918,7 @@
+ for (int i = 0, count = syntheticArgumentTypes.length; i < count; i++) {
+ ReferenceBinding syntheticArgumentType = syntheticArgumentTypes[i];
+ if (syntheticArgumentType.isNestedType()) {
+- this.tagBits |= TagBits.ContainsNestedTypesInSignature;
++ this.tagBits |= TagBits.ContainsNestedTypeReferences;
+ classFile.recordInnerClasses(syntheticArgumentType);
+ }
+ buffer.append(syntheticArgumentType.signature());
+@@ -935,7 +935,7 @@
+ TypeBinding targetParameter = targetParameters[i];
+ TypeBinding leafTargetParameterType = targetParameter.leafComponentType();
+ if (leafTargetParameterType.isNestedType()) {
+- this.tagBits |= TagBits.ContainsNestedTypesInSignature;
++ this.tagBits |= TagBits.ContainsNestedTypeReferences;
+ classFile.recordInnerClasses(leafTargetParameterType);
+ }
+ buffer.append(targetParameter.signature());
+@@ -952,7 +952,7 @@
+ TypeBinding parameter = parameters[i];
+ TypeBinding leafParameterType = parameter.leafComponentType();
+ if (leafParameterType.isNestedType()) {
+- this.tagBits |= TagBits.ContainsNestedTypesInSignature;
++ this.tagBits |= TagBits.ContainsNestedTypeReferences;
+ classFile.recordInnerClasses(leafParameterType);
+ }
+ buffer.append(parameter.signature());
+@@ -962,7 +962,7 @@
+ if (this.returnType != null) {
+ TypeBinding ret = this.returnType.leafComponentType();
+ if (ret.isNestedType()) {
+- this.tagBits |= TagBits.ContainsNestedTypesInSignature;
++ this.tagBits |= TagBits.ContainsNestedTypeReferences;
+ classFile.recordInnerClasses(ret);
+ }
+ buffer.append(this.returnType.signature());
+Index: gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java 2009-10-28 17:10:53.000000000 +0100
++++ gwt-2.4.0/dev/core/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java 2011-08-30 12:46:52.054141836 +0200
+@@ -366,12 +366,12 @@
+ SyntheticMethodBinding accessMethod = null;
+ SyntheticMethodBinding[] accessors = (SyntheticMethodBinding[]) this.synthetics[SourceTypeBinding.METHOD_EMUL].get(targetField);
+ if (accessors == null) {
+- accessMethod = new SyntheticMethodBinding(targetField, isReadAccess, this);
++ accessMethod = new SyntheticMethodBinding(targetField, isReadAccess, false, this);
+ this.synthetics[SourceTypeBinding.METHOD_EMUL].put(targetField, accessors = new SyntheticMethodBinding[2]);
+ accessors[isReadAccess ? 0 : 1] = accessMethod;
+ } else {
+ if ((accessMethod = accessors[isReadAccess ? 0 : 1]) == null) {
+- accessMethod = new SyntheticMethodBinding(targetField, isReadAccess, this);
++ accessMethod = new SyntheticMethodBinding(targetField, isReadAccess, false, this);
+ accessors[isReadAccess ? 0 : 1] = accessMethod;
+ }
+ }
diff -Nru -x .svn gwt-debian/debian//patches/fix-guava-pkg-path gwt-2.4.0/debian//patches/fix-guava-pkg-path
--- gwt-debian/debian//patches/fix-guava-pkg-path 1970-01-01 01:00:00.000000000 +0100
+++ gwt-2.4.0/debian//patches/fix-guava-pkg-path 2011-08-30 13:02:02.914143814 +0200
@@ -0,0 +1,41 @@
+Index: gwt-2.4.0/dev/core/src/com/google/gwt/dev/util/StringInterner.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/com/google/gwt/dev/util/StringInterner.java 2011-08-30 12:59:53.374143581 +0200
++++ gwt-2.4.0/dev/core/src/com/google/gwt/dev/util/StringInterner.java 2011-08-30 13:00:00.254144806 +0200
+@@ -16,8 +16,8 @@
+
+ package com.google.gwt.dev.util;
+
+-import com.google.gwt.thirdparty.guava.common.collect.Interner;
+-import com.google.gwt.thirdparty.guava.common.collect.Interners;
++import com.google.common.collect.Interner;
++import com.google.common.collect.Interners;
+
+ /**
+ * A utility class for reducing String memory waste. Note that this does not use
+Index: gwt-2.4.0/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java 2011-08-30 13:00:27.398142033 +0200
++++ gwt-2.4.0/dev/core/src/com/google/gwt/dev/javac/CompilationUnitArchive.java 2011-08-30 13:00:42.010141914 +0200
+@@ -15,7 +15,7 @@
+ */
+ package com.google.gwt.dev.javac;
+
+-import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
++import com.google.common.collect.ImmutableMap;
+
+ import java.io.BufferedInputStream;
+ import java.io.BufferedOutputStream;
+Index: gwt-2.4.0/dev/core/src/com/google/gwt/dev/util/Strings.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/com/google/gwt/dev/util/Strings.java 2011-08-30 13:01:48.922145178 +0200
++++ gwt-2.4.0/dev/core/src/com/google/gwt/dev/util/Strings.java 2011-08-30 13:01:58.538142121 +0200
+@@ -15,7 +15,7 @@
+ */
+ package com.google.gwt.dev.util;
+
+-import com.google.gwt.thirdparty.guava.common.collect.Lists;
++import com.google.common.collect.Lists;
+
+ import java.util.ArrayList;
+
diff -Nru -x .svn gwt-debian/debian//patches/fix-protobuf-pkg-path gwt-2.4.0/debian//patches/fix-protobuf-pkg-path
--- gwt-debian/debian//patches/fix-protobuf-pkg-path 1970-01-01 01:00:00.000000000 +0100
+++ gwt-2.4.0/debian//patches/fix-protobuf-pkg-path 2011-08-31 15:53:38.794142132 +0200
@@ -0,0 +1,13 @@
+Index: gwt-2.4.0/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
+===================================================================
+--- gwt-2.4.0.orig/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java 2011-08-31 11:03:33.334643306 +0200
++++ gwt-2.4.0/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java 2011-08-31 11:04:27.578641364 +0200
+@@ -18,7 +18,7 @@
+ import com.google.gwt.core.ext.TreeLogger;
+ import com.google.gwt.core.ext.TreeLogger.HelpInfo;
+ import com.google.gwt.core.ext.TreeLogger.Type;
+-import com.google.gwt.dev.protobuf.ByteString;
++import com.google.protobuf.ByteString;
+ import com.google.gwt.dev.shell.remoteui.MessageTransport.RequestException;
+ import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request;
+ import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response;
diff -Nru -x .svn gwt-debian/debian//patches/series gwt-2.4.0/debian//patches/series
--- gwt-debian/debian//patches/series 2011-08-24 09:32:53.826142269 +0200
+++ gwt-2.4.0/debian//patches/series 2011-08-31 16:07:47.222642821 +0200
@@ -1,2 +1,6 @@
build.patch
+build-protobuf-class
exclude-tomcat.patch
+fix-protobuf-pkg-path
+build-with-jdt35
+fix-guava-pkg-path
