r1914 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-02-15 13:08:30 +0000 (Wed, 15 Feb 2006)
New Revision: 1914

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
Log:
* 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


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-15 09:41:03 UTC (rev 1913)
+++ trunk/eclipse/debian/changelog	2006-02-15 13:08:30 UTC (rev 1914)
@@ -1,8 +1,11 @@
 eclipse (3.1.2-2) UNRELEASED; urgency=low
 
-  * Nothing changed yet.
+  * 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
 
- -- Michael Koch <konqueror at gmx.de>  Thu,  9 Feb 2006 13:24:09 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed, 15 Feb 2006 13:16:38 +0000
 
 eclipse (3.1.2-1) unstable; urgency=low
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-02-15 09:41:03 UTC (rev 1913)
+++ trunk/eclipse/debian/control	2006-02-15 13:08:30 UTC (rev 1914)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5-java, mozilla-dev
 Standards-Version: 3.6.2
 
 Package: eclipse-rcp
@@ -219,8 +219,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)
-Replaces: eclipse-sdk (<= 3.1.1-5)
+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-15 09:41:03 UTC (rev 1913)
+++ trunk/eclipse/debian/control.in	2006-02-15 13:08:30 UTC (rev 1914)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, unzip, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.41-2), gcj (>= 4:4.0), ecj-bootstrap, liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.19), libjsch-java (<< 0.1.20), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, gjdoc (>= 0.7.7), classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
 Standards-Version: 3.6.2
 
 Package: eclipse-rcp
@@ -219,8 +219,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)
-Replaces: eclipse-sdk (<= 3.1.1-5)
+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