[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-4

Sat Aug 20 08:51:00 UTC 2011

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 has been updated
       via  2dd49c646f568269512c9c5d8002d2554a2304a1 (commit)
       via  ffeb49d679ab00882d784394586cb98804bc7dd4 (commit)
       via  0cb6ca78e5f9c6f5904f202142687194986bee71 (commit)
      from  9ea784400b6b9d6c58e5343398f7f0e958b714f0 (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 2dd49c646f568269512c9c5d8002d2554a2304a1
Author: Jimmy Kaplowitz <jimmy at debian.org>
Date:   Sat Aug 20 04:15:45 2011 -0400

    Release to experimental

commit ffeb49d679ab00882d784394586cb98804bc7dd4
Author: Jimmy Kaplowitz <jimmy at debian.org>
Date:   Sat Aug 20 02:31:15 2011 -0400

    Fold eclipse-plugin-cvs into eclipse-platform-data

commit 0cb6ca78e5f9c6f5904f202142687194986bee71
Author: Jimmy Kaplowitz <jimmy at debian.org>
Date:   Fri Aug 19 05:41:09 2011 -0400

    Uncommented org.eclipse.equinox.concurrent line in eclipse-platform-data.install

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

Summary of changes:
 debian/changelog                             |   10 ++++++++++
 debian/control                               |   19 ++++---------------
 debian/eclipse-platform-data.install         |    8 +++++++-
 debian/eclipse-plugin-cvs.install            |    6 ------
 debian/eclipse-plugins-cvs.lintian-overrides |    2 --
 debian/rules                                 |    3 +--
 6 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5a6975..4a6b3f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+eclipse (3.7~exp-4) experimental; urgency=low
+
+  * We need to install org.eclipse.equinox.concurrent in eclipse-
+    platform-data in order for many features to work
+  * Merge eclipse-plugin-cvs into eclipse-platform-data, updating
+    package description accordingly. Added unversioned Replaces and
+    Breaks.
+
+ -- Jimmy Kaplowitz <jimmy at debian.org>  Sat, 20 Aug 2011 04:15:10 -0400
+
 eclipse (3.7~exp-3) experimental; urgency=low
 
   * Re-added main lucene bundle to eclipse-platform
diff --git a/debian/control b/debian/control
index f307418..84fd2d3 100644
--- a/debian/control
+++ b/debian/control
@@ -176,7 +176,9 @@ Architecture: all
 Depends: ${misc:Depends}
 Replaces: eclipse (<< 3.5.2),
           eclipse-platform (<< 3.5.2-4),
-          eclipse-platform-gcj
+          eclipse-platform-gcj,
+          eclipse-plugin-cvs
+Breaks: eclipse-plugin-cvs
 Description: Eclipse platform without plug-ins to develop any language (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
@@ -194,21 +196,8 @@ Description: Eclipse platform without plug-ins to develop any language (data)
  This package is the base for all eclipse plug-ins.
  .
  This package contains the architecture-independent data files.
-
-Package: eclipse-plugin-cvs
-Architecture: all
-Depends: default-jre | java5-runtime | java6-runtime,
-         eclipse-platform (>= ${source:Version}),
-         ${misc:Depends}
-Replaces: eclipse-cvs
-Description: Eclipse Team Integration (CVS support)
- 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 CVS support for Source Code Management to the
+ This package also provides CVS support for Source Code Management to the
  Eclipse Team Integration component.
 
 Package: eclipse-rcp
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 9713ae7..76f191f 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -1,3 +1,4 @@
+usr/lib/eclipse/features/org.eclipse.cvs_*
 usr/lib/eclipse/plugins/org.eclipse.compare.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.compare_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.boot_*.jar
@@ -8,6 +9,7 @@ usr/lib/eclipse/plugins/org.eclipse.core.net_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_*
 usr/lib/eclipse/plugins/org.eclipse.core.runtime.compatibility_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.variables_*.jar
+usr/lib/eclipse/plugins/org.eclipse.cvs_*.jar
 usr/lib/eclipse/plugins/org.eclipse.debug.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.debug.ui_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ecf.filetransfer_*.jar
@@ -18,7 +20,7 @@ usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ecf.provider.filetransfer_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ecf.ssl_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ecf_*.jar
-#usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent_*.jar
+usr/lib/eclipse/plugins/org.eclipse.equinox.concurrent_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.event_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin.equinox_*.jar
 usr/lib/eclipse/plugins/org.eclipse.equinox.frameworkadmin_*.jar
@@ -64,6 +66,9 @@ usr/lib/eclipse/plugins/org.eclipse.ltk.ui.refactoring_*.jar
 usr/lib/eclipse/plugins/org.eclipse.platform_*
 usr/lib/eclipse/plugins/org.eclipse.search_*.jar
 usr/lib/eclipse/plugins/org.eclipse.team.core_*.jar
+usr/lib/eclipse/plugins/org.eclipse.team.cvs.core_*.jar
+usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh2_*.jar
+usr/lib/eclipse/plugins/org.eclipse.team.cvs.ui_*.jar
 usr/lib/eclipse/plugins/org.eclipse.team.ui_*.jar
 usr/lib/eclipse/plugins/org.eclipse.text_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ui.browser_*.jar
@@ -87,6 +92,7 @@ usr/lib/eclipse/plugins/org.eclipse.update.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.ui_*.jar
 
+usr/share/eclipse/features/org.eclipse.cvs_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.core.feature_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.rcp.feature_*
diff --git a/debian/eclipse-plugin-cvs.install b/debian/eclipse-plugin-cvs.install
deleted file mode 100644
index c76df8a..0000000
--- a/debian/eclipse-plugin-cvs.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/eclipse/features/org.eclipse.cvs_*
-usr/lib/eclipse/plugins/org.eclipse.cvs_*.jar
-usr/lib/eclipse/plugins/org.eclipse.team.cvs.core_*.jar
-usr/lib/eclipse/plugins/org.eclipse.team.cvs.ssh2_*.jar
-usr/lib/eclipse/plugins/org.eclipse.team.cvs.ui_*.jar
-usr/share/eclipse/features/org.eclipse.cvs_*
diff --git a/debian/eclipse-plugins-cvs.lintian-overrides b/debian/eclipse-plugins-cvs.lintian-overrides
deleted file mode 100644
index f5463eb..0000000
--- a/debian/eclipse-plugins-cvs.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-jar-not-in-usr-share
-codeless-jar
diff --git a/debian/rules b/debian/rules
index 0d9f24d..58d72d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,8 +98,7 @@ override_dh_install:
 # Operations on arch: all packages - not invoked if building with -B
 override_dh_install_indep:
 	# mv arch-indep plugins from lib to share
-	cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/plugins/*' | perl ../../../debian/extra/imagemv.pl
-	cd debian/eclipse-plugin-cvs/usr && find lib/ -type f -path '*lib/eclipse/*' | perl ../../../debian/extra/imagemv.pl
+	cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/*' | perl ../../../debian/extra/imagemv.pl
 	# Expose osgi jars
 	mkdir -p debian/libequinox-osgi-java/usr/share/java
 	cd debian/libequinox-osgi-java/usr/share/java && \


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

