[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit 1f6f169e7e033564da4b3868bd1c6a10a9b1d085 Author: Jakub Adam Date: Sat May 26 23:39:26 2012 +0200 Fix bundle version in debian/patches/bump-ant-version.patch diff --git a/debian/patches/bump-ant-version.patch b/debian/patches/bump-ant-version.patch index 2caa5df..832bb82 100644 --- a/debian/patches/bump-ant-version.patch +++ b/debian/patches/bump-ant-version.patch @@ -70,7 +70,7 @@ index 727a944..42e73b9 100644 +#org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py +org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl:/usr/bin/complete-ant-cmd.pl diff --git a/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF -index 9a62cd3..2014a62 100644 +index 9a62cd3..909ea1d 100644 --- a/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ @@ -78,7 +78,7 @@ index 9a62cd3..2014a62 100644 Require-Bundle: org.eclipse.osgi Bundle-Vendor: %providerName -Bundle-Version: 1.8.3.qualifier -+Bundle-Version: 1.8.3 ++Bundle-Version: 1.8.3.v20120321-1730 Bundle-Name: %pluginName Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.ant -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit f51dd94b85e7c71f8dc17a109224603c527da593 Author: Jakub Adam Date: Sat May 26 22:14:57 2012 +0200 Don't install duplicate junit bundles diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install index 4bf814a..ed575d4 100644 --- a/debian/eclipse-jdt.install +++ b/debian/eclipse-jdt.install @@ -1,5 +1,4 @@ usr/*/eclipse/dropins/jdt/features/org.eclipse.jdt_* -usr/lib/eclipse/dropins/jdt/plugins/junit4.jar usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.launching_*.jar usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.ui_*.jar usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*.jar @@ -19,6 +18,5 @@ usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt_*.jar usr/lib/eclipse/dropins/jdt/plugins/org.hamcrest.core_*.jar -usr/lib/eclipse/dropins/jdt/plugins/org.junit4/junit.jar usr/lib/eclipse/dropins/jdt/plugins/org.junit4_* -usr/lib/eclipse/dropins/jdt/plugins/org.junit_* +usr/lib/eclipse/dropins/jdt/plugins/org.junit_*\.v* -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit 8b88d8b45827876589851483016daee927738435 Author: Jakub Adam Date: Sat May 26 16:05:51 2012 +0200 Refreshed refresh-eclipse-nosourcebundlesfordependencies.patch diff --git a/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch b/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch index c3f5703..03d9cb8 100644 --- a/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch +++ b/debian/patches/refresh-eclipse-nosourcebundlesfordependencies.patch @@ -1,31 +1,25 @@ From: Jakub Adam -Date: Sun, 6 May 2012 21:50:50 +0200 +Date: Sat, 26 May 2012 16:04:00 +0200 Subject: refresh-eclipse-nosourcebundlesfordependencies --- - .../eclipse-nosourcebundlesfordependencies.patch | 33 ++-- - 1 file changed, 17 insertions(+), 16 deletions(-) + .../eclipse-nosourcebundlesfordependencies.patch | 30 ++-- + 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/patches/eclipse-nosourcebundlesfordependencies.patch b/patches/eclipse-nosourcebundlesfordependencies.patch -index cee5a4e..fd412f8 100644 +index cee5a4e..f5f6650 100644 --- a/patches/eclipse-nosourcebundlesfordependencies.patch +++ b/patches/eclipse-nosourcebundlesfordependencies.patch -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ a/features/org.eclipse.platform/sourceTemplateFeature/build.properties.orig 2011-05-03 13:46:41.0 -0500 -+++ b/features/org.eclipse.platform/sourceTemplateFeature/build.properties 2011-05-08 13:11:40.376862727 -0500 --@@ -13,7 +13,7 @@ +--- a/features/org.eclipse.platform/sourceTemplateFeature/build.properties b/features/org.eclipse.platform/sourceTemplateFeature/build.properties -+@@ -13,7 +13,7 @@ eclipse_update_120.jpg,\ + @@ -13,7 +13,7 @@ feature.xml,\ feature.properties - -@@ -9,10 +9,10 @@ - plu...@org.apache.felix.gogo.command.source;version=0.8.0.qualifier;unpack="false",\ - plu...@org.apache.felix.gogo.runtime.source;version=0.8.0.qualifier;unpack="false",\ - plu...@org.apache.felix.gogo.shell.source;version=0.8.0.qualifier;unpack="false" --@@ -28,12 +28,10 @@ -+@@ -28,12 +28,10 @@ generate.feat...@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.us +@@ -12,7 +12,7 @@ + @@ -28,12 +28,10 @@ plu...@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\ plu...@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\ - plu...@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.1.qualifier;unpack="false",\ @@ -33,7 +27,7 @@ index cee5a4e..fd412f8 100644 - plu...@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\ - plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\ - plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false" -@@ -25,8 +25,8 @@ +@@ -25,19 +25,19 @@ - \ No newline at end of file + @@ -44,7 +38,11 @@ index cee5a4e..fd412f8 100644 @@ -11,33 +11,11 @@ bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties -@@ -37,7 +37,7 @@ + generate.feature@org.eclipse.platform.source=org.eclipse.platform,feat...@org.eclipse.rcp.source,feat...@org.eclipse.equinox.p2.user.ui.source;optional="true",plu...@org.eclipse.platform.doc.isv;unpack="false",\ + - plu...@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\ +-- plu...@com.jcraft.jsch.source;version=0.1.44.qualifier;unpack="false",\ ++- plu...@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\ +excl...@org.eclipse.platform.doc.user -generate.feat...@org.eclipse.jdt.source=org.eclipse.jdt, plu...@org.eclipse.jdt.doc.isv;unpack="false",\ -plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\ @@ -53,7 +51,7 @@ index cee5a4e..fd412f8 100644 -plu...@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\ -excl...@org.eclipse.jdt.doc.user +generate.feat...@org.eclipse.jdt.source=org.eclipse.jdt, plu...@org.eclipse.jdt.doc.isv;unpack="false", excl...@org.eclipse.jdt.doc.user -@@ -52,15 +52,16 @@ +@@ -52,14 +52,14 @@ - plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\ - plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\ - plu...@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\ @@ -64,6 +62,7 @@ index cee5a4e..fd412f8 100644 -- plugin@org.eclipse.jetty.server.source;version=8.1.1.qualifier;unpack="false",\ -- plugin@org.eclipse.jetty.servlet.source;version=8.1.1.qualifier;unpack="false",\ -- plu...@org.eclipse.jetty.util.source;version=8.1.1.qualifier;unpack="false",\ +-- plu...@org.eclipse.javax.el.source;version=2.2.0.qualifier;unpack="false" +- plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="fa
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit a35007b4b6bcf851ff937e80952cd78000b9cd4e Author: Jakub Adam Date: Sat May 26 22:09:02 2012 +0200 d/changelog: Change version to 3.8.0~rc2-1 diff --git a/debian/changelog b/debian/changelog index 55289d4..01c74a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -eclipse (3.8.0~I20120502-2000-1) UNRELEASED; urgency=low +eclipse (3.8.0~rc2-1) UNRELEASED; urgency=low * New upstream release. * Fix generation of Eclipse Help search index (Closes: #669000). -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit e0461f02ae395c4e1f0733374b8ce1dc3550e8bd Author: Jakub Adam Date: Sat May 26 14:25:54 2012 +0200 Install new icons diff --git a/debian/patches/install-new-icons.patch b/debian/patches/install-new-icons.patch new file mode 100644 index 000..8f7f75a --- /dev/null +++ b/debian/patches/install-new-icons.patch @@ -0,0 +1,24 @@ +From: Jakub Adam +Date: Sat, 26 May 2012 14:25:04 +0200 +Subject: install-new-icons + +--- + build.xml |3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build.xml b/build.xml +index 4fce261..a8dc236 100644 +--- a/build.xml b/build.xml +@@ -897,9 +897,10 @@ + + + +- ++ + + ++ + + + diff --git a/debian/patches/series b/debian/patches/series index 7d05fed..cf96f90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,3 +30,4 @@ arch-dont-copy-removed-about-files.patch eclipse-help-feature-adjust-dependencies-lucene-vers.patch bump-ant-version.patch refresh-eclipse-nosourcebundlesfordependencies.patch +install-new-icons.patch -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit efb53c547ca82b692fdf0e827ae1cdb295bf38e2 Author: Jakub Adam Date: Sat May 26 13:36:48 2012 +0200 Refreshed jdt-junit4-fix.patch diff --git a/debian/patches/jdt-junit4-fix.patch b/debian/patches/jdt-junit4-fix.patch index 5c11633..3d080c7 100644 --- a/debian/patches/jdt-junit4-fix.patch +++ b/debian/patches/jdt-junit4-fix.patch @@ -48,10 +48,10 @@ index 3971e85..d0bc1e0 100644 +org.junit_4.8.2.v4_8_2_v20110321-1705.jar=/usr/share/java/junit4.jar +org.junit_3.8.2.v3_8_2_v20100427-1100.jar=/usr/share/java/junit.jar diff --git a/eclipse/features/org.eclipse.jdt/feature.xml b/eclipse/features/org.eclipse.jdt/feature.xml -index 4a5fcd5..aa3bbd6 100644 +index 353e1f8..4998177 100644 --- a/eclipse/features/org.eclipse.jdt/feature.xml +++ b/eclipse/features/org.eclipse.jdt/feature.xml -@@ -160,7 +160,7 @@ +@@ -155,7 +155,7 @@ id="org.junit" download-size="0" install-size="0" @@ -61,12 +61,13 @@ index 4a5fcd5..aa3bbd6 100644 http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch: commit 894a40cd8c20bdce9bc65b5411fcb0eb778a32c7 Merge: 65ac444abf88ff329b3c7d366fee15960b8b6ce8 878d902b1bfce8c35e2d19188543932d73bf14c2 Author: Jakub Adam Date: Sat May 26 13:29:49 2012 +0200 Merge tag 'upstream/3.8.0_rc2' into master-3.8 Upstream version 3.8.0 RC2 -- eclipse - Powerful IDE written in java - Debian package. ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-40-g1f6f169
The following commit has been merged in the master-3.8 branch:
commit 65ac444abf88ff329b3c7d366fee15960b8b6ce8
Author: Jakub Adam
Date: Wed May 23 17:09:58 2012 +0200
d/control: update dependencies
diff --git a/debian/control b/debian/control
index 5d2c830..083419c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,14 @@ Build-Depends: ant (>= 1.8.2),
default-jdk,
docbook2x,
junit (>= 3.8.2-4),
- junit4 (>= 4.7-3),
+ junit4 (>= 4.10-2),
libasm3-java (>= 3.3),
libcommons-codec-java (>= 1.4-2),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
+ libfelix-gogo-command-java,
+ libfelix-gogo-shell-java,
+ libgconf2-dev,
libgtk2.0-dev,
libhamcrest-java (>= 1.1-8~),
libicu4j-4.4-java (>= 4.4.2.2),
@@ -28,6 +31,7 @@ Build-Depends: ant (>= 1.8.2),
liblucene2-java (<< 2.9.5),
libservlet3.0-java,
libswt-gtk-3-java (>= 3.8.0~m6),
+ libtomcat7-java,
lsb-release,
maven-ant-helper,
maven-repo-helper,
@@ -64,7 +68,7 @@ Architecture: all
Depends: default-jre | java5-runtime | java6-runtime,
eclipse-platform (>= ${source:Version}),
junit (>= 3.8.2-4),
- junit4 (>= 4.7-3),
+ junit4 (>= 4.10-2),
libhamcrest-java (>= 1.1-8~),
${misc:Depends}
Recommends: default-jdk | sun-java6-jdk
@@ -108,15 +112,14 @@ Depends: ant (>= 1.8.2),
eclipse-rcp (= ${binary:Version}),
java-common (>= 0.23),
libcommons-codec-java (>= 1.4-2),
- libcommons-el-java (>= 1.0-5),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
libjasper-java (>= 5.5.26),
- libjetty-java (>= 6.1.24-4~),
+ libjetty8-java,
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.4+ds1-3~),
liblucene2-java (<< 2.9.5),
- libservlet2.5-java (>= 6.0.20-8),
+ libservlet3.0-java,
sat4j (>= 2.3.0),
sat4j (<< 2.4.0),
${misc:Depends},
@@ -151,7 +154,8 @@ Description: Eclipse platform without development plug-ins
Package: eclipse-platform-data
Architecture: all
-Depends: ${misc:Depends}
+Depends: libtomcat7-java,
+ ${misc:Depends}
Replaces: eclipse (<< 3.5.2),
eclipse-platform (<< 3.5.2-4),
eclipse-platform-gcj,
@@ -179,8 +183,10 @@ Package: eclipse-rcp
Architecture: any
Depends: default-jre | java5-runtime | java6-runtime,
libequinox-osgi-java (= ${source:Version}),
+ libfelix-gogo-command-java,
+ libfelix-gogo-shell-java,
libicu4j-4.4-java (>= 4.4.2.2),
- libswt-gtk-3-java (>= 3.7.1-2),
+ libswt-gtk-3-java (>= 3.8.0~),
libswt-cairo-gtk-3-jni,
libswt-webkit-gtk-3-jni,
${misc:Depends},
@@ -210,7 +216,7 @@ Package: libequinox-osgi-java
Architecture: all
Section: java
Depends: ${misc:Depends}
-Recommends: libservlet2.5-java
+Recommends: libservlet3.0-java
Breaks: eclipse-rcp (<< 3.5.1-0ubuntu3)
Replaces: eclipse-platform-gcj, eclipse-rcp-gcj
Description: Equinox OSGi framework
--
eclipse - Powerful IDE written in java - Debian package.
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
