[pkg-java] r2917 - trunk/eclipse/debian

[Matthias Klose]

Author: doko
Date: 2007-01-08 18:54:38 +0100 (Mon, 08 Jan 2007)
New Revision: 2917

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
Log:
  * libswt3.2-gtk-jni: Conflict with libswt-gnome-gtk-3.2-jni as well.
    Closes: #401570.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-01-08 17:45:57 UTC (rev 2916)
+++ trunk/eclipse/debian/changelog	2007-01-08 17:54:38 UTC (rev 2917)
@@ -1,5 +1,14 @@
+eclipse (3.2.1-5) UNRELEASED; urgency=low
+
+  [ Matthias Klose ]
+  * libswt3.2-gtk-jni: Conflict with libswt-gnome-gtk-3.2-jni as well.
+    Closes: #401570.
+
+ -- Matthias Klose <doko at debian.org>  Mon,  8 Jan 2007 18:50:11 +0100
+
 eclipse (3.2.1-4) unstable; urgency=low
 
+  [ Matthias Klose ]
   * debian/patches/eclipse-libswt-xulrunner.dpatch: Add chunks from
     eclipse-libswt-firefox.dpatch.
   * debian/rules: For the xulrunner case, apply eclipse-libswt-firefox2,

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2007-01-08 17:45:57 UTC (rev 2916)
+++ trunk/eclipse/debian/control	2007-01-08 17:54:38 UTC (rev 2917)
@@ -215,7 +215,7 @@
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-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, libswt-gtk-3.2-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, libswt-gtk-3.2-jni, libswt-gnome-gtk-3.2-jni
 Description: Platform dependent files for libswt3.2-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	2007-01-08 17:45:57 UTC (rev 2916)
+++ trunk/eclipse/debian/control.in	2007-01-08 17:54:38 UTC (rev 2917)
@@ -215,7 +215,7 @@
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-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, libswt-gtk-3.2-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, libswt-gtk-3.2-jni, libswt-gnome-gtk-3.2-jni
 Description: Platform dependent files for libswt3.2-gtk-java
  This packages includes all jni native libraries used by the gtk2
  version of swt.