[libcofoja-java] 02/09: Refreshed the patches

[Emmanuel Bourg]

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

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

commit a9b46ce4b78d7af12dde35c1bd4191f78f8612b1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 10:26:25 2016 +0200

    Refreshed the patches
---
 debian/changelog                                   |  4 +-
 .../01-remove-version-from-generated-jar.patch     | 16 +++---
 debian/patches/02-java8-compatibility.patch        | 58 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf0ee7d..2a65933 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-cofoja (1.1-r150-3) UNRELEASED; urgency=medium
+cofoja (1.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed 02-java8-compatibility.patch (fixed upstream)
   * Standards-Version updated to 3.9.8
   * Updated the Homepage field
   * Use secure Vcs-* URLs
diff --git a/debian/patches/01-remove-version-from-generated-jar.patch b/debian/patches/01-remove-version-from-generated-jar.patch
index 9e73b2d..fe07eae 100644
--- a/debian/patches/01-remove-version-from-generated-jar.patch
+++ b/debian/patches/01-remove-version-from-generated-jar.patch
@@ -6,21 +6,21 @@ Last-Updated: 2013-04-10
 Fowarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -132,13 +132,13 @@
+@@ -219,13 +219,13 @@
        <equals arg1="${snapshot}" arg2="true" />
      </condition>
      <property name="cofoja.jar"
+-              value="${dist.dir}/cofoja+asm-${cofoja.version}.jar" />
++              value="${dist.dir}/cofoja+asm.jar" />
+     <property name="cofoja.bare.jar"
 -              value="${dist.dir}/cofoja-${cofoja.version}.jar" />
 +              value="${dist.dir}/cofoja.jar" />
-     <property name="cofoja.bare.jar"
--              value="${dist.dir}/cofoja-${cofoja.version}-bare.jar" />
-+              value="${dist.dir}/cofoja-bare.jar" />
      <property name="cofoja.contracted.jar"
--              value="${dist.dir}/ccofoja-${cofoja.version}.jar" />
-+              value="${dist.dir}/ccofoja.jar" />
+-              value="${dist.dir}/cofoja+contracts+asm-${cofoja.version}.jar" />
++              value="${dist.dir}/cofoja+contracts+asm.jar" />
      <property name="cofoja.contracted.bare.jar"
--              value="${dist.dir}/ccofoja-${cofoja.version}-bare.jar" />
-+              value="${dist.dir}/ccofoja-bare.jar" />
+-              value="${dist.dir}/cofoja+contracts-${cofoja.version}.jar" />
++              value="${dist.dir}/cofoja+contracts.jar" />
  
      <mkdir dir="${obj.dir}" />
      <mkdir dir="${dist.dir}" />
diff --git a/debian/patches/02-java8-compatibility.patch b/debian/patches/02-java8-compatibility.patch
deleted file mode 100644
index 62a33b7..0000000
--- a/debian/patches/02-java8-compatibility.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fixes the compilation errors with Java 8
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: http://code.google.com/p/cofoja/issues/detail?id=39
---- a/src/com/google/java/contract/core/apt/AnnotationProcessor.java
-+++ b/src/com/google/java/contract/core/apt/AnnotationProcessor.java
-@@ -18,7 +18,6 @@
-  */
- package com.google.java.contract.core.apt;
- 
--import com.sun.tools.javac.main.OptionName;
- import com.sun.tools.javac.processing.JavacProcessingEnvironment;
- import com.sun.tools.javac.util.Options;
- import com.google.java.contract.AllowUnusedImport;
-@@ -222,12 +221,12 @@
-       Options options = Options.instance(javacEnv.getContext());
- 
-       if (sourcePath == null) {
--        sourcePath = options.get(OptionName.SOURCEPATH);
-+        sourcePath = options.get("-sourcepath");
-       }
- 
-       if (classPath == null) {
--        String classPath1 = options.get(OptionName.CP);
--        String classPath2 = options.get(OptionName.CLASSPATH);
-+        String classPath1 = options.get("-cp");
-+        String classPath2 = options.get("-classpath");
-         if (classPath1 != null) {
-           if (classPath2 != null) {
-             classPath = classPath1 + File.pathSeparator + classPath2;
-@@ -240,7 +239,7 @@
-       }
- 
-       if (outputDirectory == null) {
--        outputDirectory = options.get(OptionName.D);
-+        outputDirectory = options.get("-d");
-       }
-     }
-   }
---- a/test/com/google/java/contract/tests/GenericsTest.java
-+++ b/test/com/google/java/contract/tests/GenericsTest.java
-@@ -107,7 +107,7 @@
-     }
-   }
- 
--  private static class T<X extends Throwable> {
-+  private static class TT<X extends Throwable> {
-     /* Test ability to contract methods that throw type parameters. */
-     @Requires("true")
-     public void f(X x) throws X {
-@@ -115,7 +115,7 @@
-     }
-   }
- 
--  private static class Npe extends T<NullPointerException> {
-+  private static class Npe extends TT<NullPointerException> {
-     @Override
-     @Ensures("true")
-     public void f(NullPointerException x) throws NullPointerException {
diff --git a/debian/patches/series b/debian/patches/series
index fcf8e41..46d9b3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-remove-version-from-generated-jar.patch
-02-java8-compatibility.patch

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