r1921 - trunk/eclipse/debian

[Matthias Klose]

Author: doko
Date: 2006-02-17 12:25:47 +0000 (Fri, 17 Feb 2006)
New Revision: 1921

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
Log:
* debian/control.in: eclipse replaces eclipse-platform (<< 3.1.2-2).


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-17 08:51:18 UTC (rev 1920)
+++ trunk/eclipse/debian/changelog	2006-02-17 12:25:47 UTC (rev 1921)
@@ -1,13 +1,17 @@
 eclipse (3.1.2-2) UNRELEASED; urgency=low
 
+  [ Michael Koch ]
   * debian/control.in: eclipse: Added Conflicts/Replaces against
     eclipse-platform-common. Closes: #352196, #352348
   * debian/control.in: Build-Depends on bzip2 instead of unzip.
     Closes: #352726
   * control.in, eclipse-rcp-common.install, eclipse-rcp.install,
-  extra/arch-files.txt, libswt3.1-gtk-java.install: Moved
-  org.eclipse.swt plugins to eclipse-rcp package.
+    extra/arch-files.txt, libswt3.1-gtk-java.install: Moved
+    org.eclipse.swt plugins to eclipse-rcp package.
 
+  [ Matthias Klose ]
+  * debian/control.in: eclipse replaces eclipse-platform (<< 3.1.2-2).
+
  -- Michael Koch <konqueror at gmx.de>  Thu, 16 Feb 2006 08:52:25 +0000
 
 eclipse (3.1.2-1) unstable; urgency=low

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-02-17 08:51:18 UTC (rev 1920)
+++ trunk/eclipse/debian/control	2006-02-17 12:25:47 UTC (rev 1921)
@@ -220,7 +220,7 @@
 Architecture: any
 Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
-Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
+Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
 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

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2006-02-17 08:51:18 UTC (rev 1920)
+++ trunk/eclipse/debian/control.in	2006-02-17 12:25:47 UTC (rev 1921)
@@ -220,7 +220,7 @@
 Architecture: any
 Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
-Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
+Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
 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