[ecj] 89/145: New upstream release (JDT version 4.4.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 60a5da12184e35c427b84ec47f48e8a1e646d1bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 25 12:13:06 2016 +0000

    New upstream release (JDT version 4.4.2)
---
 debian/changelog                     | 8 ++++++++
 debian/patches/gcc-changes.diff      | 2 +-
 debian/patches/remove-overrides.diff | 2 +-
 debian/rules                         | 2 +-
 debian/watch                         | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 214a737..1604711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ecj (3.10.2-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release (JDT version 4.4.2)
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 25 Mar 2016 12:39:06 +0100
+
 ecj (3.10.1-2) unstable; urgency=medium
 
   * Build using GCC 5.
diff --git a/debian/patches/gcc-changes.diff b/debian/patches/gcc-changes.diff
index 9d13a4c..3458122 100644
--- a/debian/patches/gcc-changes.diff
+++ b/debian/patches/gcc-changes.diff
@@ -23,7 +23,7 @@
 +</project>
 --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
 +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-@@ -1215,9 +1215,9 @@
+@@ -1219,9 +1219,9 @@
  		
  		// by default only lines and source attributes are generated.
  		this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;
diff --git a/debian/patches/remove-overrides.diff b/debian/patches/remove-overrides.diff
index 77db15d..ae9f8ad 100644
--- a/debian/patches/remove-overrides.diff
+++ b/debian/patches/remove-overrides.diff
@@ -21,7 +21,7 @@ Forwarded: not-needed
  					}
 --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
 +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
-@@ -64,11 +64,9 @@
+@@ -75,11 +75,9 @@
  						'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
  		// create the synthetic annotation:
  		return new IBinaryAnnotation() {
diff --git a/debian/rules b/debian/rules
index cfbd0cc..35acff7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,7 +234,7 @@ clean::
 	rm -f debian/*.pyc ecj1
 	rm -rf debian/.mh
 
-TAG = R4_4
+TAG = R4_4_2
 DIR = ecj-$(DEB_UPSTREAM_VERSION)
 
 MAVEN_REPO  := http://repo1.maven.org/maven2
diff --git a/debian/watch b/debian/watch
index 4f1da1d..2522274 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.4/" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4.2/" \
 http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz

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