CVS eclipse/debian

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv27859

Modified Files:
	changelog control control.in rules 
Log Message:
Merged changes from Matthias Klose for 3.1.1-5 :
Remove gij-4.0 dependency from eclipse-base.
Build using tomcat5 on Ubuntu as well.


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/09 12:34:40	1.23
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/10 15:16:38	1.24
@@ -1,3 +1,10 @@
+eclipse (3.1.1-5) unstable; urgency=low
+
+  * Remove gij-4.0 dependency from eclipse-base.
+  * Build using tomcat5 on Ubuntu as well.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 10 Nov 2005 09:00:42 +0200
+
 eclipse (3.1.1-4) unstable; urgency=low
 
   [ Stephan Michels ]
@@ -44,7 +51,7 @@
     Closes: #336470.
   * debian/control: eclipse-jdt-common: Conflicts and Replaces
     eclipse-jdt << 3.0. Closes: #336273.
-  * debian/control: eclipse-platform-common: Conflits and Replaces
+  * debian/control: eclipse-platform-common: Conflicts and Replaces
     eclipse-platform << 3.0. Closes: #336307.
   * debian/rules: Added support to build for s390 architecture.
   * debian/eclipse-rcp.install, debian/libswt3.1-gtk-java.install, debian/rules:
--- /cvsroot/pkg-java/eclipse/debian/control	2005/11/09 17:40:40	1.7
+++ /cvsroot/pkg-java/eclipse/debian/control	2005/11/10 15:16:39	1.8
@@ -8,7 +8,7 @@
 
 Package: eclipse-base
 Architecture: all
-Depends: gij-4.0, java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
+Depends: java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
 Description: Eclipse distribution base
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
--- /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/09 12:34:40	1.6
+++ /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/10 15:16:39	1.7
@@ -8,7 +8,7 @@
 
 Package: eclipse-base
 Architecture: all
-Depends: gij-4.0, java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
+Depends: java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
 Description: Eclipse distribution base
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/11/08 23:17:33	1.14
+++ /cvsroot/pkg-java/eclipse/debian/rules	2005/11/10 15:16:39	1.15
@@ -64,13 +64,13 @@
 ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/ecj.jar
 ANT_CLASS=org.apache.tools.ant.Main
 ANT_OPTS=-DjavacFailOnError=true -DjavacVerbose=false -DjavacSource=1.3 -DjavacTarget=1.3 -Dbootclasspath=
-ifneq ($(DISTRIBUTION),Ubuntu)
-  ANT_DEP := ant-optional (>= 1.6.5-3)
-  BUILD_DEPS += , ant-optional (>= 1.6.5-3)
-else
-  ANT_DEP := ant (>= 1.6.5)
-  BUILD_DEPS += , ant (>= 1.6.5)
-endif
+ANT_DEP := ant-optional (>= 1.6.5-3)
+BUILD_DEPS += , ant-optional (>= 1.6.5-3)
+
+#ifeq ($(DISTRIBUTION),Ubuntu)
+#  ANT_DEP := ant (>= 1.6.5)
+#  BUILD_DEPS += , ant (>= 1.6.5)
+#endif
 
 # Generic VM compilation.
 JVM_CLASSPATH=
@@ -101,9 +101,9 @@
 EXTRA=$(CURDIR)/debian/extra
 
 with_tomcat := yes
-ifeq ($(DISTRIBUTION),Ubuntu)
-  with_tomcat := disabled
-endif
+#ifeq ($(DISTRIBUTION),Ubuntu)
+#  with_tomcat := disabled
+#endif
 ifeq ($(with_tomcat),yes)
   TOMCAT_DEP = libtomcat5-java
   BUILD_DEPS += , libtomcat5-java