[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 40b28f3f544363b58b492f52bc9893cf876ac45f

[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 has been updated
       via  40b28f3f544363b58b492f52bc9893cf876ac45f (commit)
       via  0944fc2adfce5db80783f927d352779944f2f038 (commit)
       via  4ec384c0d312e6c6c3b11a5ba8b5026cbe959c3d (commit)
      from  23b5e183376b7334c16770ee1d4c0e9ba567eb42 (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 40b28f3f544363b58b492f52bc9893cf876ac45f
Merge: 4ec384c0d312e6c6c3b11a5ba8b5026cbe959c3d 0944fc2adfce5db80783f927d352779944f2f038
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Feb 26 17:50:13 2010 +0100

    Merge branch 'upstream'

commit 4ec384c0d312e6c6c3b11a5ba8b5026cbe959c3d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Feb 26 17:49:22 2010 +0100

    Drop system-jars.patch again.

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

Summary of changes:
 ChangeLog                        |    6 ++++++
 debian/patches/series            |    1 -
 debian/patches/system-jars.patch |   22 ----------------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b97f8b..53a461e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-26  Andrew Overholt  <overholt at redhat.com>
 
+	Bug #280688
+
+	* dependencies.properties: Update Debian/Ubuntu locations (Benjamin Drung).
+
+2010-02-26  Andrew Overholt  <overholt at redhat.com>
+
 	* patches/eclipse-nosourcebundlesfordependencies.patch: Remove references
 	to dependency source bundles.
 	* build.xml: Apply above patch.
diff --git a/debian/patches/series b/debian/patches/series
index ff592e0..9c7202a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ lucene.patch
 eclipse-manpage.patch
 pdebuild-script.patch
 pdebuild-path-copy-platform.patch
-system-jars.patch
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
deleted file mode 100644
index 6fdea06..0000000
--- a/debian/patches/system-jars.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add Debians search location
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280688
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/453036
-
-Index: eclipse-build/dependencies.properties
-===================================================================
---- eclipse-build/dependencies.properties	(Revision 24287)
-+++ eclipse-build/dependencies.properties	(Arbeitskopie)
-@@ -10,8 +10,8 @@
- org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
- org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
- org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
--org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar
--org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar
-+org.mortbay.jetty.server_6.1.15.v200905151201.jar=/usr/share/java/jetty/jetty-6.1.20.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-+org.mortbay.jetty.util_6.1.15.v200905182336.jar=/usr/share/java/jetty/jetty-util-6.1.20.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
- org.objectweb.asm_3.1.0.v200803061910.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
- org.sat4j.core_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
--org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
-\ No newline at end of file
-+org.sat4j.pb_2.1.1.v20090825.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar


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