[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-31-gafa171a

Jakub Adam jakub.adam at ktknet.cz
Mon May 7 12:21:40 UTC 2012


The following commit has been merged in the master-3.8 branch:
commit afa171a7df07442f077fac276801d621d37b00bd
Merge: f947ab68a8ab313185410accd6f54dba28593783 e4b7e366a40369ff09287cca44e52eb1384b162c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon May 7 14:11:27 2012 +0200

    Merge branch 'master' into master-3.8

diff --combined debian/changelog
index 2843e0e,78a4490..55289d4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,12 @@@
 -eclipse (3.7.2-2) UNRELEASED; urgency=low
 +eclipse (3.8.0~I20120502-2000-1) UNRELEASED; urgency=low
  
 +  * New upstream release.
    * Fix generation of Eclipse Help search index (Closes: #669000).
    * Remove Gnome libraries from Build-Depends.
+   * Improve extended descriptions of binary packages and fix grammar
+     errors (Closes: #664704, #664708).
  
 - -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 17 Apr 2012 19:04:43 +0200
 + -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 24 Mar 2012 20:13:55 +0100
  
  eclipse (3.7.2-1) unstable; urgency=low
  
diff --combined debian/control
index 2876a51,9dbe10a..5d2c830
--- a/debian/control
+++ b/debian/control
@@@ -16,18 -16,19 +16,18 @@@ Build-Depends: ant (>= 1.8.2)
                 junit4 (>= 4.7-3),
                 libasm3-java (>= 3.3),
                 libcommons-codec-java (>= 1.4-2),
 -               libcommons-el-java (>= 1.0-5),
                 libcommons-httpclient-java (>= 3.1-9),
                 libcommons-logging-java (>= 1.1.1-6),
                 libgtk2.0-dev,
                 libhamcrest-java (>= 1.1-8~),
                 libicu4j-4.4-java (>= 4.4.2.2),
                 libjasper-java (>= 5.5.33-2),
 -               libjetty-java (>= 6.1.24-4~),
 +               libjetty8-java,
                 libjsch-java (>= 0.1.37-3),
                 liblucene2-java (>= 2.9.4+ds1-3~),
                 liblucene2-java (<< 2.9.5),
 -               libservlet2.5-java (>= 6.0.20-8),
 -               libswt-gtk-3-java (>= 3.7.1-2),
 +               libservlet3.0-java,
 +               libswt-gtk-3-java (>= 3.8.0~m6),
                 lsb-release,
                 maven-ant-helper,
                 maven-repo-helper,
@@@ -37,6 -38,7 +37,6 @@@
                 sat4j (<< 2.4.0),
                 unzip,
                 zip
 -Build-Conflicts: xulrunner-dev
  Standards-Version: 3.9.3
  DM-Upload-Allowed: yes
  Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git
@@@ -60,7 -62,7 +60,7 @@@ Description: Extensible Tool Platform a
   and both user and programmer documentation.
  
  Package: eclipse-jdt
 -Architecture: any
 +Architecture: all
  Depends: default-jre | java5-runtime | java6-runtime,
           eclipse-platform (>= ${source:Version}),
           junit (>= 3.8.2-4),
@@@ -82,7 -84,7 +82,7 @@@ Description: Eclipse Java Development T
   debugger, and many more features.
  
  Package: eclipse-pde
 -Architecture: any
 +Architecture: all
  Depends: default-jre | java5-runtime | java6-runtime,
           eclipse-jdt (= ${binary:Version}),
           eclipse-platform (>= ${source:Version}),
@@@ -141,9 -143,9 +141,9 @@@ Description: Eclipse platform without d
   builders to independently develop tools that integrate with other people's
   tools so seamlessly you can't tell where one tool ends and another starts.
   .
-  This package provides the Eclipse Platform and is the base for all eclipse
-  plug-ins, but it does not include any development plug-ins. These are available
-  in different packages, for example:
+  This package provides the Eclipse Platform and is the base for all Eclipse
+  development plug-ins, but it does not include any. These are available in
+  different packages, for example:
   .
    * eclipse-jdt Java Development Tools
    * eclipse-pde Plug-in Development Tools
@@@ -203,8 -205,8 +203,8 @@@ Description: Eclipse Rich Client Platfo
   builders to independently develop tools that integrate with other people's
   tools so seamlessly you can't tell where one tool ends and another starts.
   .
-  This package includes Eclipse Rich Client Platform (RCP), which is the basis
-  upon other Eclipse-based applications are built.
+  This package includes the Eclipse Rich Client Platform (RCP), the basis upon
+  which Eclipse RCP applications are built.
  
  Package: libequinox-osgi-java
  Architecture: all

-- 
eclipse - Powerful IDE written in java - Debian package.



More information about the pkg-java-commits mailing list