[ecj] 29/37: Imported Debian patch 3.5.1-3

Wed Jun 25 23:35:13 UTC 2014

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit e9ea1a97c7bf6befd1287407c7a83a380dc68532
Author: Matthias Klose <doko at debian.org>
Date:   Wed Sep 14 23:27:58 2011 +0200

    Imported Debian patch 3.5.1-3
---
 debian/changelog           | 17 +++++++++++++++++
 debian/control             |  3 ++-
 debian/libecj-java.install |  1 -
 debian/libecj-java.poms    |  1 +
 debian/poms/ecj.pom        | 37 +++++++++++++++++++++++++++++++++++++
 debian/rules               | 13 +++++++++++--
 6 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a39711..b7a3b7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ecj (3.5.1-3) unstable; urgency=low
+
+  [ James Page ]
+  * Add maven artifact deployment to resolve FTBFS for 
+    tomcat-maven-plugin (LP: #835769):
+    - debian/control: added maven-repo-helper to Build-Depends-Indep
+    - 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.
+
+  [ Matthias Klose ]
+  * Remove Jerry Haltom and Michael Koch from uploaders.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 14 Sep 2011 23:27:58 +0200
+
 ecj (3.5.1-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index e5190e0..7f6bcc1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: ecj
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
+Uploaders: Matthias Klose <doko at 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
+Build-Depends-Indep: maven-repo-helper
 Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2)
 Standards-Version: 3.9.2
 
diff --git a/debian/libecj-java.install b/debian/libecj-java.install
deleted file mode 100644
index a5ba1e7..0000000
--- a/debian/libecj-java.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/java/eclipse-ecj.jar
diff --git a/debian/libecj-java.poms b/debian/libecj-java.poms
new file mode 100644
index 0000000..daba3ac
--- /dev/null
+++ b/debian/libecj-java.poms
@@ -0,0 +1 @@
+debian/poms/ecj.pom
diff --git a/debian/poms/ecj.pom b/debian/poms/ecj.pom
new file mode 100644
index 0000000..b4c43f9
--- /dev/null
+++ b/debian/poms/ecj.pom
@@ -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>
diff --git a/debian/rules b/debian/rules
index fa47a4b..10754c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -168,8 +168,9 @@ endif
 
 
 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_maintenance/
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git

