Package: ecj Version: 3.5.1-2.1 Followup-For: Bug #596420 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
*** /tmp/tmp_HlnKh In Ubuntu, the attached patch was applied to achieve the following: * Add maven artifact deployment to resolve FTBFS for tomcat-maven-plugin (LP: #835769): - debian/control: added maven-repo-helper to Build-Deps - debian/rules: install maven artifacts, added get-orig-poms target to retrieve original pom files - debian/libecj-java.poms: POM file locator. - debian/poms/ecj.pom: Upstream POM file from Maven repo1. - debian/libecj-java.install: removed - install handled by m-r-h. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/changelog' === modified file 'debian/control' --- debian/control 2011-07-13 22:13:12 +0000 +++ debian/control 2011-09-12 21:41:14 +0000 @@ -1,13 +1,15 @@ Source: ecj Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Jerry Haltom <was...@larvalstage.net>, Michael Koch <konque...@gmx.de>, Matthias Klose <d...@debian.org> Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 5), gcj-jdk, libgcj-bc (>= 4.4.6), libecj-java (>= 3.3.0+0728) [arm], unzip [arm], - fastjar, ant, zip, dpkg (>= 1.13.19), python, time + fastjar, ant, zip, dpkg (>= 1.13.19), python, time, + maven-repo-helper Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2) Standards-Version: 3.9.2 === removed file 'debian/libecj-java.install' --- debian/libecj-java.install 2007-07-07 02:13:27 +0000 +++ debian/libecj-java.install 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/share/java/eclipse-ecj.jar === added file 'debian/libecj-java.poms' --- debian/libecj-java.poms 1970-01-01 00:00:00 +0000 +++ debian/libecj-java.poms 2011-09-12 21:39:40 +0000 @@ -0,0 +1 @@ +debian/poms/ecj.pom === added directory 'debian/poms' === added file 'debian/poms/ecj.pom' --- debian/poms/ecj.pom 1970-01-01 00:00:00 +0000 +++ debian/poms/ecj.pom 2009-10-23 19:17:47 +0000 @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +<!-- originally downloaded here: +http://download.eclipse.org/eclipse/downloads/drops/R-3.5.1-200909170800/index.php#JDTCORE +the md5 were copied from there: +http://download.eclipse.org/eclipse/downloads/drops/R-3.5.1-200909170800/checksum/ecj-3.5.1.jar.md5 +http://download.eclipse.org/eclipse/downloads/drops/R-3.5.1-200909170800/checksum/ecjsrc-3.5.1.zip.md5 +the sha1 checksums were missing. + +re-packaged the sources with buildr4osgi see bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=291391 + + --> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.jdt.core.compiler</groupId> + <artifactId>ecj</artifactId> + <version>3.5.1</version> + <packaging>jar</packaging> + + <name>Eclipse ECJ</name> + <url>http://www.eclipse.org/jdt/</url> + + <licenses> + <license> + <name>Eclipse Public License v1.0</name> + <url>http://www.eclipse.org/org/documents/epl-v10.php</url> + <distribution>repo</distribution> + </license> + </licenses> + + <scm> + <url>http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/</url> + </scm> + + +</project> === modified file 'debian/rules' --- debian/rules 2011-06-08 19:25:06 +0000 +++ debian/rules 2011-09-12 22:01:35 +0000 @@ -168,8 +168,9 @@ install/libecj-java:: - mkdir -p debian/tmp/usr/share/java - install -m 644 build/dist/$(JAR) debian/tmp/usr/share/java/ + mh_installpoms -plibecj-java + mh_installjar -plibecj-java -l debian/poms/ecj.pom build/dist/$(JAR) \ + --usj-name=eclipse-ecj install/ecj:: mkdir -p debian/tmp/usr/bin @@ -224,6 +225,14 @@ RR=../cvs/R3_5_1/ tag = R3_5_1 +MAVEN_REPO := http://repo1.maven.org/maven2 +PACKAGE := ecj + +get-orig-pom: + mkdir -p debian/poms + wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \ + $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom + get-source: rm -rf org.eclipse.jdt.core # @echo Press enter for the password
__ 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.