[uimaj] 02/04: Refreshed the patches Removed java7-compat.diff (fixed upstream)

[Emmanuel Bourg]

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

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

commit 3a345dedd9efbabb0fa78d274c2b68ef39c88899
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 20 22:53:36 2014 +0100

    Refreshed the patches
    Removed java7-compat.diff (fixed upstream)
---
 debian/changelog                             |  5 ++++-
 debian/patches/build-helper-version.diff     |  4 ++--
 debian/patches/disable_internal_javadoc.diff |  2 +-
 debian/patches/modules.diff                  | 12 ++++++------
 debian/patches/series                        |  1 -
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 746d101..d3dc16e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-uimaj (2.4.0-4) UNRELEASED; urgency=low
+uimaj (2.4.1-1) UNRELEASED; urgency=low
 
+  * New upstream release
+    - Refreshed the patches
+    - Removed java7-compat.diff (fixed upstream)
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Standards-Version updated 3.9.5 (no changes)
diff --git a/debian/patches/build-helper-version.diff b/debian/patches/build-helper-version.diff
index 327ece8..bf94996 100644
--- a/debian/patches/build-helper-version.diff
+++ b/debian/patches/build-helper-version.diff
@@ -1,7 +1,7 @@
 --- a/uimaj-core/pom.xml
 +++ b/uimaj-core/pom.xml
-@@ -156,6 +156,12 @@
-         <version>1.5</version>
+@@ -167,6 +167,12 @@
+         <artifactId>build-helper-maven-plugin</artifactId>
          <executions>
            <execution>
 +            <id>parse-version</id>
diff --git a/debian/patches/disable_internal_javadoc.diff b/debian/patches/disable_internal_javadoc.diff
index ce9ff62..a11534c 100644
--- a/debian/patches/disable_internal_javadoc.diff
+++ b/debian/patches/disable_internal_javadoc.diff
@@ -1,6 +1,6 @@
 --- a/pom.xml
 +++ b/pom.xml
-@@ -169,8 +169,8 @@
+@@ -178,8 +178,8 @@
          <executions>
            <execution>
              <id>javadocs-distr</id> <!-- name should match one in parent-pom --> 
diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff
index 333f654..a98d1f7 100644
--- a/debian/patches/modules.diff
+++ b/debian/patches/modules.diff
@@ -14,8 +14,8 @@ Forwarded: not-needed
      <module>../uimaj-ep-debug</module>
      <module>../uimaj-ep-jcasgen</module>
      <module>../uimaj-ep-configurator</module>
-@@ -71,5 +72,6 @@
-     
+@@ -73,5 +74,6 @@
+     <!-- see  https://issues.apache.org/jira/browse/UIMA-2497 -->
      <module>../uimaj-eclipse-feature-tools</module>
      <module>../uimaj-eclipse-feature-runtime</module>
 +-->
@@ -31,7 +31,7 @@ Forwarded: not-needed
      <module>../aggregate-uimaj-docbooks</module>
      <!--module>distr-superPom</module-->
      <module>../uimaj-document-annotation</module>
-@@ -79,4 +78,4 @@
+@@ -80,4 +79,4 @@
      <!--module>../uimaj-internal-tools</module-->
      <module>../uimaj-bootstrap</module>    
    </modules>  
@@ -40,7 +40,7 @@ Forwarded: not-needed
 +</project>
 --- a/pom.xml
 +++ b/pom.xml
-@@ -108,6 +108,7 @@
+@@ -114,6 +114,7 @@
        <artifactId>uimaj-tools</artifactId>
        <version>${project.version}</version>
      </dependency>
@@ -48,11 +48,11 @@ Forwarded: not-needed
      <dependency>
        <groupId>org.apache.uima</groupId>
        <artifactId>uimaj-ep-cas-editor</artifactId>
-@@ -148,6 +149,7 @@
+@@ -154,6 +155,7 @@
        <artifactId>uimaj-ep-launcher</artifactId>
        <version>${project.version}</version>
      </dependency>
 +-->
    </dependencies>
  
-   <modules>
+   
diff --git a/debian/patches/series b/debian/patches/series
index 3dfbf03..80119be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ disable_ecore.diff
 #docbook_tool.diff
 build-helper-version.diff
 disable_internal_javadoc.diff
-java7-compat.diff

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