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

Niels Thykier nthykier-guest at alioth.debian.org
Sat Jan 16 15:16:56 UTC 2010


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  51495a58035a596e9fca9137ae1c30b0affa7f5e (commit)
       via  2d945a1f726f0e06a403d6c9a166795c445e80ea (commit)
       via  ac1c6a0274176ca84356758691c770ad7c19329f (commit)
      from  bf5b8daf9b193cb00ba6582e5e6952f03acbaede (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 51495a58035a596e9fca9137ae1c30b0affa7f5e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 16 16:15:26 2010 +0100

    Set a sane file limit for osgi-bundles. (Closes: #558693, LP: #293573)

commit 2d945a1f726f0e06a403d6c9a166795c445e80ea
Merge: ac1c6a0274176ca84356758691c770ad7c19329f bf5b8daf9b193cb00ba6582e5e6952f03acbaede
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 16 14:26:52 2010 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit ac1c6a0274176ca84356758691c770ad7c19329f
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jan 15 16:19:16 2010 +0100

    Updated changelog and system-jars

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

Summary of changes:
 debian/changelog                 |    5 ++---
 debian/patches/codec.patch       |    5 +++++
 debian/patches/system-jars.patch |    4 +++-
 debian/rules                     |    2 ++
 system-jars.csv                  |    2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc117f1..2f75149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,7 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
     - Fixed broken symlink in swt packages. (Closes: #543318)
     - Fixed broken plugins/features. (Closes: #493984)
     - Fixed problem finding native libraries. (Closes: #553131)
-    - Fixed build for various archs.
-    (Closes: #554584, #521312)
+    - Fixed build for various archs. (Closes: #521312)
   * Stopped eclipse from unpacking native libraries into ~/.eclipse.
     (Closes: #351729)
   * Corrected Depends and Recommends.
@@ -26,7 +25,6 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
   * Removed "builtin browser not supported"-warning; it did not work.
     (Closes: #402340, #491542)
   * Removed dependency on libtomcat5.5-java and liblucene-java-doc.
-    (Closes: #530722, #537605)
   * Stopped using special hacks and work arounds to find JVMs.
     (Closes: #353360)
     - This removes the need for ~/.eclipse/eclipserc (Closes: #402077)
@@ -42,6 +40,7 @@ eclipse (3.5.1+repack-1) UNRELEASED; urgency=low
   * Rewrote symlink script to handle folders that are renamed on different
     archs/builds. (LP: #471859)
   * Move eclipse.ini into /etc (LP: #43162)
+  * Set a sane file limit for osgi-bundles. (Closes: #558693, LP: #293573)
 
  -- Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>  Tue, 01 Dec 2009 20:28:17 +0100
 
diff --git a/debian/patches/codec.patch b/debian/patches/codec.patch
index 9ce7914..5a0ead6 100644
--- a/debian/patches/codec.patch
+++ b/debian/patches/codec.patch
@@ -1,3 +1,8 @@
+Description: Tell eclipse that any version of commons-codec can be used.
+Author: Niels Thykier <niels at thykier.net>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=294748
+Applied-Upstream: no
+
 diff --git a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml b/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
 index 8a34d35..6bac392 100644
 --- a/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index 959308b..816eeb2 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -154,7 +154,7 @@ Applied-Upstream: no
 +fi
 --- /dev/null
 +++ eclipse-3.5.1+repack/system-jars.csv
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,48 @@
 +plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
 +plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
 +plugins/org.apache.ant_*/bin/antRun.pl;/usr/share/ant/bin/antRun.pl
@@ -201,3 +201,5 @@ Applied-Upstream: no
 +plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
 +plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
 +plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
++#plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
++#plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar
diff --git a/debian/rules b/debian/rules
index cf3eb70..ea44e3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,6 +166,8 @@ debian-install-stamp:
 	install -m 755 debian/extra/eclipse $(DEB_DESTDIR)usr/bin/eclipse
 	# Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
 	sed -i 's/SDKProfile/PlatformProfile/' "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
+	# Set a saner default file limit than "unlimited".
+	echo 'osgi.bundlefile.limit=100' >> "$(DEB_DESTDIR)usr/lib/eclipse/configuration/config.ini"
 	# Remove the unnecessary configuration data (taken from Fedora spec)
 	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.core.runtime
 	rm -r $(DEBIAN_PACK_LIBDIR)/configuration/org.eclipse.equinox.app
diff --git a/system-jars.csv b/system-jars.csv
index 115c89c..c9cc7f6 100644
--- a/system-jars.csv
+++ b/system-jars.csv
@@ -44,3 +44,5 @@ plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty.jar
 plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty-util.jar
 plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
 plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
+#plugins/com.ibm.icu_*.jar;/usr/share/java/com.ibm.icu.jar
+#plugins/com.ibm.icu.base_*.jar;/usr/share/java/com.ibm.icu.base.jar


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



More information about the pkg-java-commits mailing list