[ecj] 127/145: New upstream release (from the R4_5_2 tag, identifies itself as 3.11.2)

[Emmanuel Bourg]

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

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

commit d42f8b8013f32fa1a13b929b169d2be0cbf64abe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 27 13:47:23 2018 +0200

    New upstream release (from the R4_5_2 tag, identifies itself as 3.11.2)
---
 debian/build.xml |  5 ++++-
 debian/changelog |  3 ++-
 debian/rules     | 15 ++++-----------
 debian/watch     |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 284ad72..355fbb3 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -9,7 +9,10 @@
 
     <replace dir="target/classes" token="bundle_qualifier, bundle_version" value="${version}"/>
 
-    <javac srcdir="src/org.eclipse.jdt.core" destdir="target/classes" debuglevel="lines,source" source="1.8" target="1.8" encoding="UTF-8"/>
+    <javac srcdir="src/org.eclipse.jdt.core" destdir="target/classes" debuglevel="lines,source" source="1.8" target="1.8" encoding="UTF-8">
+      <exclude name="**/BuildJarIndex.java"/>
+      <exclude name="**/CheckDebugAttributes.java"/>
+    </javac>
 
     <jar destfile="target/ecj.jar">
       <fileset dir="src/org.eclipse.jdt.core" includes="**/*.props,**/*.rsc"/>
diff --git a/debian/changelog b/debian/changelog
index 9088fdd..105f27c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-ecj (3.11.1-3) UNRELEASED; urgency=medium
+ecj (3.11.2-1) UNRELEASED; urgency=medium
 
+  * New upstream release (from the R4_5_2 tag, identifies itself as 3.11.2)
   * No longer build the -gcj packages (Closes: #892531)
   * Removed the Conflicts/Replaces fields referencing very old packages
   * Removed the build dependency on dpkg
diff --git a/debian/rules b/debian/rules
index 787d12f..3248678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
 
-TAG = R4_5_1
+TAG = eclipse.jdt.core-R4_5_2
 DIR = ecj-$(VERSION)
 
 PACKAGE := ecj
@@ -23,13 +23,11 @@ get-orig-pom:
 
 get-orig-source:
 	rm -rf $(DIR) $(TAG).tar.gz $(TAG)
-	wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
+	wget https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
 	tar xf $(TAG).tar.gz
 	mkdir -p $(DIR)/src/org.eclipse.jdt.core
-	cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html \
-		$(DIR)/src/org.eclipse.jdt.core/
-	cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
-		$(DIR)/src/org.eclipse.jdt.core/
+	cp -p $(TAG)/org.eclipse.jdt.core/scripts/about.html $(DIR)/src/org.eclipse.jdt.core/
+	cp -p $(TAG)/org.eclipse.jdt.core/scripts/build.xml  $(DIR)/src/org.eclipse.jdt.core/
 
 	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
 	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
@@ -37,15 +35,10 @@ get-orig-source:
 	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/antadapter org META-INF \
 	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
 
-	find $(DIR) -name CheckDebugAttributes.java | xargs -r rm -f
-	find $(DIR) -name BuildJarIndex.java | xargs -r rm -f
-
 	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
 	    | tar -x -f - -C $(DIR)/src/org.eclipse.jdt.core/
 
 	mkdir -p $(DIR)/src/org.eclipse.jdt.core/META-INF/services
-#	cp -p $(TAG)/org.eclipse.jdt.core/scripts/META-INF/MANIFEST.MF \
-#	    $(DIR)/src/org.eclipse.jdt.core/META-INF/
 	printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \
 	    > $(DIR)/src/org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
 
diff --git a/debian/watch b/debian/watch
index 9bb8101..347912e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,5 +5,5 @@ version=3
 # The package caries the version of the compiler and the version of the platform
 # has to be hardcoded here to detect the new releases.
 #
-opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.5/" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.5.2/" \
 https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/ .*/eclipse.jdt.core-R([\d_]+).tar.gz

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