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

[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  1c8a48dcd007514b9dd9003f1a10afef4802c230 (commit)
       via  c0855ee503ea1bfe5ebb22e47545bd4c268679ac (commit)
       via  f01d0cc8107f17aa2d0d101a318df17b99894091 (commit)
      from  b6c97d6747f8d7808f1c077b7f1c27e9db58b8d1 (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 1c8a48dcd007514b9dd9003f1a10afef4802c230
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Feb 25 17:04:13 2010 +0100

    Refresh repack-eclipse script.

commit c0855ee503ea1bfe5ebb22e47545bd4c268679ac
Merge: b6c97d6747f8d7808f1c077b7f1c27e9db58b8d1 f01d0cc8107f17aa2d0d101a318df17b99894091
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Feb 25 17:03:42 2010 +0100

    Merge branch 'upstream'

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

Summary of changes:
 ChangeLog                   |    6 ++++++
 buildSDKSource.sh           |   30 +++++++++++++++++++++++++++++-
 debian/extra/repack-eclipse |   28 ----------------------------
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01c3b91..c30e68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-25  Andrew Overholt  <overholt at redhat.com>
+
+	Bug #303447
+
+	* buildSDKSource.sh: Delete more unused files (Benjamin Drung).
+
 2010-02-25  Alexander Kurtakov  <akurtako at redhat.com>
 
 	* pdebuild/eclipse-pdebuild.sh: Add exit 1 on unknown option.
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index e7f5b86..8fa0445 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -197,9 +197,37 @@ find -depth -name CVS -exec rm -rf {} \;
 
 # Remove prebuilt binaries
 find \( -name '*.exe' -o -name '*.dll' \) -delete
-find \( -name '*.so' -o -name '*.so.2' \) -delete
+find \( -name '*.a' -o -name '*.so' -o -name '*.so.2' \) -delete
 find features/org.eclipse.equinox.executable -name eclipse -delete
 
+# Remove unused files
+rm -f plugins/org.eclipse.core.resources/natives/ref.c
+
+# Remove unused jar files
+rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
+rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
+rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
+rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
+rm -f plugins/org.apache.ant_*/lib/ant-weblogic.jar
+rm -f plugins/org.apache.ws.commons.util_*.jar
+rm -f plugins/org.apache.ws.jaxme_*.jar
+rm -f plugins/org.apache.xmlrpc_*.jar
+rm -f plugins/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar
+rm -f plugins/org.eclipse.osgi/osgi/ee.foundation.jar
+rm -f plugins/org.eclipse.osgi/osgi/ee.minimum-1.2.0.jar
+rm -f plugins/org.eclipse.osgi/osgi/ee.minimum.jar
+rm -f plugins/org.eclipse.osgi/osgi/exceptions.jar
+rm -f plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar
+rm -f plugins/org.eclipse.osgi/osgi/osgi.core.jar
+rm -f plugins/org.eclipse.pde.core/ant_tasks/pde-ant.jar
+rm -f plugins/org.eclipse.swt/extra_jars/exceptions.jar
+rm -f plugins/org.eclipse.ecf*.jar
+rm -f plugins/org.mortbay.jetty_5*.jar
+
+# Remove empty directories
+find -depth -type d -empty -delete
+
 mkdir eclipse-${buildID}-fetched-src
 mv * eclipse-${buildID}-fetched-src
 tar cjf "${workDirectory}"/eclipse-${buildID}-fetched-src.tar.bz2 \
diff --git a/debian/extra/repack-eclipse b/debian/extra/repack-eclipse
index d36b49f..c7299d6 100755
--- a/debian/extra/repack-eclipse
+++ b/debian/extra/repack-eclipse
@@ -6,34 +6,6 @@ if test ! -d plugins; then
 	exit 1
 fi
 
-# Remove unused files
-rm -f plugins/org.eclipse.core.resources/natives/ref.c
-
-# Remove unused jar files
-rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
-rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
-rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
-rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
-rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
-rm -f plugins/org.apache.ant_*/lib/ant-weblogic.jar
-rm -f plugins/org.apache.ws.commons.util_*.jar
-rm -f plugins/org.apache.ws.jaxme_*.jar
-rm -f plugins/org.apache.xmlrpc_*.jar
-rm -f plugins/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.foundation.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.minimum-1.2.0.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.minimum.jar
-rm -f plugins/org.eclipse.osgi/osgi/exceptions.jar
-rm -f plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar
-rm -f plugins/org.eclipse.osgi/osgi/osgi.core.jar
-rm -f plugins/org.eclipse.pde.core/ant_tasks/pde-ant.jar
-rm -f plugins/org.eclipse.swt/extra_jars/exceptions.jar
-rm -f plugins/org.eclipse.ecf*.jar
-rm -f plugins/org.mortbay.jetty_5*.jar
-
-# Remove empty directories
-find -depth -type d -empty -delete
-
 # Store a list of removed files
 find plugins -name '*.jar' | grep -v '.source_' >> removed-jars || true
 


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