Bug#799375: [PATCH] jh_build: Fix build of sources with spaces in path
Package: javatools Version: 0.53 Tags: patch jh_build fails when a source directory passed as an argument contains spaces. For example: $ jh_build org.eclipse.ui.workbench_3.107.0.qualifier.jar "bundles/org.eclipse.ui.workbench/Eclipse UI Editor Support" produces this output: find bundles/org.eclipse.ui.workbench/Eclipse UI Editor Support -name *.java -and -type f -print0 | xargs -0 /usr/lib/jvm/default-java/bin/javac -g -cp :debian/_jh_build.org.eclipse.ui.workbench_3.107.0.qualifier -d debian/_jh_build.org.eclipse.ui.workbench_3.107.0.qualifier -source 1.5 -target 1.5 find: `bundles/org.eclipse.ui.workbench/Eclipse': No such file or directory find: `UI': No such file or directory find: `Editor': No such file or directory find: `Support': No such file or directory javac: no source files Usage: javac use -help for a list of possible options Please consider including the attached patch which should fix this issue. Regards, Jakub From cfdc0aa86f6847ca99ed51b4a2af3c112e366765 Mon Sep 17 00:00:00 2001 From: Jakub Adam <jakub.a...@ktknet.cz> Date: Fri, 18 Sep 2015 14:36:02 +0200 Subject: [PATCH 1/2] jh_build: Fix build of sources with spaces in path --- jh_build | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/jh_build b/jh_build index 6e99dee..cd5834c 100755 --- a/jh_build +++ b/jh_build @@ -73,13 +73,13 @@ function dobuild() jarfile="$1" shift ext="`basename "$jarfile" .jar`" - srcdirs= - srcfiles= + srcdirs=() + srcfiles=() while [ -n "$1" ]; do if [ -f "$1" ]; then - srcfiles="$srcfiles $1" + srcfiles+=("$1") elif [ -d "$1" ]; then - srcdirs="$srcdirs $1" + srcdirs+=("$1") else echo "Ignoring $1 because it does not exist" fi @@ -110,32 +110,32 @@ function dobuild() if [ -n "$srcdirs" ]; then if [ -z "`getarg q quiet`" ]; then - echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles + echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" fi - find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles + find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then if [ -z "`getarg q quiet`" ]; then -echo find $srcdirs -name '*.java' -and -type f -print0 '|' xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles +echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" fi - find $srcdirs -name '*.java' -and -type f -print0 | xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles + find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" fi elif [ -n "$srcfiles" ]; then if [ -z "`getarg q quiet`" ]; then - echo $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles + echo $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" fi - $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS $srcfiles + $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then if [ -z "`getarg q quiet`" ]; then -echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles +echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" fi - $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles + $JAVADOC $CLASSPATHDOCS -classpath $CLASSP
Bug#799378: [PATCH] jh_build: Increase allowed command line length for xargs
Package: javatools Version: 0.53 Tags: patch Maximum length of command line that xargs (which jh_build uses to call javac) is allowed to produce may be too low when there are hundreds of files in a source directory. Please consider increasing this limit (see the attached patch). I've found 512000 B to be a reasonable value when building org.eclipse.ui.workbench bundle (circa 1300 java sources). Regards, Jakub From f83951bd33b405426c3f758c563cc50982acb398 Mon Sep 17 00:00:00 2001 From: Jakub Adam <jakub.a...@ktknet.cz> Date: Fri, 18 Sep 2015 14:40:06 +0200 Subject: [PATCH 2/2] jh_build: Increase allowed command line length for xargs Fixes build of source directories with many files. --- jh_build | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jh_build b/jh_build index cd5834c..3ac2d7c 100755 --- a/jh_build +++ b/jh_build @@ -110,17 +110,17 @@ function dobuild() if [ -n "$srcdirs" ]; then if [ -z "`getarg q quiet`" ]; then - echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" + echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -s 512000 -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" fi - find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" + find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -s 512000 -0 $JAVAC -g -cp $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.$ext $JH_JAVAC_OPTS "${srcfiles[@]}" if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`" ]; then if [ -z "`getarg q quiet`" ]; then -echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" +echo find "${srcdirs[@]}" -name '*.java' -and -type f -print0 '|' xargs -s 512000 -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" fi - find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" + find "${srcdirs[@]}" -name '*.java' -and -type f -print0 | xargs -s 512000 -0 $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS "${srcfiles[@]}" fi elif [ -n "$srcfiles" ]; then -- 2.5.1 signature.asc Description: OpenPGP digital signature __ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#790409: eclipse-pydev: pydev is not recognized by eclipse anymore
Hi Markus, On 06/30/2015 12:26 AM, Markus Koschany wrote: Hence I would like to suggest that we aim for a solution with the current version of bnd 1.5.0 in unstable. I think bnd isn't the real blocker. Your fix for bnd 2.1.0 will not be in vain. It's good to know that those packages work with the newer version of bnd. If you agree, we could make all affected packages work with bnd 1.5.0, which should be trivial, and get this bug here fixed as soon as possible. okay, switching back to bnd 1.5 will not cause much trouble. I'll soon start RFS'ing all the missing pieces needed for bringing Pydev back into working state. Regards, Jakub signature.asc Description: OpenPGP digital signature __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#790409: eclipse-pydev: pydev is not recognized by eclipse anymore
Hi Markus, On Mon, 29 Jun 2015 19:17:19 +0200 Markus Koschany a...@gambaru.de wrote: I saw that Jakub Adam already changed the build-dependencies and dependencies in eclipse-pydev but I don't know what else is required to fix this issue. If someone else does, please let us know. Some of the new dependencies are missing OSGi metadata in their manifests, which are needed in order for them to be usable in Eclipse. I use bnd to generate the metadata at build time and have pushed the necessary changes to the java packages in question. Because bnd is now in a process of being updated, I made my changes already compatible with the bnd version in experimental. So, the best way you could help is to finish the transition and get bnd 2.1 into sid. Once this is done, I'll start issuing sponsorship requests for all the components needed to get Pydev working again. If there is something blocking the bnd upload, please let me know. Regards, Jakub signature.asc Description: OpenPGP digital signature __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#747054: FTBFS: package javax.servlet.http does not exist
Hi, I've rebuilt eclipse package in current sid using pbuilder and didn't encounter any error. Can someone please confirm this bug is still relevant? Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#739413: [eclipse] Eclipse segfault at startup on libgtk-x11
This is likely the same bug: https://issues.apache.org/jira/browse/DIRSTUDIO-962. It seems it depends on the used GTK theme. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#734674: eclipse: Frequently segfaults under some circumstances
Hi, Upon inspecting the segfaults, I saw messages in my dmesg log pointing to libsoup and I found: http://bugs.debian.org/705420 And a small patch is available at: http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c Can we have eclipse rebuilt with this patch, please? we already have this patch, it even originates from Debian. Please make sure you have installed libswt-gtk-3-java = 3.8.2-1, which is the first version with the fix applied [1]. Regards, Jakub [1] http://ftp-master.metadata.debian.org/changelogs//main/s/swt-gtk/swt-gtk_3.8.2-1_changelog __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#730813: no /usr/lib/arch/jni in default java.library.path
Hi, what version of JRE do you have installed? Both openjdk-6-jre and openjdk-7-jre in sid now should correctly search for JNI libraries in /usr/lib/arch/jni by default. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#725452: eclipse-cdt: After project delete and import, eclipse doesn't re-import the gcc includes
Hi, are you planning to release a backport for this package? I can think about it, but first please check whether the latest version really works for you. If so, I might look into it sometime next week. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#725452: eclipse-cdt: After project delete and import, eclipse doesn't re-import the gcc includes
Hi, Is it possible to fix it even if I use stable? this might be a problem as I don't know the specific patch fixing the issue. I would recommend to upgrade to CDT from testing or unstable. It has very few dependencies and will work with Eclipse 3.8.0 from stable. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#723776: androidsdk-tools: FTBFS with perl 5.18: POD errors
Hi Damyan, this is already fixed in the new version uploaded into sid yesterday. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#721953: eclipse: fatal error in soup_session_feature_detach with WebKitGTK+ = 1.11.91
Hi Dominic, is this just a warning about a possible problem or have you really experienced this kind of crash yourself with latest eclipse package in Debian? That would mean there is a regression because I've already fixed this in libswt-gtk-3-java 3.8.2-1 - what you've linked is actually my patch and bug report for upstream. So if you see the crashes, please make sure you have libswt-gtk-3-java = 3.8.2-1 installed and let me know if the problem is still there or whether I can close this as duplicate. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#721953: eclipse: fatal error in soup_session_feature_detach with WebKitGTK+ = 1.11.91
Oh, now I see swt-gtk is still stuck in unstable invalidated by dependency. That can be the reason why the fix didn't reach you yet if you are on testing. So please just install libswt-gtk-3-java from unstable. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#714189: maven.pm: touch debian/stamp-poms-patched after mh_patchpoms is run
Package: maven-debian-helper Severity: important Tags: patch When POMs are in patched state, there has to be debian/stamp-poms-patched file existing. It is expected by mh_resolve_dependencies, which otherwise deletes debian/[package].poms and regenerates it from scratch, discarding any user specified parameters. Patch mirrors this cdbs behavior into dh, where it was missing. From 820d09e2483ac1ec36e5fa6335d3175455612404 Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Wed, 26 Jun 2013 19:22:16 +0200 Subject: [PATCH] Touch debian/stamp-poms-patched after mh_patchpoms is run When POMs are in patched state, there has to be debian/stamp-poms-patched file existing. It is expected by mh_resolve_dependencies, which otherwise deletes debian/[package].poms and regenerates it from scratch, discarding any user specified parameters. Patch mirrors this cdbs behavior into dh, where it was missing. --- share/perl/maven.pm |2 ++ 1 file changed, 2 insertions(+) diff --git a/share/perl/maven.pm b/share/perl/maven.pm index 00520df..f752e55 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -62,6 +62,7 @@ sub configure { $this-doit_in_sourcedir(mh_patchpoms, -p$this-{package}, --debian-build, --keep-pom-version, --maven-repo=$this-{cwd}/debian/maven-repo, @patch_args); + doit(touch, debian/stamp-poms-patched); } sub build { @@ -119,6 +120,7 @@ sub clean { doit(rm, -r, $this-{cwd}/debian/maven-repo); } $this-doit_in_sourcedir(mh_unpatchpoms, -p$this-{package}); + doit(rm, -f, debian/stamp-poms-patched); doit(mh_clean); } -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#712658: maven-repo-helper: POMReader doesn't trim whitespace
Package: maven-repo-helper Severity: important Tags: patch Because of recent changes in POMReader.java, values parsed from XML keep their leading and trailing whitespace. Consequently, a malformed .mh/pom.properties is created for example from pom.xml[1], causing a build failure. I propose a very simple patch to fix this issue. Regards, Jakub [1] http://anonscm.debian.org/viewvc/pkg-java/trunk/bnd/debian/pom.xml?revision=15264view=markup From 784c41c79cfa7d1ca660a2a2a4237b88bb043a54 Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Tue, 18 Jun 2013 12:54:23 +0200 Subject: [PATCH] Trim whitespace from values in POMReader --- src/main/java/org/debian/maven/repo/POMReader.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/debian/maven/repo/POMReader.java b/src/main/java/org/debian/maven/repo/POMReader.java index cc2f4ce..47b2408 100644 --- a/src/main/java/org/debian/maven/repo/POMReader.java +++ b/src/main/java/org/debian/maven/repo/POMReader.java @@ -103,7 +103,7 @@ public class POMReader { } case XMLStreamConstants.END_ELEMENT: { -String value = buffer != null ? buffer.toString() : null; +String value = buffer != null ? buffer.toString().trim() : null; if (inIgnoredElement 0 || path.contains(exclusions)) { // ignore } else if (path.contains(dependency) || path.contains(plugin) || path.contains(extension)) { -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#711852: maven.pm: Don't install documentation jar into maven-repo by default
Package: maven-debian-helper Severity: wishlist Tags: patch Standard place where generated javadoc API documentation is installed on Debian system is /usr/share/doc/package-name/api/. Maven dh build installs it also a JAR in maven-repo. Having this duplicate file isn't necessary, so please consider not installing the javadoc JAR by default. Required change is implemented in attached patch. Adding 'export MH_INSTALL_DOC=1' into d/rules overrides the setting. Regards, Jakub From 81c9f308c6a21979f8e3d7feb2a3af232ce825b7 Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Mon, 10 Jun 2013 13:35:10 +0200 Subject: [PATCH] maven.pm: Don't install documentation jar into maven-repo by default Add 'export MH_INSTALL_DOC=1' into d/rules to override the setting. --- share/perl/maven.pm |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/perl/maven.pm b/share/perl/maven.pm index 00520df..ca94eff 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -97,9 +97,11 @@ sub install { $this-doit_in_builddir(mh_resolve_dependencies, --non-interactive, --offline, -p$this-{package}, @resolvedep_args); if ($this-{doc_package}) { - $this-doit_in_builddir(@{$this-{maven_cmd}}, - -Ddebian.package=$this-{doc_package}, - org.debian.maven:debian-maven-plugin:$maven_debian_version:install-doc); + if ($ENV{MH_INSTALL_DOC} == 1) { + $this-doit_in_builddir(@{$this-{maven_cmd}}, +-Ddebian.package=$this-{doc_package}, +org.debian.maven:debian-maven-plugin:$maven_debian_version:install-doc); + } doit(cp,debian/$this-{package}.substvars, debian/$this-{doc_package}.substvars); # clean up generated docs -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#710131: maven.pm ignores content of d/maven.properties
I've pushed the patch together with my progress on Maven 3 support into development git as a branch topic-bug-710131 so it is enough for the maintainer to just merge it into master now. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#710131: maven.pm ignores content of d/maven.properties
Package: maven-debian-helper Severity: normal Tags: patch Hi, in dh build, path to debian/maven.properties file in 'properties.file.manual' should be passed to Maven as a JVM system property, but the perl script simply appends it at the end of the command line, making it a Maven property. Because of this misplacement, content of d/maven.properties is ignored by dh build. Please see attached patch. Regards, Jakub From 3f377ddcb852522438609bfcf93a729c6473b2ac Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Tue, 28 May 2013 12:52:06 +0200 Subject: [PATCH] maven.pm: pass properties.file.manual as JVM system property Because it was passed as Maven property, content of d/maven.properties was ignored in dh build. --- share/perl/maven.pm | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/perl/maven.pm b/share/perl/maven.pm index adfaed0..00520df 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -36,16 +36,18 @@ sub new { push(@classpath, $java_home/lib/tools.jar); } + my @jvmopts = ('-noverify', '-cp', join(':',@classpath), + -Dclassworlds.conf=$classconf); + if (-e $this-{cwd}/debian/maven.properties) { + push (@jvmopts, -Dproperties.file.manual=$this-{cwd}/debian/maven.properties); + } + @{$this-{maven_cmd}} = ($java_home . '/bin/java', - '-noverify', '-cp', join(':',@classpath), - -Dclassworlds.conf=$classconf, + @jvmopts, org.codehaus.classworlds.Launcher, -s/etc/maven2/settings-debian.xml, -Ddebian.dir=$this-{cwd}/debian, -Dmaven.repo.local=$this-{cwd}/debian/maven-repo); - if (-e $this-{cwd}/debian/maven.properties) { - push (@{$this-{maven_cmd}}, -Dproperties.file.manual=$this-{cwd}/debian/maven.properties); - } return $this; } -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#706782: maven.pm: Crashes because using obsolete maven-debian-plugin
Package: maven-debian-helper Severity: important Tags: patch Hi, When using dh to build a package using Maven, the build crashes because maven.pm looks for maven-debian-plugin in maven-repo. This plugin was renamed to debian-maven-plugin in 1.5.1, maven.pm still uses the old name. Please see attached patch. Regards, Jakub From 432d49041fe64e3487574803b3868ab2a4495f50 Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Sat, 4 May 2013 13:25:04 +0200 Subject: [PATCH] maven.pm: Rename maven-debian-plugin - debian-maven-plugin Fixes crash during maven invocation, plugin was renamed in 1.5.1. --- share/perl/maven.pm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/perl/maven.pm b/share/perl/maven.pm index 0c17ac6..adfaed0 100644 --- a/share/perl/maven.pm +++ b/share/perl/maven.pm @@ -91,13 +91,13 @@ sub install { $this-doit_in_builddir(@{$this-{maven_cmd}}, -Ddebian.package=$this-{package}, -Dinstall.to.usj=true, - org.debian.maven:maven-debian-plugin:$maven_debian_version:install); + org.debian.maven:debian-maven-plugin:$maven_debian_version:install); $this-doit_in_builddir(mh_resolve_dependencies, --non-interactive, --offline, -p$this-{package}, @resolvedep_args); if ($this-{doc_package}) { $this-doit_in_builddir(@{$this-{maven_cmd}}, -Ddebian.package=$this-{doc_package}, - org.debian.maven:maven-debian-plugin:$maven_debian_version:install-doc); + org.debian.maven:debian-maven-plugin:$maven_debian_version:install-doc); doit(cp,debian/$this-{package}.substvars, debian/$this-{doc_package}.substvars); # clean up generated docs -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#705421: RFS: libcommons-logging-java 1.1.2-2 (for experimental)
Hi Emmanuel, On 15.4.2013 22:48, Emmanuel Bourg wrote: A new upstream release is expected soon to fix the OSGi metadata. https://issues.apache.org/jira/browse/LOGGING-151 do you have any more accurate time frame for the next release? If we don't know for sure it's going to happen within say 1-2 weeks I'd prefer to proceed with this upload as 1.1.2-1 renders Eclipse unusable when installed. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#705421: eclipse: Eclipse does not show CDT and all other installed stuff
Hi, as a workaround please downgrade libcommons-logging-java to the version in unstable. I will request upload of a fixed version of the package in a few minutes. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#705421: RFS: libcommons-logging-java 1.1.2-2 (for experimental)
Dear java packagers, I am looking for a sponsor for package libcommons-logging-java. * Package name: libcommons-logging-java Version : 1.1.2-2 Upstream Author : The Apache Software Foundation * URL : http://commons.apache.org/logging/ * License : Apache-2.0 Section : java It builds those binary packages: libcommons-logging-java - commmon wrapper interface for several logging APIs libcommons-logging-java-doc - commmon wrapper interface for several logging APIs (documentation) Package sources can be accessed at pkg-java svn repository: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-logging-java This version fixes OSGi Bundle-SymbolicName that was changed in previous upload and prevented Eclipse from finding the library. I also fixed typos in the package synopsis that I noticed after copying them into this RFS :) I would be glad if someone uploaded this package into experimental for me. Kind regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#704516: Upstream bugreport
Bug reported upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=404776 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#704516: crash: fatal error in soup_session_feature_detach
Hi Thomas, I can't work on java code anymore since some days. When I click on something in the java editor, eclipse crashes. I remember having updated eclipse-wtp and webkit lately. This crash is caused by the webkit update from experimental, I prepared a patch in git[1]. If you can, please build yourself the package and test the fix. I'm going to RFS the new upload probably within a day or two -- I may use the opportunity to also package a new upstream version of SWT. All Eclipse versions downloadable from eclipse.org up to Kepler M6 are also crashing so I'll send the patch upstream. Regards, Jakub [1] http://anonscm.debian.org/gitweb/?p=pkg-java/swt-gtk.git;a=commit;h=ba8b966014adc356f54d758c212eb474099c20e6 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: eclipse-subclipse_1.8.16-1_amd64.changes REJECTED
Hi Tony, I made an update to eclipse-subclipse d/copyright based on problems pointed out by Luca. Could you please reupload[1]? Regards, Jakub [1] http://anonscm.debian.org/gitweb/?p=pkg-java/eclipse-subclipse.git On 14.11.2012 23:00, Luca Falavigna wrote: Hi, some files under org.tigris.subversion.subclipse.tests/ are licensed under different licenses than those listed in copyright file (e.g. Apache amd CPL). Cheers, Luca __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#692230: jh_build: generates javadoc into wrong output location
Package: javahelper Severity: normal Tags: patch Hi, when there are only *.java files and no source directories specified on jh_build command line, javadoc is generated in debian/_jh_build.javadoc.ext/api directory. I presume it should be debian/_jh_build.javadoc/api, same as when we have at least one source dir specified. Please see attached patch. Regards, Jakub From 502dc0922dfbccc1e06e3cfa39b515a5dc0bdbbf Mon Sep 17 00:00:00 2001 From: Jakub Adam jakub.a...@ktknet.cz Date: Sat, 3 Nov 2012 20:13:44 +0100 Subject: [PATCH] jh_build: Fix wrong javadoc output location --- jh_build |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jh_build b/jh_build index 653d083..137445a 100755 --- a/jh_build +++ b/jh_build @@ -129,9 +129,9 @@ function dobuild() if [ -n `getarg J javadoc` ] || [ -z `getarg N no-javadoc` ]; then if [ -z `getarg q quiet` ]; then -echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc.ext/api -quiet $JH_JAVADOC_OPTS $srcfiles +echo $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles fi - $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc.ext/api -quiet $JH_JAVADOC_OPTS $srcfiles + $JAVADOC $CLASSPATHDOCS -classpath $CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet $JH_JAVADOC_OPTS $srcfiles fi else -- 1.7.10.4 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#689452: Circular build dependency between eclipse-mylyn and eclipse-egit
Package: src:eclipse-mylyn Version: 3.8.0-1 Severity: serious There is a circular build dependency between eclipse-mylyn and eclipse-egit. This can introduce problems when rebuilding the packages. This dependency should be avoided. __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#684604: eclipse-rcp: eclipse 3.8 hangs on splash screen with Loading Workbench after update from 3.7.2
Hi Felix, Thanks for all the information you provided so far. I spent some time studying the logs but couldn't make any final conclusion. All of the required packages you have installed seem to be at their latest versions and I didn't find any fatal error related to bundle loading in your debug logs. Thinking of it more, maybe there is nothing wrong with the installation, but there is something in your workspace that makes Eclipse hang during startup (but also it doesn't affect 4.2 binary tarball). When you run without ~/.eclipse do you see a workspace selection popup? If so, can you please try to create a new empty workspace and look if Eclipse will start then? If it happens that it's your current workspace that causes the hang on startup, are you able to put somewhere for download a stripped down version? I think only the .metadata folder will be sufficient, no projects that might contain private of confidential data. Please check that the hang still occurs with the stripped workspace before uploading. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#684604: eclipse-rcp: eclipse 3.8 hangs on splash screen with Loading Workbench after update from 3.7.2
Hi Felix, On 19.8.2012 17:33, Felix Natter wrote: Meanwhile I read this: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681726 and decided to give Juno 4.2 a try. This seems to work fine right now :-) Just to make it clear, that bug is a wishlist item. Wheezy release is now frozen so 4.2 will NOT make it into Debian until the next stable release is made (a horizon of months) and it was never in our plan for Wheezy, as all the plugins we have packaged run the same on Eclipse 3.8 (now the deprecated platform). !MESSAGE The artifact file for osgi.bundle,javax.servlet,2.5.0.v200806031605 was not found. Thanks a lot for your help, unfortunately I didn't receive it in time (my own fault), and I am happy with 4.2 :-) I'll close this report soon then. I tried to reproduce the problem, but without success. It could be your local configuration issue, but also it's possible the bug is still there affecting other users and might even persist into 4.2 release if not fixed properly. Anyway, if you could still provide some of the information I asked previously, you would be much helpful. I can't force you of course :) Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#684604: eclipse-rcp: eclipse 3.8 hangs on splash screen with Loading Workbench after update from 3.7.2
Hi Felix, On 19.8.2012 19:31, Felix Natter wrote: I'd really like to help you, but this file: /usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info is not there any more. It will be back when you reinstall eclipse-platform. That you are missing it right now is a good sign, means you will get correct version from the latest package when installed and we don't have to care about its content. You shouldn't ever run eclipse as root of course, or it will be overwritten. BTW, what do you have in /etc/eclipse.ini? To make things easier for me, here are the versions of *all* installed packages (of course some packages have been removed when I removed the eclipse packages): http://pastebin.com/9cHJaj5J Thanks for the list, but please reinstall eclipse-platform and make a new one, current is missing many packages as you noted. I assume you use 4.2 tarball from eclipse.org, so reinstalling distribution Eclipse will not interfere with your work environment. Use 'dpkg --list' to create the list, it will be easier for me to compare. Do you have any additional plugins installed? Yes, I installed saferefactor from here: http://dsc.ufcg.edu.br/~spg/saferefactor/ I assume you installed it from the update site as regular user, so running Eclipse without ~/.eclipse eliminates its possible influence on the configuration. You already tried this, so I doubt the extra plugin is a source of the problem. Many thanks, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#684604: eclipse-rcp: eclipse 3.8 hangs on splash screen with Loading Workbench after update from 3.7.2
Hi Felix, !MESSAGE The artifact file for osgi.bundle,javax.servlet,2.5.0.v200806031605 was not found. This should not happen, Eclipse 3.8 uses javax.servlet 3.0.0. Please paste here the contents of your /usr/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info Maybe it wasn't updated for some reason. Also please create an .options file somewhere, with following contents: org.eclipse.equinox.p2.core/debug=true org.eclipse.equinox.p2.core/reconciler=true org.eclipse.equinox.p2.core/installregistry=true org.eclipse.eclipse.p2.engine/engine/debug=true osgi.checkConfiguration=true org.eclipse.osgi/debug=true Then run eclipse *from the same directory* where .options is placed, with these arguments: /usr/lib/eclipse/eclipse -consoleLog -debug This should produce more debug information. Start with empty ~/.eclipse. Please check if you have installed the latest version of libservlet3.0-java from Debian testing. Even better if you can get a list of all dependencies of eclipse-rcp package and installed versions. Do you have any additional plugins installed? Also check /usr/lib/eclipse/plugins for any broken symlinks. Regards Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683930: eclipse: 3.8.0~rc4-1 exits with log error: Unable to acquire application
Hi, On 11.8.2012 05:18, JS wrote: I retried your suggestion but never got the console to look for the output you suggested. Below is all I saw (also tried adding the -clean option, with the same result). jack@berkeley:~ = eclipse -console -consoleLog -noExit !SESSION 2012-08-10 23:05:56.732 --- eclipse.buildId=unknown java.version=1.7.0_05 java.vendor=Oracle Corporation BootLoader constants: OS=linux, ARCH=x86, WS=gtk, NL=en_US Command-line arguments: -os linux -ws gtk -arch x86 -console -consoleLog !ENTRY org.eclipse.osgi 4 0 2012-08-10 23:05:56.964 !MESSAGE Could not find bundle: org.eclipse.equinox.console !STACK 0 org.osgi.framework.BundleException: Could not find bundle: org.eclipse.equinox.console at org.eclipse.osgi.framework.internal.core.ConsoleManager.checkForConsoleBundle(ConsoleManager.java:211) at org.eclipse.core.runtime.adaptor.EclipseStarter.startup(EclipseStarter.java:297) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:176) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:629) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:584) at org.eclipse.equinox.launcher.Main.run(Main.java:1438) Hmm no wonder you couldn't get the console when Eclipse is unable to load even the console support bundle. Looking at the dependencies of org.eclipse.equinox.console, could you please check that you have installed the latest versions of these packages available in Debian testing? libfelix-gogo-command-java libfelix-gogo-shell-java libservlet3.0-java libtomcat7-java Eclipse is not declaring a dependency on any particular version of these packages so you might have an old, incompatible one. Our list of required packages should be updated in this case. !ENTRY org.eclipse.osgi 4 0 2012-08-10 23:05:56.972 !MESSAGE Application error !STACK 1 java.lang.IllegalStateException: Unable to acquire application service. Ensure that the org.eclipse.core.runtime bundle is resolved and started (see config.ini). at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:74) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:353) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:180) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:629) at org.eclipse.equinox.launcher.Main.basicRun(Main.java:584) at org.eclipse.equinox.launcher.Main.run(Main.java:1438) Looks only as a consequence of previous error(s). Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683930: eclipse: 3.8.0~rc4-1 exits with log error: Unable to acquire application
Hi, On 6.8.2012 04:41, JS wrote: I ran the eclipse 3.8.0 gotten straight from eclipse.org, without any change to my existing configuration or selection of java alternatives (of Oracle jre) and it ran perfectly fine. Further, I did not run eclipse as root. Tarball from Eclipse.org is quite different in some aspects, it can write to any file in its installation and because it carries all required libraries inside, it will work almost anywhere independent on the system. It won't help much in investigating of this issue. But you said Eclipse won't start even without your ~/.eclipse, so the problem is not there but somewhere else. One test that can say us something more is running Eclipse with enabled OSGi console. Execute from the shell: eclipse -console -consoleLog -noExit After a while you should be presented with the console, it should keep running even after Eclipse terminates with error. Type 'ss' in the shell. Then you will see a list of loaded plugins like this: id State Bundle 0 ACTIVE org.eclipse.osgi_3.8.0.dist 1 ACTIVE org.eclipse.equinox.simpleconfigurator_1.0.300.dist 2 ACTIVE com.ibm.icu_4.4.2.v20110823 3 RESOLVEDcom.jcraft.jsch_0.1.42 4 RESOLVEDjavax.el_2.2.0 5 RESOLVEDjavax.servlet_3.0.0.v201103241327 6 RESOLVEDjavax.servlet.jsp_2.2.0.v201103241327 7 RESOLVEDorg.apache.ant_1.8.3.v20120321-1730 8 RESOLVEDorg.apache.commons.codec_1.4.0 9 RESOLVEDorg.apache.commons.httpclient_3.1.0 10 RESOLVEDorg.apache.commons.logging_1.0.4.v20080605-1930 ... Look if there are any bundles in INSTALLED State. Those are the ones that had some problem in initialization. Run 'diag bundle numeric id' to see more information on that plugin, like any unresolved dependencies. You can read some more information about OSGi console in this article [1]. If the same upstream source works fine on my system but the debian package does not, isn't this more likely to be a packaging issue? Maybe, I can't say for sure right now, as I don't have enough information yet. Post here an output from your OSGi console session, perhaps try to answer some questions from my previous mail. Can you run distribution Eclipse with OpenJDK? Is a different user (with clean $HOME) able to run it? A similar issue arose with 3.7.2 in the earlier bug referenced in my email. This was a problem with Oracle Java and its hardcoded search path for JNI libraries that doesn't include /usr/lib/jni, where JNI libraries are placed according to Debian guidelines. Eventually we decided to put a workaround patch into SWT package because many people are still using Oracle Java [2]. Nevertheless, with SWT 3.8.0 this should be fixed and there is no mention of ~/.swt/lib/linux/x86 in your error logs, so your problem seems to have a different cause. Regards, Jakub [1] http://www.eclipsezone.com/eclipse/forums/t99010.html [2] http://anonscm.debian.org/gitweb/?p=pkg-java/swt-gtk.git;a=commit;h=c4fe7237fef825b2643993a7cf5e4b8cc1dc0285 __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#683930: eclipse: 3.8.0~rc4-1 exits with log error: Unable to acquire application
Hi, installation of Eclipse into a clean sid system works for me. As you say you got an error even when config is removed, I think it's a different local issue. Here are some tips for further investigation: 1. Try to run Eclipse with OpenJDK 6 to make sure it's not a problem specific to Oracle JRE. ~/.swt/lib/linux/x86 symlinks are not needed with 3.8.0, that was a different issue. 2. If possible, try to launch with a new clean user account, find out if there isn't still any configuration in your $HOME that prevents Eclipse from starting. 3. There might be some modified files in the installation, left by an (accidental) attempt to run Eclipse as root. Try purging the installation (removing libequinox-osgi-java should uninstall also all the eclipse packages). Make sure that /usr/lib/eclipse and /usr/share/eclipse are empty, delete any files still there. Then install everything back again. Regards, Jakub __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Re: sqljet_1.1.3-1_amd64.changes REJECTED
Hi Niels, I packaged new upstream of sqljet and addressed the problems found by FTP masters: On 28.7.2012 12:59, Luca Falavigna wrote: * sqljet-distribution/src/main/site/prettify.* lack source, they're minified stuff. Either provide the uncompressed form, or drop them from the tarball. Removed both files as they are not really needed for package build, in d/README.source I mentioned where to get the prettify sources in case anyone will want them. * d/README.Debian-source: this really should be d/README.source. The information is great, but README.source is the canonical location for this kind of stuff. Renamed. Could you, please, reupload the fixed package [1]? Regards, Jakub [1] http://anonscm.debian.org/gitweb/?p=pkg-java/sqljet.git __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[SCM] Debian packaging for swt-gtk. annotated tag, upstream/3.8.0_m7, created. upstream/3.8.0_m7
The annotated tag, upstream/3.8.0_m7 has been created at b0e2ccb1b7f7cfa173785830ed1e4e37c42773fe (tag) tagging f278035f346925fce76af5fc9530eb99f6abc326 (commit) replaces upstream/3.8.0_m6 tagged by Jakub Adam on Sun May 6 23:48:11 2012 +0200 - Shortlog Upstream version 3.8.0~m7 Jakub Adam (1): Imported Upstream version 3.8.0~m7 --- -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. annotated tag, upstream/3.8.0_m6, created. upstream/3.8.0_m6
The annotated tag, upstream/3.8.0_m6 has been created at 61b0a7f013e46f03758e557d7f382c68106e7f08 (tag) tagging c8e3541370c8ae9035a1053499bff0a6c3764dd6 (commit) replaces upstream/3.7.2 tagged by Jakub Adam on Sun Apr 29 13:42:36 2012 +0200 - Shortlog Upstream version 3.8.0~m6 Jakub Adam (1): Imported Upstream version 3.8.0~m6 --- -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m7-2-5-gb9725b4
The following commit has been merged in the master-3.8 branch: commit ad010d31bca35cd14eeea9a7c43a267cca8cc13f Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 27 13:51:29 2012 +0200 Updated d/changelog for new upstream release diff --git a/debian/changelog b/debian/changelog index bd46e8e..9635e84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -swt-gtk (3.8.0~m7-3) UNRELEASED; urgency=low +swt-gtk (3.8.0~rc2-1) UNRELEASED; urgency=low + [ Niels Thykier ] * Use breaks to ensure that the SWT JNI libraries are upgraded together with the Java package. * Add conflicts with older versions of SWT and its JNI libraries. @@ -8,7 +9,10 @@ swt-gtk (3.8.0~m7-3) UNRELEASED; urgency=low LP: #1000272) * Remove alternatives for /usr/share/java/swt.jar. - -- Niels Thykier ni...@thykier.net Thu, 24 May 2012 09:44:43 +0200 + [ Jakub Adam ] + * New upstream release. + + -- Jakub Adam jakub.a...@ktknet.cz Sun, 27 May 2012 13:49:43 +0200 swt-gtk (3.8.0~m7-2) experimental; urgency=low -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. annotated tag, upstream/3.8.0_rc2, created. upstream/3.8.0_rc2
The annotated tag, upstream/3.8.0_rc2 has been created at ebb6779b3f759fbac3f4bd8e12937df8cbc3ee6e (tag) tagging 629fa9276d34efb29083dcf17a73f049ea815a80 (commit) replaces upstream/3.8.0_m7 tagged by Jakub Adam on Sun May 27 13:47:35 2012 +0200 - Shortlog Upstream version 3.8.0~rc2 Jakub Adam (1): Imported Upstream version 3.8.0~rc2 --- -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. branch, pristine-tar, updated. 8c6f9e0955d9a9661872796e85a069263b5335d8
The following commit has been merged in the pristine-tar branch: commit 8c6f9e0955d9a9661872796e85a069263b5335d8 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 27 14:37:26 2012 +0200 pristine-tar data for swt-gtk_3.8.0~rc2.orig.tar.gz diff --git a/swt-gtk_3.8.0~rc2.orig.tar.gz.delta b/swt-gtk_3.8.0~rc2.orig.tar.gz.delta new file mode 100644 index 000..87ad884 Binary files /dev/null and b/swt-gtk_3.8.0~rc2.orig.tar.gz.delta differ diff --git a/swt-gtk_3.8.0~m7.orig.tar.gz.id b/swt-gtk_3.8.0~rc2.orig.tar.gz.id similarity index 100% copy from swt-gtk_3.8.0~m7.orig.tar.gz.id copy to swt-gtk_3.8.0~rc2.orig.tar.gz.id -- Debian packaging for swt-gtk. ___ 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 jakub.a...@ktknet.cz 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
[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 jakub.a...@ktknet.cz 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 efb53c547ca82b692fdf0e827ae1cdb295bf38e2 Author: Jakub Adam jakub.a...@ktknet.cz 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 plugin id=org.junit diff --git a/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF b/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF -index 5739663..aaf4678 100644 +index a20fb01..b5113fe 100644 --- a/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.junit4/META-INF/MANIFEST.MF -@@ -7,4 +7,4 @@ Bundle-Localization: plugin +@@ -7,5 +7,5 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName Require-Bundle: org.hamcrest.core;bundle-version=1.1.0;visibility:=reexport, - org.junit;bundle-version=4.8.1;visibility:=reexport + org.junit;bundle-version=4.7.0;visibility:=reexport + Eclipse-BundleShape: dir -- 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 jakub.a...@ktknet.cz 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 jakub.a...@ktknet.cz -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=false
[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 jakub.a...@ktknet.cz 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 f51dd94b85e7c71f8dc17a109224603c527da593 Author: Jakub Adam jakub.a...@ktknet.cz 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 e0461f02ae395c4e1f0733374b8ce1dc3550e8bd Author: Jakub Adam jakub.a...@ktknet.cz 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 jakub.a...@ktknet.cz +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 @@ + property name=launcherJar refid=equinoxLauncher/ + replace file=${efj} token=@LAUNCHER@ value=${prefix}/${libDir}/eclipse/plugins/${launcherJar}/ + !-- install icons -- +- copy file=${buildDirectory}/plugins/org.eclipse.platform/eclipse.png tofile=${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png / ++ copy file=${buildDirectory}/plugins/org.eclipse.platform/eclipse16.png tofile=${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png / + copy file=${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png tofile=${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png / + copy file=${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png tofile=${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png / ++ copy file=${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png tofile=${destDir}${prefix}/share/icons/hicolor/256x256/apps/eclipse.png / + mkdir dir=${destDir}${prefix}/share/pixmaps / + symlink link=${destDir}${prefix}/share/pixmaps/eclipse.png resource=../icons/hicolor/48x48/apps/eclipse.png overwrite=true/ + !--shared dropins folder for architecture-independent plugins-- 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 1f6f169e7e033564da4b3868bd1c6a10a9b1d085 Author: Jakub Adam jakub.a...@ktknet.cz 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, pristine-tar, updated. 4598e73c25c69f1431bf2f4bd5f1e02dababfd9d
The following commit has been merged in the pristine-tar branch: commit 4598e73c25c69f1431bf2f4bd5f1e02dababfd9d Author: Jakub Adam jakub.a...@ktknet.cz Date: Sat May 26 22:27:51 2012 +0200 pristine-tar data for eclipse_3.8.0~rc2.orig.tar.xz diff --git a/eclipse_3.8.0~rc2.orig.tar.xz.delta b/eclipse_3.8.0~rc2.orig.tar.xz.delta new file mode 100644 index 000..2c25d1c Binary files /dev/null and b/eclipse_3.8.0~rc2.orig.tar.xz.delta differ diff --git a/eclipse_3.8.0~rc2.orig.tar.xz.id b/eclipse_3.8.0~rc2.orig.tar.xz.id new file mode 100644 index 000..02941c5 --- /dev/null +++ b/eclipse_3.8.0~rc2.orig.tar.xz.id @@ -0,0 +1 @@ +418d89be256d0e2f448cf22604bf3df9a078bce2 -- 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. annotated tag, upstream/3.8.0_rc2, created. upstream/3.8.0_rc2
The annotated tag, upstream/3.8.0_rc2 has been created at 5a3244568af75bdfd50700f33f64a85b78c0972f (tag) tagging 878d902b1bfce8c35e2d19188543932d73bf14c2 (commit) replaces upstream/3.7-exp tagged by Jakub Adam on Sat May 26 12:29:53 2012 +0200 - Shortlog Upstream version 3.8.0 RC2 Benjamin Drung (3): Correct file permission. Remove unnecessary CVS directories. Import eclipse-build master branch (revision 1eb6f9eb from 2011-09-09). Jakub Adam (12): Imported eclipse-3.7.1-src.tar.bz2 tarball Import eclipse-build master branch (revision ee1a5caf from 2011-09-29). Import eclipse-build master branch (revision 8528bf3a from 2012-02-09) Imported eclipse-3.8.0-M5-src.tar.bz2 tarball Imported eclipse-3.8.0-I20120306-0800-src.tar.bz2 tarball Imported eclipse-build master branch (revision 64b3ab18 from 2012-03-15) Imported eclipse-3.8.0-I20120314-1800-src.tar.bz2 tarball Imported eclipse-build master branch (revision ad9174ad from 2012-03-16) Imported eclipse-3.8.0-I20120320-1400-src.tar.bz2 tarball Imported eclipse-build master branch (revision 6b26abde from 2012-03-22) Import eclipse-3.8.0-I20120502-2000-src.tar.bz2 Import eclipse-3.8.0-I20120525-1400-src.tar.bz2 --- -- 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
[pkg-java] r16067 - trunk/junit4/debian
Author: xhaakon-guest Date: 2012-05-25 22:03:17 + (Fri, 25 May 2012) New Revision: 16067 Modified: trunk/junit4/debian/MANIFEST.MF trunk/junit4/debian/changelog Log: Remove Bundle-ClassPath attribute from jar manifest Modified: trunk/junit4/debian/MANIFEST.MF === --- trunk/junit4/debian/MANIFEST.MF 2012-05-25 00:15:55 UTC (rev 16066) +++ trunk/junit4/debian/MANIFEST.MF 2012-05-25 22:03:17 UTC (rev 16067) @@ -45,7 +45,6 @@ Bundle-Vendor: JUnit Bundle-Version: 4.7.0 Bundle-Name: JUnit Testing Framework -Bundle-ClassPath: junit4.jar Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.junit Modified: trunk/junit4/debian/changelog === --- trunk/junit4/debian/changelog 2012-05-25 00:15:55 UTC (rev 16066) +++ trunk/junit4/debian/changelog 2012-05-25 22:03:17 UTC (rev 16067) @@ -1,3 +1,9 @@ +junit4 (4.10-2) UNRELEASED; urgency=low + + * Remove Bundle-ClassPath attribute from jar manifest. + + -- Jakub Adam jakub.a...@ktknet.cz Fri, 25 May 2012 22:58:42 +0200 + junit4 (4.10-1) unstable; urgency=low * New upstream release (Closes: #650662). ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r16068 - trunk/junit4/debian
Author: xhaakon-guest Date: 2012-05-25 22:09:20 + (Fri, 25 May 2012) New Revision: 16068 Modified: trunk/junit4/debian/changelog trunk/junit4/debian/control Log: Add Jakub Adam to Uploaders Modified: trunk/junit4/debian/changelog === --- trunk/junit4/debian/changelog 2012-05-25 22:03:17 UTC (rev 16067) +++ trunk/junit4/debian/changelog 2012-05-25 22:09:20 UTC (rev 16068) @@ -1,6 +1,7 @@ junit4 (4.10-2) UNRELEASED; urgency=low * Remove Bundle-ClassPath attribute from jar manifest. + * Add Jakub Adam to Uploaders. -- Jakub Adam jakub.a...@ktknet.cz Fri, 25 May 2012 22:58:42 +0200 Modified: trunk/junit4/debian/control === --- trunk/junit4/debian/control 2012-05-25 22:03:17 UTC (rev 16067) +++ trunk/junit4/debian/control 2012-05-25 22:09:20 UTC (rev 16068) @@ -4,7 +4,8 @@ Uploaders: Florian Weimer f...@deneb.enyo.de, Varun Hiremath va...@debian.org, Damien Raude-Morvan draz...@debian.org, - Ludovic Claude ludovic.cla...@laposte.net + Ludovic Claude ludovic.cla...@laposte.net, + Jakub Adam jakub.a...@ktknet.cz Priority: optional Build-Depends: ant, cdbs, debhelper (= 7), default-jdk Build-Depends-Indep: default-jdk-doc, ___ 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-15-g22b8033
The following commit has been merged in the master branch: commit 22b803382e706a2aa83175cb0aff1bd397665ca0 Author: Jakub Adam jakub.a...@ktknet.cz Date: Wed May 23 16:45:26 2012 +0200 Removed no longer required eclipse-mylyn.lintian-overrides diff --git a/debian/changelog b/debian/changelog index da22751..d55787c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ eclipse-mylyn (3.7.1-1) UNRELEASED; urgency=low * New upstream release. + * Removed no longer required eclipse-mylyn.lintian-overrides. -- Jakub Adam jakub.a...@ktknet.cz Sun, 25 Mar 2012 12:24:51 +0200 diff --git a/debian/eclipse-mylyn.lintian-overrides b/debian/eclipse-mylyn.lintian-overrides deleted file mode 100644 index 1800493..000 --- a/debian/eclipse-mylyn.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -eclipse-mylyn: codeless-jar usr/share/eclipse/dropins/mylyn/eclipse/plugins/org.eclipse.mylyn_*.jar -- eclipse-mylyn - Plug-in for eclipse - 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] jetty8 packaging branch, master, updated. debian/8.1.3-1-2-g48dcff9
The following commit has been merged in the master branch: commit 48dcff92cb5856d8f152f42ea34a37099911100a Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 21 16:36:50 2012 +0200 Fix a typo in binary package dependencies jstl1.1-java - libjstl1.1-java diff --git a/debian/changelog b/debian/changelog index b86d4bb..bbe7de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ jetty8 (8.1.3-2) UNRELEASED; urgency=low * Fix server startup when jsvc is not installed. + * Fix a typo in binary package dependencies (jstl1.1-java to +libjstl1.1-java) -- Jakub Adam jakub.a...@ktknet.cz Fri, 18 May 2012 20:11:19 +0200 diff --git a/debian/control b/debian/control index eacfa84..e407348 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,7 @@ Architecture: all Depends: ${misc:Depends}, libjetty8-java (= ${source:Version}), libtomcat7-java (= 7.0.26), libasm3-java, libgnujaf-java, libgnumail-java, libjakarta-taglibs-standard-java, libservlet3.0-java, - jstl1.1-java + libjstl1.1-java Suggests: jetty8 Description: Java servlet engine and webserver -- extra libraries Jetty is an Open Source HTTP Servlet Server written in 100% Java. -- jetty8 packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Re: Comments regarding jetty8_8.1.3-1_amd64.changes
Hi Luca, On 21.5.2012 11:14, Luca Falavigna wrote: Hi, you declare a dependency on jstl1.1-java, but I can't find any reference of it. Could you please check? sorry, my mistake. Dependency should be on libjstl1.1-java not jstl1.1-java. Niels, could you please upload the corrected version [1]? Regards, Jakub [1] http://anonscm.debian.org/gitweb/?p=pkg-java/jetty8.git;a=commit;h=48dcff92cb5856d8f152f42ea34a37099911100a __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[SCM] eclipse-anyedit packaging annotated tag, upstream/2.4.2, created. upstream/2.4.2
The annotated tag, upstream/2.4.2 has been created at f78ef55ee7a21287ed3dbd1989614139509daa0f (tag) tagging 2a292056030f038e50d3f1ec6e08a0ab7a4e4951 (commit) replaces upstream/2.4.1 tagged by Jakub Adam on Sun May 20 12:27:03 2012 +0200 - Shortlog Upstream version 2.4.2 Jakub Adam (1): Imported Upstream version 2.4.2 --- -- eclipse-anyedit packaging ___ 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-anyedit packaging branch, pristine-tar, updated. fd42532e6356df575831218ab030f360b60e2e27
The following commit has been merged in the pristine-tar branch: commit fd42532e6356df575831218ab030f360b60e2e27 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 20 12:33:05 2012 +0200 pristine-tar data for eclipse-anyedit_2.4.2.orig.tar.bz2 diff --git a/eclipse-anyedit_2.4.2.orig.tar.bz2.delta b/eclipse-anyedit_2.4.2.orig.tar.bz2.delta new file mode 100644 index 000..7e93670 Binary files /dev/null and b/eclipse-anyedit_2.4.2.orig.tar.bz2.delta differ diff --git a/eclipse-anyedit_2.4.2.orig.tar.bz2.id b/eclipse-anyedit_2.4.2.orig.tar.bz2.id new file mode 100644 index 000..c8f2188 --- /dev/null +++ b/eclipse-anyedit_2.4.2.orig.tar.bz2.id @@ -0,0 +1 @@ +3d249719012eee09409694c2a3573efafe670373 -- eclipse-anyedit packaging ___ 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-anyedit packaging branch, master, updated. debian/2.4.1-1-3-g1ca2cd6
The following commit has been merged in the master branch: commit 98a0282a528870237cb06ca63436e5cab618cb8a Merge: 7ec1d54b06fd55cb0b43ef895e069defff040acf 2a292056030f038e50d3f1ec6e08a0ab7a4e4951 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 20 12:27:03 2012 +0200 Merge tag 'upstream/2.4.2' Upstream version 2.4.2 -- eclipse-anyedit packaging ___ 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-anyedit packaging branch, master, updated. debian/2.4.1-1-3-g1ca2cd6
The following commit has been merged in the master branch: commit 1ca2cd6c47fa54836dc8280c64a718b810ecb61a Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 20 12:28:34 2012 +0200 Update d/changelog for new upstream release diff --git a/debian/changelog b/debian/changelog index 2a26f67..ab303cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +eclipse-anyedit (2.4.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Jakub Adam jakub.a...@ktknet.cz Sun, 20 May 2012 12:28:02 +0200 + eclipse-anyedit (2.4.1-1) unstable; urgency=low * New upstream release. -- eclipse-anyedit packaging ___ 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-linuxtools packaging branch, master, updated. upstream/0.10.0-18-g139d538
The following commit has been merged in the master branch: commit 139d5386986c1cef237e0c534b99b940c980539a Author: Jakub Adam jakub.a...@ktknet.cz Date: Sat May 19 18:36:52 2012 +0200 Add d/watch diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..1daaf22 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/refs/tags .*org\.eclipse\.linuxtools-(\d+\.\d+\.\d+).tar.gz -- eclipse-linuxtools packaging ___ 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-linuxtools packaging branch, master, updated. upstream/0.10.0-19-g5f56d8e
The following commit has been merged in the master branch: commit 5f56d8e7fa6fb513270013025475675f71df5af0 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sat May 19 18:55:40 2012 +0200 d/control: Set Section to devel diff --git a/debian/control b/debian/control index 473f93e..664a453 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: eclipse-linuxtools -Section: java +Section: devel Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Jakub Adam jakub.a...@ktknet.cz -- eclipse-linuxtools packaging ___ 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] jetty8 packaging branch, master, updated. debian/8.1.3-1-1-gd257a44
The following commit has been merged in the master branch: commit d257a447731202cecc0921ad7b68e369d721728f Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri May 18 20:12:49 2012 +0200 Fix server startup when jsvc is not installed diff --git a/debian/changelog b/debian/changelog index 4ddc53e..b86d4bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jetty8 (8.1.3-2) UNRELEASED; urgency=low + + * Fix server startup when jsvc is not installed. + + -- Jakub Adam jakub.a...@ktknet.cz Fri, 18 May 2012 20:11:19 +0200 + jetty8 (8.1.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/jetty8.init b/debian/jetty8.init index 8ba13ca..b8483f5 100644 --- a/debian/jetty8.init +++ b/debian/jetty8.init @@ -69,7 +69,6 @@ JETTY_HOME=/usr/share/$NAME LOGDIR=/var/log/$NAME START_JAR=$JETTY_HOME/start.jar DEFAULT=/etc/default/$NAME -DAEMON=/usr/bin/jsvc JVM_TMP=/var/cache/$NAME/tmp if [ `id -u` -ne 0 ]; then @@ -155,8 +154,6 @@ if [ ! -r $START_JAR ]; then exit 1 fi -[ -f $DAEMON ] || exit 0 - # Check whether startup has been disabled if [ $NO_START != 0 -a $1 != stop ]; then [ $VERBOSE != no ] log_failure_msg Not starting jetty - edit /etc/default/jetty8 and change NO_START to be 0 (or comment it out). -- jetty8 packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
Re: jetty8 misses dependency on jsvc
Hi Thomas, On 18.5.2012 18:35, Thomas Koch wrote: thank you for jetty8. I built the package from your latest git tag. There's no dependency on jsvc. jsvc dependency was removed in jetty8, but I missed to delete the check for /usr/bin/jsvc existence from init script. Thanks for reporting this, I pushed a fix into git[1] and it will be corrected in the next upload. Regards, Jakub [1] http://anonscm.debian.org/gitweb/?p=pkg-java/jetty8.git;a=commit;h=d257a447731202cecc0921ad7b68e369d721728f __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#670756: Tuxguitar does not start
Hi Tony, On 16.5.2012 17:01, tony mancill wrote: In any event, I'm still able to run tuxguitar on sid with both 3.5 and 3 packages installed, so I'm not convinced we've ironed out the precise cause of the bug. Ok, I will try to describe it more thoroughly: The direct cause of crash is that required JNI library libswt-cairo-gtk-3555.so (from package libswt-cairo-gtk-3.5-jni) is not installed when it has to be. On a clean system where neither SWT nor tuxguitar is installed we can get into this situation with following sequence of events: (1) Install tuxguitar: $ apt-get install tuxguitar Reading package lists... Done Building dependency tree Reading state information... Done The following extra packages will be installed: libswt-cairo-gtk-3-jni libswt-gtk-3-java Suggested packages: libswt-gtk-3-java-gcj tuxguitar-jsa lilypond Recommended packages: tuxguitar-alsa tuxguitar-oss The following NEW packages will be installed: libswt-cairo-gtk-3-jni libswt-gtk-3-java tuxguitar 0 upgraded, 3 newly installed, 0 to remove and 15 not upgraded. ... Setting up libswt-gtk-3-java (3.7.2-2) ... update-alternatives: using /usr/share/java/swt-gtk-3.7.jar to provide /usr/share/java/swt.jar (swt.jar) in auto mode. ... Now we have libswt-gtk-3-java, libswt-cairo-gtk-3-jni and /usr/share/java/swt.jar is provided by swt-gtk-3.7.jar. So far good, we can successfully launch tuxguitar and it will use SWT 3.7 (2) Now let's add libswt-gtk-3.5-java to the installation $ apt-get install libswt-gtk-3.5-java Reading package lists... Done Building dependency tree Reading state information... Done The following extra packages will be installed: libswt-gtk-3.5-jni Suggested packages: libswt-gtk-3.5-java-gcj libswt-gnome-gtk-3.5-jni The following NEW packages will be installed: libswt-gtk-3.5-java libswt-gtk-3.5-jni 0 upgraded, 2 newly installed, 0 to remove and 15 not upgraded. ... We have libswt-gtk-3.5-java installed, *BUT NOT* libswt-cairo-gtk-3.5-jni and /usr/share/java/swt.jar is symlinked to swt-gtk-3.5.1.jar. When you now try to start tuxguitar, it will use SWT 3.5 and crashes with exception we already know from Grant: Exception in thread main org.eclipse.swt.SWTException: Unable to load graphics library [Cairo is required] (java.lang.UnsatisfiedLinkError: no swt-cairo-gtk-3555 or swt-cairo-gtk in swt.library.path, java.library.path or the jar file) (3) To fix this, we can manually install libswt-cairo-gtk-3.5-jni. Then tuxguitar finally runs also with SWT 3.5 - this is most probably your (Tony's) situation, when you have both SWTs and application is working: ||/ NameVersion Description +++-===-===- ii libswt-cairo-gtk-3-jni 3.7.2-2 Standard Widget Toolkit for GTK+ Cairo JNI library ii libswt-cairo-gtk-3.5-jni3.5.1-2.1 Standard Widget Toolkit for GTK+ Cairo JNI library un libswt-gnome-gtk-3-jni none (no description available) un libswt-gnome-gtk-3.5-jninone (no description available) ii libswt-gtk-3-java 3.7.2-2 Standard Widget Toolkit for GTK+ Java library un libswt-gtk-3-java-gcj none (no description available) ii libswt-gtk-3-jni3.7.2-2 Standard Widget Toolkit for GTK+ JNI library ii libswt-gtk-3.5-java 3.5.1-2.1 Standard Widget Toolkit for GTK+ Java library un libswt-gtk-3.5-java-gcj none (no description available) ii libswt-gtk-3.5-jni 3.5.1-2.1 Standard Widget Toolkit for GTK+ JNI library ii libswt-webkit-gtk-3-jni 3.7.2-2 Standard Widget Toolkit for GTK+ WebKit JNI library It's that tuxguitar sometimes needs libswt-cairo-gtk-3.5-jni, but it's not depending on it in any way. Do you see where is the problem now or did I confuse you even more? :) So I think we would have to change its Depends to something like: Depends: libswt-gtk-3-java | libswt-gtk-3.5-java, libswt-cairo-gtk-3-jni | libswt-cairo-gtk-3.5-jni, ... etc That change to depends won't have the desired effect. All that expresses is either libswt-gtk-3-java or libswt-gtk-3.5-java or both which is what we are trying to avoid. I believe you want to express an exclusive (XOR) in there - one or other, but not both. You are right, my change is not sufficient. XOR might work, but I'm not sure if this can be expressed in Depends. When you say get rid of the alternatives, I'm not sure what you mean. Tuxguitar only lists the following swt dependencies: libswt-gtk-3-java, libswt-cairo-gtk-3-jni, and libswt-webkit-gtk-3-jni. It sounds like we might be back to conflicting with
Bug#670756: Tuxguitar does not start
On 15.5.2012 07:52, Niels Thykier wrote: On 2012-05-15 06:38, tony mancill wrote: On 05/14/2012 08:18 AM, Jakub Adam wrote: In my opinion libswt-gtk-3.5-java and libswt-3-gtk-java are not in conflict, generally it's ok to have them installed both. The problem is in tuxguitar package itself which will not work with SWT 3.5. So I suggest that we make tuxguitar to conflict with libswt-gtk-3.5-java (and maybe also with libswt-gtk-3.4-java and libswt-gtk-3.6-java I see in Grant's package list too). Hi Jakub, There are times in the past when tuxguitar explicitly depended on libswt-gtk-3.5-jar, so it seems odd to say that tuxguitar won't work with it. What seems to be the case is that tuxguitar won't work when both -3.5 and -3 packages are install. Sorry, I was wrong with my statement. I thought libswt-cairo-gtk-3555.so was for some reason not built in swt-gtk 3.5, but I missed it is packaged separately in libswt-cairo-gtk-3.5-jni. I believe that swt uses alternatives for the swt.jar, so if you have an older version of libswt-*-java providing the alternative without (all) the relevant -jni package = boom. Now that should not be possible to do, but it is... un libswt-gnome-gtk-3.5-jninone [...] un libswt-gnome-gtk-3.6-jninone [...] [...] ii libswt-gtk-3.5-java 3.5.1-5 [...] ii libswt-gtk-3.6-java 3.6.2-1 [...] Presumably the dependency relations on the old -jni packages (or on the old -java packages) are not strong enough. I'd like to note that even the most recent libswt-gtk-3-java doesn't have a strong dependency on all its -jni packages. For example libswt-cairo-gtk-3-jni is neither a dependency nor a suggestion in any other package created from swt-gtk (except -gcj which is not relevant in this case I suppose). If it was meant to be changed in the past, presumably it wasn't done. I don't think this is something wrong, as it allows to install only what is really needed, as long as applications list all the -jni packages they require. Tuxguitar does this, but only for libswt-gtk-3-java and doesn't expect that any alternative can be present, therefore it may crash. So I think we would have to change its Depends to something like: Depends: libswt-gtk-3-java | libswt-gtk-3.5-java, libswt-cairo-gtk-3-jni | libswt-cairo-gtk-3.5-jni, ... etc ... or get rid of the alternatives. Personally, I think the swt alternatives is... weird at best. So I would vote for breaking the old packages to force their removal and then remove the usage of alternatives in Wheezy+1. I support this __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
Bug#670756: Tuxguitar does not start
In my opinion libswt-gtk-3.5-java and libswt-3-gtk-java are not in conflict, generally it's ok to have them installed both. The problem is in tuxguitar package itself which will not work with SWT 3.5. So I suggest that we make tuxguitar to conflict with libswt-gtk-3.5-java (and maybe also with libswt-gtk-3.4-java and libswt-gtk-3.6-java I see in Grant's package list too). On 14.5.2012 06:08, Grant Diffey wrote: so my installed package list is nevyn@cetacea:~$ dpkg -l libswt* Desired=Unknown/Install/Remove/Purge/Hold | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad) ||/ NameVersion Description +++-===-===-== ii libswt-cairo-gtk-3-jni 3.7.2-2 Standard Widget Toolkit for GTK+ Cairo JNI library ii libswt-glx-gtk-3-jni3.7.2-2 Standard Widget Toolkit for GTK+ GLX JNI library ii libswt-gnome-gtk-3-jni 3.7.2-2 Standard Widget Toolkit for GTK+ GNOME JNI library un libswt-gnome-gtk-3.5-jni none (no description available) un libswt-gnome-gtk-3.6-jni none (no description available) ii libswt-gtk-3-java 3.7.2-2 Standard Widget Toolkit for GTK+ Java library un libswt-gtk-3-java-gcj none (no description available) ii libswt-gtk-3-jni3.7.2-2 Standard Widget Toolkit for GTK+ JNI library un libswt-gtk-3.4-java none (no description available) un libswt-gtk-3.4-jni none (no description available) ii libswt-gtk-3.5-java 3.5.1-5 Standard Widget Toolkit for GTK+ Java library un libswt-gtk-3.5-java-gcj none (no description available) ii libswt-gtk-3.5-jni 3.5.1-5 Standard Widget Toolkit for GTK+ JNI library ii libswt-gtk-3.6-java 3.6.2-1 Standard Widget Toolkit for GTK+ Java library un libswt-gtk-3.6-java-gcj none (no description available) ii libswt-gtk-3.6-jni 3.6.2-1 Standard Widget Toolkit for GTK+ JNI library ii libswt-webkit-gtk-3-jni 3.7.2-2 Standard Widget Toolkit for GTK+ WebKit JNI library un libswt3.2-gtk-gcj none (no description available) un libswt3.2-gtk-java none (no description available) un libswt3.2-gtk-jni none (no description available) so yes ii libswt-gtk-3.5-jni 3.5.1-5 Standard Widget Toolkit for GTK+ JNI library is installed. if this breaks with the new version of libswt-3-gtk-java should it not conflict? __ This is the maintainer address of Debian's Java team http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers. Please use debian-j...@lists.debian.org for discussions and questions.
[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-14-gfee850c
The following commit has been merged in the master branch: commit fee850c37891effc3f80ec8bd499859489c3ecb4 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Apr 2 20:51:43 2012 +0200 Update build dependences Add libhttpclient-java. diff --git a/debian/control b/debian/control index 4b4735d..3ec2416 100644 --- a/debian/control +++ b/debian/control @@ -16,9 +16,12 @@ Build-Depends: debhelper (= 8~), libcommons-lang-java, libgnumail-java (= 1.1.2-6), libgoogle-gson-java, + libhttpclient-java (= 4.1.1-2), + libhttpcore-java (= 4.1.4-2), libjaxme-java (= 0.5.2+dfsg-6), libjaxp1.3-java (= 1.3.05-2), libjdom1-java (= 1.1.2+dfsg-2), + libjsoup-java (= 1.6.2), librome-java (= 1.0-3), libws-commons-util-java, libwsdl4j-java (= 1.6.2-4), -- eclipse-mylyn - Plug-in for eclipse - 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] jetty8 packaging branch, master, updated. upstream/8.1.3-20-g61d813f
The following commit has been merged in the master branch: commit 61d813fb322394117561f22ee3a5ccc41f9021b8 Author: Jakub Adam jakub.a...@ktknet.cz Date: Thu May 10 15:05:45 2012 +0200 d/libjetty8-java.poms: removed POMs not needed in build diff --git a/debian/libjetty8-java.poms b/debian/libjetty8-java.poms index 1120437..90ad63a 100644 --- a/debian/libjetty8-java.poms +++ b/debian/libjetty8-java.poms @@ -6,12 +6,6 @@ jetty-security/pom.xml --java-lib --usj-name=jetty8-security jetty-server/pom.xml --java-lib --usj-name=jetty8-server jetty-jndi/pom.xml --ignore-pom jetty-xml/pom.xml --java-lib --usj-name=jetty8-xml -jetty-aggregate/jetty-webapp/pom.xml -jetty-aggregate/jetty-server/pom.xml -jetty-aggregate/jetty-all/pom.xml -jetty-aggregate/jetty-all-server/pom.xml -jetty-aggregate/jetty-client/pom.xml -jetty-aggregate/jetty-plus/pom.xml --ignore-pom jetty-aggregate/pom.xml jetty-aggregate/jetty-websocket/pom.xml --java-lib --usj-name=jetty8-websocket jetty-aggregate/jetty-servlet/pom.xml --java-lib --usj-name=jetty8-servlet -- jetty8 packaging ___ 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] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m7-1-1-gf788ff6
The following commit has been merged in the master-3.8 branch: commit f788ff6f7ca673f881b7efaf6e37a4c3f9fa0437 Author: Jakub Adam jakub.a...@ktknet.cz Date: Thu May 10 01:59:56 2012 +0200 d/rules: Fix build on 64-bit platforms diff --git a/debian/changelog b/debian/changelog index 279ca7c..09de681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +swt-gtk (3.8.0~m7-2) UNRELEASED; urgency=low + + * Fix build on 64-bit platforms. + + -- Jakub Adam jakub.a...@ktknet.cz Thu, 10 May 2012 01:58:43 +0200 + swt-gtk (3.8.0~m7-1) experimental; urgency=low [ Jakub Adam ] diff --git a/debian/rules b/debian/rules index 5577aef..ec4e5ec 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,7 @@ DEB_PATCHDIRS = debian/patches/common BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) ifeq (64,$(BITS)) -DEB_PATCHDIES += debian/patches/64 +DEB_PATCHDIRS += debian/patches/64 endif # Must be included after setting DEB_PATCHDIRS -- Debian packaging for swt-gtk. ___ 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-29-gf947ab6
The following commit has been merged in the master-3.8 branch: commit d898e58d4cd9095f6dcafbc8a4b0de9ebb4a839d Merge: 6a83b2089f764faa68f9658ea8754a7bb302f911 2f2a6eb1434a29990ea303c7e230f61f1e435892 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 6 17:40:20 2012 +0200 Merge branch 'upstream-3.8' into master-3.8 -- 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-29-gf947ab6
The following commit has been merged in the master-3.8 branch: commit fc3507503b695979d5e8c072a16e6134086901bf Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 6 16:34:06 2012 +0200 Refreshed d/patches/jdt-junit4-fix.patch diff --git a/debian/patches/jdt-junit4-fix.patch b/debian/patches/jdt-junit4-fix.patch index 3465d9e..5c11633 100644 --- a/debian/patches/jdt-junit4-fix.patch +++ b/debian/patches/jdt-junit4-fix.patch @@ -48,14 +48,14 @@ 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 615989e..aa3bbd6 100644 +index 4a5fcd5..aa3bbd6 100644 --- a/eclipse/features/org.eclipse.jdt/feature.xml +++ b/eclipse/features/org.eclipse.jdt/feature.xml @@ -160,7 +160,7 @@ id=org.junit download-size=0 install-size=0 -- version=4.8.2.qualifier/ +- version=4.10.0.qualifier/ + version=4.7.0/ plugin -- 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-29-gf947ab6
The following commit has been merged in the master-3.8 branch: commit 119550b7bb50f2eb60f7b6f0f8b882b995dd28c3 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 6 18:13:46 2012 +0200 Regenerated d/eclipse-build-generatedScripts.tar.bz2 diff --git a/debian/eclipse-build-generatedScripts.tar.bz2 b/debian/eclipse-build-generatedScripts.tar.bz2 index 635bdf5..9be44da 100644 Binary files a/debian/eclipse-build-generatedScripts.tar.bz2 and b/debian/eclipse-build-generatedScripts.tar.bz2 differ -- 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-29-gf947ab6
The following commit has been merged in the master-3.8 branch: commit f947ab68a8ab313185410accd6f54dba28593783 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 6 23:22:55 2012 +0200 Updated d/changelog diff --git a/debian/changelog b/debian/changelog index 65a2b58..2843e0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -eclipse (3.8.0~I20120320-1400-1) UNRELEASED; urgency=low +eclipse (3.8.0~I20120502-2000-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-29-gf947ab6
The following commit has been merged in the master-3.8 branch: commit dbae46b530244b40eba2ed2ae46940028510cb6f Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun May 6 23:21:21 2012 +0200 Refreshed d/patches for new upstream tarball diff --git a/debian/patches/arch-dont-copy-removed-about-files.patch b/debian/patches/arch-dont-copy-removed-about-files.patch new file mode 100644 index 000..9dc91e7 --- /dev/null +++ b/debian/patches/arch-dont-copy-removed-about-files.patch @@ -0,0 +1,22 @@ +From: Jakub Adam jakub.a...@ktknet.cz +Date: Sun, 6 May 2012 16:41:33 +0200 +Subject: arch-dont-copy-removed-about-files + +--- + build.xml |3 --- + 1 file changed, 3 deletions(-) + +diff --git a/build.xml b/build.xml +index f99abfa..4fce261 100644 +--- a/build.xml b/build.xml +@@ -288,9 +288,6 @@ + include name=*@{newArch}/**/*.* / + excludesfile name=${buildDirectory}/plugins/rename.sh / + /replace +- copy todir=${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.@{newArch}/ +- fileset dir=${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.@{archBase}/ +- /copy + mkdir dir=${buildDirectory}/features/ / + /sequential + /macrodef diff --git a/debian/patches/bump-ant-version.patch b/debian/patches/bump-ant-version.patch new file mode 100644 index 000..2caa5df --- /dev/null +++ b/debian/patches/bump-ant-version.patch @@ -0,0 +1,84 @@ +From: Benjamin Drung bdr...@ubuntu.com +Date: Thu, 15 Mar 2012 20:03:39 +0100 +Subject: bump-ant-version + +--- + dependencies/nonosgidependencies.properties| 56 ++-- + .../META-INF/MANIFEST.MF |2 +- + 2 files changed, 29 insertions(+), 29 deletions(-) + +diff --git a/dependencies/nonosgidependencies.properties b/dependencies/nonosgidependencies.properties +index 727a944..42e73b9 100644 +--- a/dependencies/nonosgidependencies.properties b/dependencies/nonosgidependencies.properties +@@ -1,29 +1,29 @@ +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-apache-xalan2.jar=/usr/share/java/ant/ant-apache-xalan2.jar:/usr/share/java/ant-apache-xalan2.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar +-#org.apache.ant_1.8.3.v20120316-1400/lib/ant-jai.jar=/usr/share/java/ant/ant-jai.jar:/usr/share/java/ant-jai.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jmf.jar=/usr/share/java/ant/ant-jmf.jar:/usr/share/java/ant-jmf.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-junit4.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar +-#org.apache.ant_1.8.3.v20120316-1400/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar +-org.apache.ant_1.8.3.v20120316-1400/lib/ant.jar=/usr/share/java/ant.jar ++org.apache.ant_1.8.3
[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.7.2-1-31-gafa171a
The following commit has been merged in the master-3.8 branch: commit afa171a7df07442f077fac276801d621d37b00bd Merge: f947ab68a8ab313185410accd6f54dba28593783 e4b7e366a40369ff09287cca44e52eb1384b162c Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 7 14:11:27 2012 +0200 Merge branch 'master' into master-3.8 diff --combined debian/changelog index 2843e0e,78a4490..55289d4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,11 +1,12 @@@ -eclipse (3.7.2-2) UNRELEASED; urgency=low +eclipse (3.8.0~I20120502-2000-1) UNRELEASED; urgency=low + * New upstream release. * Fix generation of Eclipse Help search index (Closes: #669000). * Remove Gnome libraries from Build-Depends. + * Improve extended descriptions of binary packages and fix grammar + errors (Closes: #664704, #664708). - -- Jakub Adam jakub.a...@ktknet.cz Tue, 17 Apr 2012 19:04:43 +0200 + -- Jakub Adam jakub.a...@ktknet.cz Sat, 24 Mar 2012 20:13:55 +0100 eclipse (3.7.2-1) unstable; urgency=low diff --combined debian/control index 2876a51,9dbe10a..5d2c830 --- a/debian/control +++ b/debian/control @@@ -16,18 -16,19 +16,18 @@@ Build-Depends: ant (= 1.8.2) junit4 (= 4.7-3), libasm3-java (= 3.3), 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), libgtk2.0-dev, libhamcrest-java (= 1.1-8~), libicu4j-4.4-java (= 4.4.2.2), libjasper-java (= 5.5.33-2), - 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), - libswt-gtk-3-java (= 3.7.1-2), + libservlet3.0-java, + libswt-gtk-3-java (= 3.8.0~m6), lsb-release, maven-ant-helper, maven-repo-helper, @@@ -37,6 -38,7 +37,6 @@@ sat4j ( 2.4.0), unzip, zip -Build-Conflicts: xulrunner-dev Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/git/pkg-java/eclipse.git @@@ -60,7 -62,7 +60,7 @@@ Description: Extensible Tool Platform a and both user and programmer documentation. Package: eclipse-jdt -Architecture: any +Architecture: all Depends: default-jre | java5-runtime | java6-runtime, eclipse-platform (= ${source:Version}), junit (= 3.8.2-4), @@@ -82,7 -84,7 +82,7 @@@ Description: Eclipse Java Development T debugger, and many more features. Package: eclipse-pde -Architecture: any +Architecture: all Depends: default-jre | java5-runtime | java6-runtime, eclipse-jdt (= ${binary:Version}), eclipse-platform (= ${source:Version}), @@@ -141,9 -143,9 +141,9 @@@ Description: Eclipse platform without d builders to independently develop tools that integrate with other people's tools so seamlessly you can't tell where one tool ends and another starts. . - This package provides the Eclipse Platform and is the base for all eclipse - plug-ins, but it does not include any development plug-ins. These are available - in different packages, for example: + This package provides the Eclipse Platform and is the base for all Eclipse + development plug-ins, but it does not include any. These are available in + different packages, for example: . * eclipse-jdt Java Development Tools * eclipse-pde Plug-in Development Tools @@@ -203,8 -205,8 +203,8 @@@ Description: Eclipse Rich Client Platfo builders to independently develop tools that integrate with other people's tools so seamlessly you can't tell where one tool ends and another starts. . - This package includes Eclipse Rich Client Platform (RCP), which is the basis - upon other Eclipse-based applications are built. + This package includes the Eclipse Rich Client Platform (RCP), the basis upon + which Eclipse RCP applications are built. Package: libequinox-osgi-java Architecture: all -- 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] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-5-g9a18b63
The following commit has been merged in the master-3.8 branch: commit f8b78a23033acaa228818160ad33a835b4700c8d Merge: 7b600c40276f87103d860227d4995cd8f1ac33d2 f278035f346925fce76af5fc9530eb99f6abc326 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 7 00:02:52 2012 +0200 Merge branch 'upstream-3.8' into master-3.8 -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-5-g9a18b63
The following commit has been merged in the master-3.8 branch: commit 4fc6f5e25e0a504aeb876b26a92fd95189cc72b1 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 7 00:07:51 2012 +0200 Updated d/changelog diff --git a/debian/changelog b/debian/changelog index e6dae6c..c948adc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low + + * New upstream release. + * Updated arch64.diff patch for new upstream release. + + -- Jakub Adam jakub.a...@ktknet.cz Mon, 07 May 2012 00:05:05 +0200 + swt-gtk (3.8.0~m6-1) experimental; urgency=low * New upstream release. -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. branch, master-3.8, updated. debian/3.8.0-m6-1-5-g9a18b63
The following commit has been merged in the master-3.8 branch: commit 9a18b63290c2aa4d18234ac31486c2cd9ba3f124 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 7 00:33:16 2012 +0200 Updated 01-as-needed.diff patch for new upstream release diff --git a/debian/changelog b/debian/changelog index c948adc..d1bd44c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ swt-gtk (3.8.0~m7-1) UNRELEASED; urgency=low * New upstream release. * Updated arch64.diff patch for new upstream release. + * Updated 01-as-needed.diff patch for new upstream release. -- Jakub Adam jakub.a...@ktknet.cz Mon, 07 May 2012 00:05:05 +0200 diff --git a/debian/patches/common/01-as-needed.diff b/debian/patches/common/01-as-needed.diff index a5f8bb0..602c4c1 100644 --- a/debian/patches/common/01-as-needed.diff +++ b/debian/patches/common/01-as-needed.diff @@ -66,16 +66,16 @@ Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346 xpcom.o: xpcom.cpp $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -241,7 +241,7 @@ - make_xulrunner:$(XULRUNNER_LIB) +@@ -242,7 +242,7 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) + echo -e #includestdlib.h\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n} | gcc --shared -xc - -o libswt-xulrunner-fix.so - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) -Wl,--as-needed ${XULRUNNER_LIBS} xpcomxul.o: xpcom.cpp $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp -@@ -261,7 +261,7 @@ +@@ -262,7 +262,7 @@ make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) @@ -84,7 +84,7 @@ Forwarded: https://bugs.eclipse.org/bugs/show_bug.cgi?id=350346 xpcominit.o: xpcominit.cpp $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -295,7 +295,7 @@ +@@ -296,7 +296,7 @@ make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS) -- Debian packaging for swt-gtk. ___ 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] Debian packaging for swt-gtk. branch, pristine-tar, updated. 737b23959e51611a35bdc988399c3601c26c7b49
The following commit has been merged in the pristine-tar branch: commit 737b23959e51611a35bdc988399c3601c26c7b49 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon May 7 00:40:27 2012 +0200 pristine-tar data for swt-gtk_3.8.0~m7.orig.tar.gz diff --git a/swt-gtk_3.8.0~m7.orig.tar.gz.delta b/swt-gtk_3.8.0~m7.orig.tar.gz.delta new file mode 100644 index 000..1f48d3f Binary files /dev/null and b/swt-gtk_3.8.0~m7.orig.tar.gz.delta differ diff --git a/swt-gtk_3.8.0~m7.orig.tar.gz.id b/swt-gtk_3.8.0~m7.orig.tar.gz.id new file mode 100644 index 000..6fce45a --- /dev/null +++ b/swt-gtk_3.8.0~m7.orig.tar.gz.id @@ -0,0 +1 @@ +cf11f887a460e43065a8bf1a5eb848c7685b5158 -- Debian packaging for swt-gtk. ___ 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] jetty8 packaging annotated tag, upstream/8.1.3, created. upstream/8.1.3
The annotated tag, upstream/8.1.3 has been created at 06a8b7c6b1afd38e7df5329281726478ef57ec59 (tag) tagging c3badcad689b273f3b98d9c6bb7e6b50448e0560 (commit) replaces upstream/8.1.1 tagged by Jakub Adam on Tue May 1 12:31:41 2012 +0200 - Shortlog Upstream version 8.1.3 Jakub Adam (1): Imported Upstream version 8.1.3 --- -- jetty8 packaging ___ 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] jetty8 packaging branch, master, updated. upstream/8.1.3-17-g6045f5e
The following commit has been merged in the master branch: commit e07109bb25592b5a9063ce8a1dc0343b8107147e Merge: 58cfd7920f480c5f1051e892be65f3211bd9d0d1 c3badcad689b273f3b98d9c6bb7e6b50448e0560 Author: Jakub Adam jakub.a...@ktknet.cz Date: Tue May 1 12:31:41 2012 +0200 Merge tag 'upstream/8.1.3' Upstream version 8.1.3 diff --combined .gitignore index cf31ba2,815d296..0384034 --- a/.gitignore +++ b/.gitignore @@@ -12,6 -12,7 +12,6 @@@ target *.log *.swp *.diff -*.patch # intellij *.iml @@@ -37,3 -38,4 +37,4 @@@ #maven *.versionsBackup + *.releaseBackup -- jetty8 packaging ___ 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] jetty8 packaging branch, master, updated. upstream/8.1.3-17-g6045f5e
The following commit has been merged in the master branch: commit 6045f5ee2ceb61c7369fc08bee27aa89b8d8c7fe Author: Jakub Adam jakub.a...@ktknet.cz Date: Tue May 1 12:32:34 2012 +0200 Updated d/changelog for new upstream release diff --git a/debian/changelog b/debian/changelog index 9aef56d..6933fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jetty8 (8.1.1-1) UNRELEASED; urgency=low +jetty8 (8.1.3-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.3. -- jetty8 packaging ___ 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] jetty8 packaging branch, pristine-tar, created. b9f0b609a7638ce92c9fa0c62fe64b4d824d8285
The branch, pristine-tar has been created at b9f0b609a7638ce92c9fa0c62fe64b4d824d8285 (commit) - Shortlog commit b9f0b609a7638ce92c9fa0c62fe64b4d824d8285 Author: Jakub Adam jakub.a...@ktknet.cz Date: Tue May 1 12:37:06 2012 +0200 pristine-tar data for jetty8_8.1.3.orig.tar.gz commit 0f21ce2cd80211909b7cb9f2659b3b465427b7e2 Author: Jakub Adam jakub.a...@ktknet.cz Date: Thu Apr 12 23:22:38 2012 +0200 pristine-tar data for jetty8_8.1.1.orig.tar.gz --- -- jetty8 packaging ___ 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] jetty8 packaging branch, master, updated. upstream/8.1.3-19-g8e16ed7
The following commit has been merged in the master branch: commit 895ce626f7d0f6996798e3fcd7809548a1d4ed84 Author: Jakub Adam jakub.a...@ktknet.cz Date: Tue May 1 13:32:58 2012 +0200 Remove useless d/libjetty8-extra-java.dirs diff --git a/debian/libjetty8-extra-java.dirs b/debian/libjetty8-extra-java.dirs deleted file mode 100644 index 726d83f..000 --- a/debian/libjetty8-extra-java.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/jetty8/lib/ext -- jetty8 packaging ___ 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] jetty8 packaging branch, master, updated. upstream/8.1.3-19-g8e16ed7
The following commit has been merged in the master branch: commit 8e16ed75d61ba57323424d64a4cfa5e72056b902 Author: Jakub Adam jakub.a...@ktknet.cz Date: Tue May 1 13:38:40 2012 +0200 Fix lintian warning init.d-script-does-not-provide-itself diff --git a/debian/jetty8.init b/debian/jetty8.init index 365b845..8ba13ca 100644 --- a/debian/jetty8.init +++ b/debian/jetty8.init @@ -4,9 +4,10 @@ # # Written by Philipp Meier me...@meisterbohne.de # Modified for Jetty 6 by Ludovic Claude ludovic.cla...@laposte.net +# Modified for Jetty 8 by Jakub Adam jakub.a...@ktknet.cz # ### BEGIN INIT INFO -# Provides: jetty +# Provides: jetty8 # Required-Start:$local_fs $remote_fs $network # Required-Stop: $local_fs $remote_fs $network # Should-Start: $named -- jetty8 packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r16026 - in trunk/bnd/debian: . patches
Author: xhaakon-guest Date: 2012-04-30 18:15:40 + (Mon, 30 Apr 2012) New Revision: 16026 Added: trunk/bnd/debian/patches/find_swt_jar.diff Modified: trunk/bnd/debian/changelog trunk/bnd/debian/patches/series trunk/bnd/debian/rules Log: Fix FTBFS after update to eclipse 3.7.2-1 Modified: trunk/bnd/debian/changelog === --- trunk/bnd/debian/changelog 2012-04-30 13:15:43 UTC (rev 16025) +++ trunk/bnd/debian/changelog 2012-04-30 18:15:40 UTC (rev 16026) @@ -1,3 +1,9 @@ +bnd (1.50.0-4) UNRELEASED; urgency=low + + * Fix FTBFS after update to eclipse 3.7.2-1 (Closes: #669533). + + -- Jakub Adam jakub.a...@ktknet.cz Mon, 30 Apr 2012 19:42:26 +0200 + bnd (1.50.0-3) unstable; urgency=low * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548). Added: trunk/bnd/debian/patches/find_swt_jar.diff === --- trunk/bnd/debian/patches/find_swt_jar.diff (rev 0) +++ trunk/bnd/debian/patches/find_swt_jar.diff 2012-04-30 18:15:40 UTC (rev 16026) @@ -0,0 +1,21 @@ +From: Jakub Adam jakub.a...@ktknet.cz +Date: Mon, 30 Apr 2012 19:50:31 +0200 +Subject: find_swt_jar + +--- + biz.aQute.bnd/bnd.bnd |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd +index b15cd90..b54ed5c 100644 +--- a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd +@@ -28,7 +28,7 @@ Bundle-License: http://www.opensource.org/licenses/apache2.0.php; \ + org.eclipse.ui.editors,\ + org.eclipse.ui.ide,\ + org.eclipse.ui.workbench.texteditor,\ +- org.eclipse.swt.carbon.macosx,\ ++ org.eclipse.swt,\ + org.eclipse.core.jobs,\ + org.eclipse.equinox.common,\ + org.eclipse.equinox.registry,\ Modified: trunk/bnd/debian/patches/series === --- trunk/bnd/debian/patches/series 2012-04-30 13:15:43 UTC (rev 16025) +++ trunk/bnd/debian/patches/series 2012-04-30 18:15:40 UTC (rev 16026) @@ -4,3 +4,4 @@ no_git_during_build.diff osgi43_fixes.diff display_bsn_on_missing_bundle.diff +find_swt_jar.diff Modified: trunk/bnd/debian/rules === --- trunk/bnd/debian/rules 2012-04-30 13:15:43 UTC (rev 16025) +++ trunk/bnd/debian/rules 2012-04-30 18:15:40 UTC (rev 16026) @@ -49,7 +49,6 @@ cnf/repo/org.eclipse.ui.ide \ cnf/repo/org.eclipse.core.jobs \ cnf/repo/org.eclipse.text \ - cnf/repo/org.eclipse.swt.carbon.macosx \ cnf/repo/org.osgi.impl.bundle.bindex ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar @@ -81,7 +80,6 @@ ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar - ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar touch $@ clean-bootstrap: DEB_BUILDDIR=$(CURDIR) ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r16027 - trunk/bnd/debian
Author: xhaakon-guest Date: 2012-04-30 18:19:23 + (Mon, 30 Apr 2012) New Revision: 16027 Modified: trunk/bnd/debian/changelog trunk/bnd/debian/control Log: Add myself to Uploaders Modified: trunk/bnd/debian/changelog === --- trunk/bnd/debian/changelog 2012-04-30 18:15:40 UTC (rev 16026) +++ trunk/bnd/debian/changelog 2012-04-30 18:19:23 UTC (rev 16027) @@ -1,6 +1,7 @@ bnd (1.50.0-4) UNRELEASED; urgency=low * Fix FTBFS after update to eclipse 3.7.2-1 (Closes: #669533). + * Add Jakub Adam to Uploaders. -- Jakub Adam jakub.a...@ktknet.cz Mon, 30 Apr 2012 19:42:26 +0200 Modified: trunk/bnd/debian/control === --- trunk/bnd/debian/control2012-04-30 18:15:40 UTC (rev 16026) +++ trunk/bnd/debian/control2012-04-30 18:19:23 UTC (rev 16027) @@ -3,7 +3,8 @@ Priority: optional Maintainer: Debian Java Maintainers pkg-java-maintainers@lists.alioth.debian.org Uploaders: Ludovic Claude ludovic.cla...@laposte.net, - Damien Raude-Morvan draz...@debian.org + Damien Raude-Morvan draz...@debian.org, + Jakub Adam jakub.a...@ktknet.cz Build-Depends: ant, ant-optional, cdbs, ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r16028 - trunk/bnd/debian
Author: xhaakon-guest Date: 2012-04-30 18:22:41 + (Mon, 30 Apr 2012) New Revision: 16028 Modified: trunk/bnd/debian/changelog trunk/bnd/debian/control Log: Bump Standards-Version to 3.9.3 Modified: trunk/bnd/debian/changelog === --- trunk/bnd/debian/changelog 2012-04-30 18:19:23 UTC (rev 16027) +++ trunk/bnd/debian/changelog 2012-04-30 18:22:41 UTC (rev 16028) @@ -2,6 +2,7 @@ * Fix FTBFS after update to eclipse 3.7.2-1 (Closes: #669533). * Add Jakub Adam to Uploaders. + * Bump Standards-Version to 3.9.3: no changes needed. -- Jakub Adam jakub.a...@ktknet.cz Mon, 30 Apr 2012 19:42:26 +0200 Modified: trunk/bnd/debian/control === --- trunk/bnd/debian/control2012-04-30 18:19:23 UTC (rev 16027) +++ trunk/bnd/debian/control2012-04-30 18:22:41 UTC (rev 16028) @@ -20,7 +20,7 @@ libswt-gtk-3-java, maven-ant-helper, maven-repo-helper -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bnd Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bnd Homepage: http://www.aQute.biz/Bnd ___ 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-mylyn - Plug-in for eclipse - Debian package. branch, pristine-tar, updated. 136eb6d75900aac6764c8a5bf3cb0acd88ae95ee
The following commit has been merged in the pristine-tar branch: commit 4b04747930ec888e5d049c7273b1a3b13a0abc67 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Mar 25 12:24:27 2012 +0200 pristine-tar data for eclipse-mylyn_3.7.0.orig.tar.bz2 diff --git a/eclipse-mylyn_3.7.0.orig.tar.bz2.delta b/eclipse-mylyn_3.7.0.orig.tar.bz2.delta new file mode 100644 index 000..129dde3 Binary files /dev/null and b/eclipse-mylyn_3.7.0.orig.tar.bz2.delta differ diff --git a/eclipse-mylyn_3.7.0.orig.tar.bz2.id b/eclipse-mylyn_3.7.0.orig.tar.bz2.id new file mode 100644 index 000..58081b9 --- /dev/null +++ b/eclipse-mylyn_3.7.0.orig.tar.bz2.id @@ -0,0 +1 @@ +63e8bbbe9b0cf56b24f7dc8f3f341a07df705f64 -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, pristine-tar, updated. 136eb6d75900aac6764c8a5bf3cb0acd88ae95ee
The following commit has been merged in the pristine-tar branch: commit 136eb6d75900aac6764c8a5bf3cb0acd88ae95ee Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Apr 30 20:49:59 2012 +0200 pristine-tar data for eclipse-mylyn_3.7.1.orig.tar.bz2 diff --git a/eclipse-mylyn_3.7.1.orig.tar.bz2.delta b/eclipse-mylyn_3.7.1.orig.tar.bz2.delta new file mode 100644 index 000..7bfc6a3 Binary files /dev/null and b/eclipse-mylyn_3.7.1.orig.tar.bz2.delta differ diff --git a/eclipse-mylyn_3.7.1.orig.tar.bz2.id b/eclipse-mylyn_3.7.1.orig.tar.bz2.id new file mode 100644 index 000..927c608 --- /dev/null +++ b/eclipse-mylyn_3.7.1.orig.tar.bz2.id @@ -0,0 +1 @@ +b543a78866872a1a70500e1833866efe0b801c16 -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. annotated tag, upstream/3.7.0, created. upstream/3.7.0
The annotated tag, upstream/3.7.0 has been created at 25b696b9576bcbc850470d4a3af56a6fe1091a18 (tag) tagging 99f1d11c5a40645952214b7ef90f02cdc2521b08 (commit) replaces upstream/3.6.5+dfsg1 tagged by Jakub Adam on Sun Mar 25 12:22:05 2012 +0200 - Shortlog Upstream version 3.7.0 Jakub Adam (1): Imported Upstream version 3.7.0 --- -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 1b452c59eaaeb5bdf0c63aca5de4ee8714f2eb7d Merge: 04a7ba7461d1228090d664a333d6617ced4da6da 99f1d11c5a40645952214b7ef90f02cdc2521b08 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Mar 25 12:22:05 2012 +0200 Merge tag 'upstream/3.7.0' Upstream version 3.7.0 -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 16f7384b355d99d0fb0ea1b60681c6482d1f78b5 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Mar 25 00:08:05 2012 +0100 Updated d/get-orig-source diff --git a/debian/get-orig-source b/debian/get-orig-source index e7e040d..60b7269 100755 --- a/debian/get-orig-source +++ b/debian/get-orig-source @@ -2,8 +2,8 @@ set -e NAME=eclipse-mylyn -VERSION=3.6.5 -DEB_VERSION=${VERSION}+dfsg1 +VERSION=3.7.0 +DEB_VERSION=${VERSION} MYLYN_GIT_WEB=http://git.eclipse.org/c/mylyn/ @@ -21,7 +21,6 @@ rm -rf ${NAME}-${VERSION} VERSION_UNDERSCORE=$(echo $VERSION | sed s/\./_/g) downloadSnapshot() { - echo down MODULE_NAME=$1 MODULE_DIR=$MODULE_NAME-R_$VERSION_UNDERSCORE @@ -32,6 +31,15 @@ downloadSnapshot() { mv $MODULE_DIR $MODULE_NAME } +unzipTestProject() { + PROJECT_NAME=$1 + mkdir $PROJECT_NAME + unzip $PROJECT_NAME.zip -d $PROJECT_NAME + rm -rf $PROJECT_NAME/bin $PROJECT_NAME.zip + find $PROJECT_NAME -type d -name CVS | xargs rm -r + find $PROJECT_NAME -type f -name .cvsignore -delete +} + downloadSnapshot org.eclipse.mylyn.all cd org.eclipse.mylyn.all rm *.sh @@ -45,20 +53,25 @@ done find -type f -name .gitignore -delete rm -f org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.tests/testdata/org.eclipse.mylyn.builds.sample.ant/junit.jar +rm -f org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk.util/testdata/keystore rm -rf org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/lib-e3.* -rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext/ckeditor +rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext.ui/ckeditor +rm -f org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key +rmdir -f org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.help/docs/source +rmdir -f org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/lib # Remove precompiled classes and CVS data from test archives, keep them uncompressed # for easier handling in version control. -cd org.eclipse.mylyn.context/org.eclipse.mylyn.context.tests/testdata/projects -mkdir project1 project2 -unzip project1.zip -d project1 -unzip project2.zip -d project2 -rm -rf project1/bin project2/bin project1.zip project2.zip -find -type d -name CVS | xargs rm -r -find -type f -name .cvsignore -delete -cd ../../../../.. +cd org.eclipse.mylyn.context/org.eclipse.mylyn.context.sdk.java/testdata/projects +unzipTestProject project1 +unzipTestProject project2 +cd ../../../.. +cd org.eclipse.mylyn.context/org.eclipse.mylyn.java.tests/testdata/projects +unzipTestProject project1 +unzipTestProject project2 +cd ../../../.. +cd .. mv org.eclipse.mylyn.all $NAME-$VERSION echo Creating tarball '${NAME}_${DEB_VERSION}.orig.tar.bz2'... -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 3a61355df40433a28064a45013961e21e4546d03 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Mar 25 12:25:24 2012 +0200 Update d/changelog diff --git a/debian/changelog b/debian/changelog index 68f8f49..90d0d4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +eclipse-mylyn (3.7.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Jakub Adam jakub.a...@ktknet.cz Sun, 25 Mar 2012 12:24:51 +0200 + eclipse-mylyn (3.6.5+dfsg1-1) unstable; urgency=low * Initial release (Closes: #581422). -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit fca2546a46ce50e38c4b77b1f47d46bbb730ff52 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Mar 26 20:43:02 2012 +0200 Update d/eclipse.features and d/eclipse-mylyn.eh-install for new upstream release diff --git a/debian/eclipse-mylyn.eh-install b/debian/eclipse-mylyn.eh-install index 28838e7..1d57c66 100644 --- a/debian/eclipse-mylyn.eh-install +++ b/debian/eclipse-mylyn.eh-install @@ -1,4 +1,10 @@ org.eclipse.mylyn.commons +org.eclipse.mylyn.commons.identity +org.eclipse.mylyn.commons.notifications +org.eclipse.mylyn.commons.repositories +org.eclipse.mylyn.commons.repositories.http +org.eclipse.mylyn.monitor +org.eclipse.mylyn.discovery org.eclipse.mylyn_feature org.eclipse.mylyn.context_feature org.eclipse.mylyn.versions diff --git a/debian/eclipse.features b/debian/eclipse.features index 8d8848f..1216229 100644 --- a/debian/eclipse.features +++ b/debian/eclipse.features @@ -1,4 +1,10 @@ org.eclipse.mylyn.commons +org.eclipse.mylyn.commons.identity +org.eclipse.mylyn.commons.notifications +org.eclipse.mylyn.commons.repositories +org.eclipse.mylyn.commons.repositories.http +org.eclipse.mylyn.monitor +org.eclipse.mylyn.discovery org.eclipse.mylyn_feature org.eclipse.mylyn.context_feature org.eclipse.mylyn.versions diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps index d05fc05..78975c9 100644 --- a/debian/eclipse.orbitdeps +++ b/debian/eclipse.orbitdeps @@ -6,8 +6,11 @@ commons-discovery commons-lang gnumail gson +httpclient +httpcore jaxmeapi jdom1 +jsoup rome ws-commons-util wsdl4j -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 4d99e3296b659b3a7f8cfbc61e083a32fcf42dd8 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Apr 1 18:16:34 2012 +0200 Fix instanceClassName of RepositoryLocation class in ecore model diff --git a/debian/patches/mylyn-builds-fix-ecore-repository-location.patch b/debian/patches/mylyn-builds-fix-ecore-repository-location.patch new file mode 100644 index 000..8ec45ce --- /dev/null +++ b/debian/patches/mylyn-builds-fix-ecore-repository-location.patch @@ -0,0 +1,21 @@ +From: Jakub Adam jakub.a...@ktknet.cz +Date: Sun, 25 Mar 2012 21:27:56 +0200 +Subject: mylyn-builds-fix-ecore-repository-location + +--- + .../models/builds.ecore|2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.core/models/builds.ecore b/org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.core/models/builds.ecore +index de8ecab..02325b7 100644 +--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.core/models/builds.ecore b/org.eclipse.mylyn.builds/org.eclipse.mylyn.builds.core/models/builds.ecore +@@ -8,7 +8,7 @@ + eClassifiers xsi:type=ecore:EDataType name=EditType instanceClassName=org.eclipse.mylyn.builds.core.EditType/ + eClassifiers xsi:type=ecore:EDataType name=IStatus instanceClassName=org.eclipse.core.runtime.IStatus/ + eClassifiers xsi:type=ecore:EDataType name=IOperation instanceClassName=org.eclipse.mylyn.builds.core.IOperation/ +- eClassifiers xsi:type=ecore:EDataType name=RepositoryLocation instanceClassName=org.eclipse.mylyn.commons.repositories.RepositoryLocation ++ eClassifiers xsi:type=ecore:EDataType name=RepositoryLocation instanceClassName=org.eclipse.mylyn.commons.repositories.core.RepositoryLocation + serializable=false/ + eClassifiers xsi:type=ecore:EClass name=StringToStringMap instanceClassName=java.util.Map$Entry + eStructuralFeatures xsi:type=ecore:EAttribute name=key eType=ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString/ diff --git a/debian/patches/series b/debian/patches/series index 737f900..c42bff4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ debian-orbit-deps.patch rebuild-prepare-install-profile-job-3-6.patch remove-eclipse-ecf-usage.patch +mylyn-builds-fix-ecore-repository-location.patch -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit fb39ef61817fe1f076ef0e48f53d31b41d571ff0 Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Apr 30 20:37:20 2012 +0200 Updated d/get-orig-source diff --git a/debian/get-orig-source b/debian/get-orig-source index 60b7269..94abb18 100755 --- a/debian/get-orig-source +++ b/debian/get-orig-source @@ -2,7 +2,7 @@ set -e NAME=eclipse-mylyn -VERSION=3.7.0 +VERSION=3.7.1 DEB_VERSION=${VERSION} MYLYN_GIT_WEB=http://git.eclipse.org/c/mylyn/ @@ -57,8 +57,8 @@ rm -f org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk.util/testdata/keys rm -rf org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/lib-e3.* rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.htmltext.ui/ckeditor rm -f org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.help/docs/source/Illustrations.key -rmdir -f org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.help/docs/source -rmdir -f org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/lib +rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.docs.epub.help/docs/source +rm -rf org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/lib # Remove precompiled classes and CVS data from test archives, keep them uncompressed # for easier handling in version control. -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 31b5d91a94bb639a9bbc4a33837946cd4faf54f0 Author: Jakub Adam jakub.a...@ktknet.cz Date: Sun Apr 1 18:14:22 2012 +0200 Refresh d/patches diff --git a/debian/patches/correct-wikitext-core-version.patch b/debian/patches/correct-wikitext-core-version.patch deleted file mode 100644 index c73a757..000 --- a/debian/patches/correct-wikitext-core-version.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Jakub Adam jakub.a...@ktknet.cz -Date: Mon, 21 Nov 2011 22:15:41 +0100 -Subject: correct-wikitext-core-version - - .../META-INF/MANIFEST.MF |2 +- - .../META-INF/MANIFEST.MF |2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF -index 231a8ec..2ad318f 100644 a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF -+++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/META-INF/MANIFEST.MF -@@ -2,7 +2,7 @@ Manifest-Version: 1.0 - Bundle-ManifestVersion: 2 - Bundle-Name: %Bundle-Name.0 - Bundle-SymbolicName: org.eclipse.mylyn.wikitext.core;singleton:=true --Bundle-Version: 1.5.1.v20110720-0100 -+Bundle-Version: 1.5.0 - Bundle-Vendor: %Bundle-Vendor.0 - Export-Package: org.eclipse.mylyn.internal.wikitext.core;x-internal:=true, - org.eclipse.mylyn.internal.wikitext.core.parser.builder;x-internal:=true, -diff --git a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF -index 475d6e4..844965f 100644 a/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF -+++ b/org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.mediawiki.core/META-INF/MANIFEST.MF -@@ -2,7 +2,7 @@ Manifest-Version: 1.0 - Bundle-ManifestVersion: 2 - Bundle-Name: %Bundle-Name.0 - Bundle-SymbolicName: org.eclipse.mylyn.wikitext.mediawiki.core;singleton:=true --Bundle-Version: 1.5.2.v20110830-0100 -+Bundle-Version: 1.5.0 - Bundle-Vendor: %Bundle-Vendor.0 - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version=1.5.0, --- diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch index 5d82db5..72e6251 100644 --- a/debian/patches/debian-orbit-deps.patch +++ b/debian/patches/debian-orbit-deps.patch @@ -13,29 +13,38 @@ Subject: debian-orbit-deps * remove versions from Import-Package directives so that distribution jars in /usr/share/java can be used --- - .../org.eclipse.mylyn.hudson-feature/feature.xml | 18 ++- + .../org.eclipse.mylyn.hudson-feature/feature.xml | 33 +- + .../META-INF/MANIFEST.MF | 24 ++-- + .../org.eclipse.mylyn.commons-feature/feature.xml | 119 + .../feature.xml|2 +- + .../feature.xml|4 +- + .../feature.xml|8 +- + .../META-INF/MANIFEST.MF | 36 +++--- .../META-INF/MANIFEST.MF |5 +- - .../org.eclipse.mylyn.commons-feature/feature.xml | 46 ++-- - .../META-INF/MANIFEST.MF |7 +-- .../META-INF/MANIFEST.MF |3 +- - .../META-INF/MANIFEST.MF | 10 ++-- + .../org.eclipse.mylyn.monitor-feature/feature.xml |7 + + .../org.eclipse.mylyn.context-feature/feature.xml |4 +- + .../org.eclipse.mylyn.wikitext-feature/feature.xml |7 + + .../org.eclipse.mylyn.trac-feature/feature.xml |7 + .../META-INF/MANIFEST.MF |3 +- - 7 files changed, 61 insertions(+), 31 deletions(-) + 14 files changed, 213 insertions(+), 49 deletions(-) diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml -index 7db75df..5354d9e 100644 +index 2e5cfc9..5d3553c 100644 --- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml +++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml -@@ -32,15 +32,27 @@ - import plugin=org.eclipse.mylyn.commons.net version=3.6.0 match=equivalent/ - import plugin=org.eclipse.mylyn.commons.repositories version=0.8.0 match=equivalent/ - import plugin=org.eclipse.mylyn.commons.ui version=3.6.1 match=equivalent/ +@@ -29,17 +29,28 @@ +/license + +requires - import plugin=com.google.gson version=1.6.0 match=compatible/ import plugin=com.sun.xml.bind version=2.2.0 match=compatible/ import plugin=javax.xml version=1.3.4 match=compatible/ - import plugin=javax.xml.bind version
[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit 6cedaedd47c53ca71330b02f0f646cf36f2b86bf Merge: fb39ef61817fe1f076ef0e48f53d31b41d571ff0 67b2bc5e1cc778cffb3395a6ea62a251fe1364dc Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Apr 30 20:46:32 2012 +0200 Merge tag 'upstream/3.7.1' Upstream version 3.7.1 -- eclipse-mylyn - Plug-in for eclipse - 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-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.6.5+dfsg1-1-13-g53e333e
The following commit has been merged in the master branch: commit a98c71f4615983b50b657f5b8c2e539e0e2b60fc Author: Jakub Adam jakub.a...@ktknet.cz Date: Mon Apr 30 20:47:47 2012 +0200 Updated d/changelog diff --git a/debian/changelog b/debian/changelog index 90d0d4e..da22751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -eclipse-mylyn (3.7.0-1) UNRELEASED; urgency=low +eclipse-mylyn (3.7.1-1) UNRELEASED; urgency=low * New upstream release. -- eclipse-mylyn - Plug-in for eclipse - 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