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

[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  2966d9b048b7ebda77a8646b4c723c0542c5725a (commit)
       via  b56eae9f637ea669f158a62268fb37c9f0c5ff2a (commit)
       via  586a8468fbd6bfd94e0a783fd41b2352f1101f15 (commit)
       via  6e262448c712fb6ee719e1ec5d9a9c1a3c3422d9 (commit)
       via  0c8ae1dc1ff682cf8955d45805c248148ef67d54 (commit)
       via  963049d2da5f76cdd71d7ffa3e5a4acf4cd17e69 (commit)
      from  ee8cb5bd34d3830f5671074c1e31dd0edf2b49be (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 2966d9b048b7ebda77a8646b4c723c0542c5725a
Merge: 586a8468fbd6bfd94e0a783fd41b2352f1101f15 b56eae9f637ea669f158a62268fb37c9f0c5ff2a
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Mar 2 20:38:21 2010 +0100

    Merge branch 'upstream'

commit 586a8468fbd6bfd94e0a783fd41b2352f1101f15
Merge: 0c8ae1dc1ff682cf8955d45805c248148ef67d54 6e262448c712fb6ee719e1ec5d9a9c1a3c3422d9
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Mar 2 20:16:21 2010 +0100

    Merge branch 'upstream'

commit 0c8ae1dc1ff682cf8955d45805c248148ef67d54
Merge: ee8cb5bd34d3830f5671074c1e31dd0edf2b49be 963049d2da5f76cdd71d7ffa3e5a4acf4cd17e69
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Mar 2 20:08:25 2010 +0100

    Merge branch 'upstream'

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

Summary of changes:
 ChangeLog                                          |   12 ++++++++++++
 .../eclipsebuild/SymlinkInstalledOSGiJars.java     |    2 +-
 .../linuxtools/eclipsebuild/SymlinkOSGiJars.java   |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab822ef..1dd911c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-03-02  Andrew Overholt  <overholt at redhat.com>
 
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
+	(importantManifestEntries): Only compare Bundle-SymbolicName when
+	symlinking at install time since we know it will be correct based on
+	build time symlinks.
+
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+	(execute): Correct symlink location.
+
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+ 
 	* dependencies.properties: Fix up Debian jasper JAR location.
 
 2010-03-02  Andrew Overholt  <overholt at redhat.com>
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
index b2e9c39..b297245 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
@@ -29,7 +29,7 @@ import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
 
 public class SymlinkInstalledOSGiJars extends Task {
 
-	private String[] importantManifestEntries = { "Bundle-SymbolicName", "Bundle-Version", "Export-Package" };
+	private String[] importantManifestEntries = { "Bundle-SymbolicName" };
 
 	private Properties dependencies;
 	private String topLevelDir;
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
index 56a7cff..e05699e 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
@@ -98,7 +98,7 @@ public class SymlinkOSGiJars extends Task {
 			// Then make the actual symlink
 			Symlink s = new Symlink();
 			s.init();
-			s.setLink(topLevelDir + "/" + matchedJarBundleNameVersion + ".jar");
+			s.setLink(topLevelDir + "/" + origLocation);
 			s.setResource(matchedJar.getAbsolutePath());
 			s.execute();
 		}


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