[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-17-gd408265

2012-03-11 Thread Jakub Adam 
The following commit has been merged in the master branch:
commit 1ebf02518fb3cb5c8ba71c1ceeff366fb4591aba
Author: Jakub Adam jakub.a...@ktknet.cz
Date:   Sun Mar 11 13:09:49 2012 +0100

Disable failing swt patches from eclipse-build

These are harmless as SWT is not built, but resulting build log
with many patch failures might look scary to someone so disabling them.

diff --git a/debian/patches/use-distribution-swt.patch 
b/debian/patches/use-distribution-swt.patch
index 2ce9824..eb126ad 100644
--- a/debian/patches/use-distribution-swt.patch
+++ b/debian/patches/use-distribution-swt.patch
@@ -3,16 +3,16 @@ Date: Sat, 14 Jan 2012 21:02:09 +0100
 Subject: use-distribution-swt
 
 ---
- build.xml  |8 ++-
+ build.xml  |   14 +++--
  dependencies.properties|1 +
  .../org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF |   21 
  eclipse/features/org.eclipse.rcp/feature.xml   |   55 
  pdebuild.xml   |7 +--
- 5 files changed, 30 insertions(+), 62 deletions(-)
+ 5 files changed, 33 insertions(+), 65 deletions(-)
  create mode 100644 
dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
 
 diff --git a/build.xml b/build.xml
-index f5e468f..e5633ea 100644
+index f5e468f..9aa207c 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -171,6 +171,11 @@
@@ -27,6 +27,23 @@ index f5e468f..e5633ea 100644
/target
  
available file=${basedir}/eclipse-build-feature 
property=buildFeaturePresent value=true /
+@@ -304,13 +309,13 @@
+ 
+   target name=applyPatches depends=insertBuildId 
unless=patch.complete
+   !-- eclipse-build-only patches --
+-  patch 
patchfile=${basedir}/patches/eclipse-buildswtnatives.patch 
dir=${buildDirectory} strip=1 /
++  !--patch 
patchfile=${basedir}/patches/eclipse-buildswtnatives.patch 
dir=${buildDirectory} strip=1 /--
+   !--
+   patch 
patchfile=${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch 
dir=${buildDirectory} strip=1 /
+   --
+-  patch 
patchfile=${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch 
dir=${buildDirectory} strip=1 /
++  !--patch 
patchfile=${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch 
dir=${buildDirectory} strip=1 /--
+   patch 
patchfile=${basedir}/patches/eclipse-add-archs-filesystem.patch 
dir=${buildDirectory} strip=1 /
+-  patch 
patchfile=${basedir}/patches/eclipse-add-archs-swt.patch 
dir=${buildDirectory} strip=1 /
++  !--patch 
patchfile=${basedir}/patches/eclipse-add-archs-swt.patch 
dir=${buildDirectory} strip=1 /--
+   patch 
patchfile=${basedir}/patches/eclipse-add-archs-executable.patch 
dir=${buildDirectory} strip=1 /
+   patch 
patchfile=${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch 
dir=${buildDirectory} strip=1 /
+   patch 
patchfile=${basedir}/patches/donotstorebuildlogsinfiles.patch 
dir=${buildDirectory} strip=1 /
 @@ -320,7 +325,7 @@
patch patchfile=${basedir}/patches/eclipse-no-jetty5.patch 
dir=${buildDirectory} strip=1 /
patch 
patchfile=${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch 
dir=${buildDirectory} strip=1 /
@@ -84,7 +101,7 @@ index 000..272d0e7
 +
 +
 diff --git a/eclipse/features/org.eclipse.rcp/feature.xml 
b/eclipse/features/org.eclipse.rcp/feature.xml
-index 2f15286..beaeca1 100644
+index 4c2bd75..79130fd 100644
 --- a/eclipse/features/org.eclipse.rcp/feature.xml
 +++ b/eclipse/features/org.eclipse.rcp/feature.xml
 @@ -208,39 +208,6 @@
@@ -188,4 +205,3 @@ index 431eaf6..976af90 100644
unzip dest=bootstrap/plugins
fileset dir=bootstrap/plugins
include name=**/*.zip /
--- 

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

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7.1-1-17-gd408265

2012-03-11 Thread Jakub Adam 
The following commit has been merged in the master branch:
commit d408265428a33f310c65d76a2cad1d310275965d
Author: Jakub Adam jakub.a...@ktknet.cz
Date:   Sun Mar 11 13:53:05 2012 +0100

Update package synopsis and extended descriptions

diff --git a/debian/changelog b/debian/changelog
index b077489..b8434ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ eclipse (3.7.2-1) UNRELEASED; urgency=low
   * Use SWT from swt-gtk package instead of the bundled version
 (Closes: #538808).
   * Add org.eclipse.equinox.log to eclipse-rcp.
-  * Make extended description of eclipse binary package more accurate
-(Closes: #655945).
+  * Update package synopsis and extended descriptions
+(Closes: #655945, #655946).
   * Bump Standards-Version to 3.9.3 (no changes required).
   * Fix broken installaton after some package Eclipse core platform
 depends on is upgraded (Closes: #662153, #663335).
diff --git a/debian/control b/debian/control
index c77e2a4..2281eca 100644
--- a/debian/control
+++ b/debian/control
@@ -81,13 +81,9 @@ Description: Eclipse Java Development Tools (JDT)
  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 only the Java Development Tools, which are plug-ins to
- develop Java applications within Eclipse. It includes a complete and powerful
- Java IDE along with several editors, a refactoring engine, Ant and JUnit
- integration, debugger, and many more features.
- .
- Please note that many plugins will fail to install if you don't have the
- eclipse-pde package installed.
+ This package provides Java Development Tools, a complete and powerful Java IDE
+ along with several editors, a refactoring engine, Ant and JUnit integration,
+ debugger, and many more features.
 
 Package: eclipse-pde
 Architecture: any
@@ -106,9 +102,6 @@ Description: Eclipse Plug-in Development Environment (PDE)
  tools so seamlessly you can't tell where one tool ends and another starts.
  .
  This package provides tools for easy development of plug-ins for Eclipse.
- .
- Please note that many plugins will fail to install if you don't have the
- eclipse-pde package installed.
 
 Package: eclipse-platform
 Architecture: any
@@ -145,23 +138,20 @@ Conflicts: eclipse-common-nls,
eclipse-platform-nls,
libeclipse-jni
 Suggests: eclipse-jdt
-Description: Eclipse platform without plug-ins to develop any language
+Description: Eclipse platform without development plug-ins
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
  integrated software-development tools. The Eclipse Platform allows tool
  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 only the Eclipse Platform. It does not include any
- development plug-ins. These are available in different packages:
+ 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:
  .
   * eclipse-jdt Java Development Tools
   * eclipse-pde Plug-in Development Tools
-  * eclipse Complete development environment
- .
- This package is the base for all eclipse plug-ins. Please note that many
- plugins will fail to install if you don't have the eclipse-pde package
- installed.
+  * eclipse-cdt C/C++ Development Tools
 
 Package: eclipse-platform-data
 Architecture: all
@@ -171,26 +161,23 @@ Replaces: eclipse ( 3.5.2),
   eclipse-platform-gcj,
   eclipse-plugin-cvs
 Breaks: eclipse-plugin-cvs
-Description: Eclipse platform without plug-ins to develop any language (data)
+Description: Eclipse platform without development plug-ins (data)
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
  integrated software-development tools. The Eclipse Platform allows tool
  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 only the Eclipse Platform. It does not include any
- development plug-ins. These are available in different packages:
+ This package provides the Eclipse Platform and is the base for all eclipse
+ plug-ins, but it does not include any development plug-ins except CVS support
+ for source code management. Other plugins are available in different packages,
+ for example:
  .
   * eclipse-jdt Java Development Tools
   * eclipse-pde Plug-in Development Tools
-  * eclipse Complete development environment
- .
- This package is the base for all eclipse plug-ins.
+  * eclipse-cdt C/C++ Development Tools