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

[Michael Koch]

Author: mkoch
Date: 2007-02-21 07:21:33 +0100 (Wed, 21 Feb 2007)
New Revision: 3014

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
Log:
* debian/control.in: libswt3.2-gtk-java: Conflicts with libswt-gtk-3.2-java
  (<< 3.2.1-5). Closes: #407384.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-02-19 19:34:09 UTC (rev 3013)
+++ trunk/eclipse/debian/changelog	2007-02-21 06:21:33 UTC (rev 3014)
@@ -1,12 +1,16 @@
-eclipse (3.2.1-5) UNRELEASED; urgency=low
+eclipse (3.2.1-5) unstable; urgency=low
 
   [ Matthias Klose ]
   * libswt3.2-gtk-jni: Conflict with libswt-gnome-gtk-3.2-jni as well.
     Closes: #401570.
   * debian/patches/eclipse-ecj-gcj.dpatch: New, same as in ecj-bootstrap.
 
- -- Matthias Klose <doko at debian.org>  Mon,  8 Jan 2007 18:50:11 +0100
+  [ Michael Koch ]
+  * debian/control.in: libswt3.2-gtk-java: Conflicts with libswt-gtk-3.2-java
+    (<< 3.2.1-5). Closes: #407384.
 
+ -- Michael Koch <konqueror at gmx.de>  Sun, 28 Jan 2007 12:30:36 +0100
+
 eclipse (3.2.1-4) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2007-02-19 19:34:09 UTC (rev 3013)
+++ trunk/eclipse/debian/control	2007-02-21 06:21:33 UTC (rev 3014)
@@ -190,7 +190,7 @@
 Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
 Recommends: libswt3.2-gtk-gcj, ${shlibs:Depends}
 Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
-Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java
+Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
 Description: Fast and rich GUI toolkit for Java, gtk2 version
  SWT (Standard Widget Toolkit) provides functionality similar to
  Swing, but is much faster and open source. Mainly, it is used
@@ -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, libswt-gnome-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 (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)
 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-02-19 19:34:09 UTC (rev 3013)
+++ trunk/eclipse/debian/control.in	2007-02-21 06:21:33 UTC (rev 3014)
@@ -190,7 +190,7 @@
 Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
 Recommends: libswt3.2-gtk-gcj, @MOZILLA_DEP@
 Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
-Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java
+Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
 Description: Fast and rich GUI toolkit for Java, gtk2 version
  SWT (Standard Widget Toolkit) provides functionality similar to
  Swing, but is much faster and open source. Mainly, it is used
@@ -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, libswt-gnome-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 (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)
 Description: Platform dependent files for libswt3.2-gtk-java
  This packages includes all jni native libraries used by the gtk2
  version of swt.