CVS eclipse/debian

[Stephan Michels]

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

Modified Files:
	changelog control.in 
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/changelog	2005/11/08 23:17:33	1.22
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/09 12:34:40	1.23
@@ -1,14 +1,3 @@
-eclipse (3.1.1-5) unstable; urgency=low
-
-  * debian/patches/eclipse-javadoc-bootclasspath.dpatch: Add patch to fix 
-    problem with missing bootclasspath property within the eclipse build scripts
-    https://bugs.eclipse.org/bugs/show_bug.cgi?id=115401
-  * debian/patches/eclipse-gjdoc-reflection.dpatch: Add patch to use the 
-    reflection option for gjdoc, to fix problem with the classpath option
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23917
-
- -- Stephan Michels <stephan at apache.org>  Tue,  8 Nov 2005 22:19:01 +0100
-
 eclipse (3.1.1-4) unstable; urgency=low
 
   [ Stephan Michels ]
@@ -41,6 +30,14 @@
     "any". Closes: #336316,#336338,#336389. Ubuntu #17580
   * debian/extra/eclipse.sh: Print help message for -h and --help.
     Removed the special handling for the workspace location. Closes: #337564
+  * debian/patches/eclipse-javadoc-bootclasspath.dpatch: Add patch to fix
+    problem with missing bootclasspath property within the eclipse build scripts
+    https://bugs.eclipse.org/bugs/show_bug.cgi?id=115401
+  * debian/patches/eclipse-gjdoc-reflection.dpatch: Add patch to use the
+    reflection option for gjdoc, to fix problem with the classpath option
+    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23917
+  * debian/control: Add eclipse-source <= 3.1.1-3 to the conflicts/replaces
+    of eclipse-platform, because of problems with /usr/lib/eclipse/features
 
   [ Michael Koch ]
   * debian/extra/java_home: Removed support for sablevm and fjsdk for now.
@@ -55,7 +52,7 @@
   * debian/control.in: libswt3.1-gtk-java: Made it an Architecture: any
     package.
 
- -- Michael Koch <konqueror at gmx.de>  Sun,  6 Nov 2005 17:55:14 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed,  9 Nov 2005 10:42:57 +0100
 
 eclipse (3.1.1-3) unstable; urgency=low
 
--- /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/06 19:13:48	1.5
+++ /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/09 12:34:40	1.6
@@ -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), @TOMCAT_DEP@
 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