CVS eclipse/debian

[Stephan Michels]

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

Modified Files:
	changelog control.in 
Added Files:
	eclipse.install 
Removed Files:
	eclipse-sdk.install 
Log Message:
debian/control,debian/eclipse-sdk.install: Rename the package
eclipse-sdk to eclipse, and create a dummy package
for eclipse-sdk. Closes: #338733
debian/control: Remove circular dependency for eclipse-rcp to
eclipse-sdk. Closes: #339830
debian/control: Removed obsolete package eclipse-base.


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/20 11:04:22	1.33
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/20 14:11:31	1.34
@@ -13,6 +13,12 @@
     problem of the sdk feature.
   * debian/patches/eclipse-swttools.dpatch: Rebuild patch to build the swt
     tools before org.eclipse.swt.gtk.linux.ia64
+  * debian/control,debian/eclipse-sdk.install: Rename the package 
+    eclipse-sdk to eclipse, and create a dummy package 
+    for eclipse-sdk. Closes: #338733
+  * debian/control: Remove circular dependency for eclipse-rcp to 
+    eclipse-sdk. Closes: #339830
+  * debian/control: Removed obsolete package eclipse-base.
 
   [ Michael Koch ]
   * debian/control.in: Build-Depends on java-gcj-compat-dev (>= 1.0.41-2).
@@ -21,7 +27,7 @@
     mozilla-firefox. Closes: #336285.
   * debian/control.in: Uploaders: Added Stephan Michels.
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 20 Nov 2005 11:49:23 +0000
+ -- Stephan Michels <stephan at apache.org>  Sun, 20 Nov 2005 14:41:10 +0100
 
 eclipse (3.1.1-5) unstable; urgency=low
 
--- /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/20 11:04:23	1.12
+++ /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/20 14:11:31	1.13
@@ -6,22 +6,9 @@
 Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, mozilla-dev, libcairo2-dev at BUILD_DEPS@
 Standards-Version: 3.6.2
 
-Package: eclipse-base
-Architecture: all
-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
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package provides the base functionality required for all Eclipse
- packages.
-
 Package: eclipse-rcp
 Architecture: any
-Depends: eclipse-rcp-common (= ${Source-Version}), eclipse-sdk (= ${Source-Version}), libswt3.1-gtk-java (= ${Source-Version})
+Depends: eclipse-rcp-common (= ${Source-Version}), libswt3.1-gtk-java (= ${Source-Version})
 Recommends: eclipse-rcp-gcj
 Replaces: eclipse-rcp-common (<< 3.1.1)
 Description: Eclipse rich client platform
@@ -43,7 +30,6 @@
 
 Package: eclipse-rcp-common
 Architecture: all
-Pre-Depends: eclipse-base (= ${Source-Version})
 Description: Eclipse rich client platform (common files)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -110,7 +96,7 @@
 
 Package: eclipse-platform-common
 Architecture: all
-Depends: eclipse-platform (= ${Source-Version})
+Depends: eclipse-platform (= ${Source-Version}), java-gcj-compat | java1-runtime, java-common (>= 0.23), zenity
 Conflicts: eclipse-platform (<< 3.0)
 Replaces: eclipse-platform (<< 3.0)
 Description: Eclipse platform without plug-ins to develop any language (common files)
@@ -212,13 +198,6 @@
  .
  This package contains native GCJ-compiled plugins.
 
-Package: eclipse-sdk
-Architecture: all
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
-Description: Extensible Tool Platform and Java IDE
- Package to provide the whole Eclipse SDK, which includes the Java Development
- Tools and Plug-in Development Tools.
-
 Package: eclipse-source
 Architecture: any
 Depends: eclipse-platform (= ${Source-Version})
@@ -226,6 +205,33 @@
  This package provides the additional source code plug-ins used for code lookup
  (debugger, code completition) and plug-in development.
 
+Package: eclipse-sdk
+Architecture: all
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
+Description: Extensible Tool Platform and Java IDE
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ Dummy package for the transition to eclipse package
+
+Package: eclipse
+Architecture: all
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
+Conflicts: eclipse-sdk (<= 3.1.1-5)
+Replaces: eclipse-sdk (<= 3.1.1-5)
+Description: Extensible Tool Platform and Java IDE
+ The Eclipse Platform is an open and extensible platform for anything and yet
+ nothing in particular. It provides a foundation for constructing and running
+ integrated software-development tools. The Eclipse Platform allows tool
+ builders to independently develop tools that integrate with other people's
+ tools so seamlessly you can't tell where one tool ends and another starts.
+ .
+ Package to provide the whole Eclipse SDK, which includes the Java Development
+ Tools and Plug-in Development Tools.
+
 Package: libswt3.1-gtk-java
 Architecture: any
 Depends: libswt3.1-gtk-jni (= ${Source-Version}), mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7), java-common