[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-167-gba44b74

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master-3.6 has been updated
       via  ba44b74b0a40e9f0c184f5416b465a3b974a3d3c (commit)
      from  952b828402c054f67f9c5b942e85be07599e8fa8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ba44b74b0a40e9f0c184f5416b465a3b974a3d3c
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Aug 17 14:34:22 2010 +0200

    Cleanup with wrap-and-sort
    
    Git-Dch: ignore

-----------------------------------------------------------------------

Summary of changes:
 debian/control   |   19 +++++++++----------
 debian/copyright |    1 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 812a2bf..1d8319e 100644
--- a/debian/control
+++ b/debian/control
@@ -142,10 +142,10 @@ Replaces: eclipse-jdt (<< 3.5.1+repack~3),
           eclipse-source (<= 3.1.1-3),
           libeclipse-jni
 Breaks: eclipse-source (<= 3.1.1-3)
-Conflicts: eclipse-platform-common,
-           libeclipse-jni,
+Conflicts: eclipse-common-nls,
+           eclipse-platform-common,
            eclipse-platform-nls,
-           eclipse-common-nls
+           libeclipse-jni
 Suggests: eclipse-jdt
 Description: Eclipse platform without plug-ins to develop any language
  The Eclipse Platform is an open and extensible platform for anything and yet
@@ -210,17 +210,17 @@ Architecture: any
 Depends: default-jre | java5-runtime | java6-runtime,
          libequinox-osgi-java (= ${source:Version}),
          libicu4j-4.2-java (>= 4.2),
-         ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Suggests: eclipse
 Replaces: eclipse-rcp-gcj,
-          libswt3.2-gtk-java,
-          libswt3.2-gtk-gcj,
-          libswt3.2-gtk-jni,
           libswt-gtk-3.4-java,
           libswt-gtk-3.4-jni,
-          libswt-gtk-3.5-jni (<< 3.5.1+repack)
+          libswt-gtk-3.5-jni (<< 3.5.1+repack),
+          libswt3.2-gtk-gcj,
+          libswt3.2-gtk-java,
+          libswt3.2-gtk-jni
 Description: Eclipse Rich Client Platform (RCP)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -255,4 +255,3 @@ Description: Equinox OSGi framework
  .
  This package includes only the Eclipse Equinox OSGi framework, which can
  be used outside Eclipse.
-
diff --git a/debian/copyright b/debian/copyright
index 0cc7581..e8f5490 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1060,4 +1060,3 @@ License: MPL-v1.1
       the notices in the Source Code files of the Original Code. You should
       use the text of this Exhibit A rather than the text found in the
       Original Code Source Code for Your Modifications.]
- 


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.