r1918 - in trunk/eclipse/debian: . extra

[Michael Koch]

Author: mkoch
Date: 2006-02-16 07:48:05 +0000 (Thu, 16 Feb 2006)
New Revision: 1918

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/eclipse-rcp-common.install
   trunk/eclipse/debian/eclipse-rcp.install
   trunk/eclipse/debian/extra/arch-files.txt
   trunk/eclipse/debian/libswt3.1-gtk-java.install
Log:
* 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.
* Fixed typo in last commit.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/changelog	2006-02-16 07:48:05 UTC (rev 1918)
@@ -4,8 +4,11 @@
     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.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 15 Feb 2006 13:16:38 +0000
+ -- 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-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/control	2006-02-16 07:48:05 UTC (rev 1918)
@@ -10,7 +10,8 @@
 Architecture: any
 Depends: eclipse-rcp-common (= ${Source-Version}), libswt3.1-gtk-java (= ${Source-Version})
 Recommends: eclipse-rcp-gcj
-Replaces: eclipse-rcp-common (<< 3.1.1)
+Conflicts: eclipse-rcp-comon (<< 3.1.1), libswt3.1-gtk-java (<= 3.1.2-1)
+Replaces: eclipse-rcp-common (<< 3.1.1), libswt3.1-gtk-java (<= 3.1.2-1)
 Description: Eclipse rich client platform
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -219,8 +220,8 @@
 Package: eclipse
 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)
+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)
 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-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/control.in	2006-02-16 07:48:05 UTC (rev 1918)
@@ -10,7 +10,8 @@
 Architecture: any
 Depends: eclipse-rcp-common (= ${Source-Version}), libswt3.1-gtk-java (= ${Source-Version})
 Recommends: eclipse-rcp-gcj
-Replaces: eclipse-rcp-common (<< 3.1.1)
+Conflicts: eclipse-rcp-comon (<< 3.1.1), libswt3.1-gtk-java (<= 3.1.2-1)
+Replaces: eclipse-rcp-common (<< 3.1.1), libswt3.1-gtk-java (<= 3.1.2-1)
 Description: Eclipse rich client platform
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -219,8 +220,8 @@
 Package: eclipse
 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)
+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)
 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/eclipse-rcp-common.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-common.install	2006-02-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/eclipse-rcp-common.install	2006-02-16 07:48:05 UTC (rev 1918)
@@ -6,7 +6,6 @@
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.core.runtime_*.jar
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.osgi_*.jar
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.help_*.jar
-debian/tmp/usr/share/eclipse/plugins/org.eclipse.swt_*.jar
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.jface_*.jar
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.ui_*.jar
 debian/tmp/usr/share/eclipse/plugins/org.eclipse.ui.workbench_*.jar

Modified: trunk/eclipse/debian/eclipse-rcp.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp.install	2006-02-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/eclipse-rcp.install	2006-02-16 07:48:05 UTC (rev 1918)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt*

Modified: trunk/eclipse/debian/extra/arch-files.txt
===================================================================
--- trunk/eclipse/debian/extra/arch-files.txt	2006-02-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/extra/arch-files.txt	2006-02-16 07:48:05 UTC (rev 1918)
@@ -1,4 +1,4 @@
 eclipse
 plugins/org.eclipse.core.resources.linux_*
 plugins/org.eclipse.update.core.linux_*
-plugins/org.eclipse.swt.gtk.linux.*
+plugins/org.eclipse.swt*

Modified: trunk/eclipse/debian/libswt3.1-gtk-java.install
===================================================================
--- trunk/eclipse/debian/libswt3.1-gtk-java.install	2006-02-16 07:15:03 UTC (rev 1917)
+++ trunk/eclipse/debian/libswt3.1-gtk-java.install	2006-02-16 07:48:05 UTC (rev 1918)
@@ -1,2 +1 @@
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt*
 debian/tmp/usr/lib/java/*.jar