CVS eclipse/debian

[Michael Koch]

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

Modified Files:
	control 
Log Message:
Moved the changes about debian/patches/eclipse-javadoc-bootclasspath.dpatch
and debian/patches/eclipse-gjdoc-reflection.dpatch to 3.1.1-4.
debian/control: Add eclipse-source <= 3.1.1-3 to the conflicts/replaces
of eclipse-platform, because of problems with /usr/lib/eclipse/features


--- /cvsroot/pkg-java/eclipse/debian/control	2005/11/06 19:13:47	1.6
+++ /cvsroot/pkg-java/eclipse/debian/control	2005/11/09 17:40:40	1.7
@@ -89,8 +89,8 @@
 Architecture: any
 Depends: eclipse-platform-common, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.16), libtomcat5-java
 Recommends: eclipse-platform-gcj, java-gcj-compat, eclipse-sdk
-Replaces: libeclipse-jni
-Conflicts: libeclipse-jni
+Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3)
+Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3)
 Suggests: eclipse-jdt, eclipse-pde
 Description: Eclipse platform without plug-ins to develop any language
  The Eclipse Platform is an open and extensible platform for anything and yet