r2121 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-05-17 06:12:35 +0000 (Wed, 17 May 2006)
New Revision: 2121

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
Log:
* debian/control.in: libswt3.1-gtk-jni: Conflict with
  libswt-gnome-gtk-3.1-jni and libswt-mozilla-gtk-3.1-jni Closes: #361692


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-05-16 19:29:25 UTC (rev 2120)
+++ trunk/eclipse/debian/changelog	2006-05-17 06:12:35 UTC (rev 2121)
@@ -15,6 +15,8 @@
   * debian/control.in: eclipse-source: Fixed typo in description.
     Closes: #363379
   * debian/rules: Build the newest compiler. Closes: #356028
+  * debian/control.in: libswt3.1-gtk-jni: Conflict with
+    libswt-gnome-gtk-3.1-jni and libswt-mozilla-gtk-3.1-jni Closes: #361692
 
   [ Matthias Klose ]
   * debian/control.in: eclipse replaces eclipse-platform (<< 3.1.2-2).
@@ -31,7 +33,7 @@
   * Merge from Ubuntu:
     - Build using gij-4.1/gcj-4.1.
 
- -- Michael Koch <konqueror at gmx.de>  Tue, 16 May 2006 18:59:00 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed, 17 May 2006 06:10:24 +0000
 
 eclipse (3.1.2-1) unstable; urgency=low
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-05-16 19:29:25 UTC (rev 2120)
+++ trunk/eclipse/debian/control	2006-05-17 06:12:35 UTC (rev 2121)
@@ -260,7 +260,7 @@
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
-Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni
+Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni
 Description: Platform dependent files for libswt3.1-gtk-java
  This packages includes all jni native libraries used by the gtk2
  version of swt.

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2006-05-16 19:29:25 UTC (rev 2120)
+++ trunk/eclipse/debian/control.in	2006-05-17 06:12:35 UTC (rev 2121)
@@ -260,7 +260,7 @@
 Architecture: any
 Depends: libswt3.1-gtk-java (= ${Source-Version}), ${shlibs:Depends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
-Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni
+Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni
 Description: Platform dependent files for libswt3.1-gtk-java
  This packages includes all jni native libraries used by the gtk2
  version of swt.