[SCM] Debian packaging for uima-as branch, master, updated. debian/2.3.1-2-1-g388bfb2

Damien Raude-Morvan drazzib at debian.org
Tue Jun 5 21:41:45 UTC 2012 

The following commit has been merged in the master branch:
commit 388bfb28e33868a1bc520e263ee777e1964fe694
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Jun 5 23:09:24 2012 +0200

    Fix FTBFS with lastest glassfish changes (Closes: #676124).

diff --git a/debian/changelog b/debian/changelog
index 6e6671d..0349694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+uima-as (2.3.1-3) unstable; urgency=low
+
+  * Fix FTBFS with lastest glassfish changes (Closes: #676124):
+    - Add explicit B-D on glassfish-javaee and libservlet2.5-java.
+    - Adapt d/patches/jee_dependencies.diff to d/maven.rules.
+  * d/control: Update Standards-Version to 3.9.3, no changes needed.
+  * d/copyright: Upgrade to copyright format 1.0.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 05 Jun 2012 23:06:18 +0200
+
 uima-as (2.3.1-2) unstable; urgency=low
 
   * Add links for uimaj-as JARs into /usr/share/uima/lib/.
diff --git a/debian/control b/debian/control
index 6cfb721..25f731f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: cdbs,
                maven-debian-helper (>= 1.4.4),
                maven-repo-helper (>= 1.5.2)
 Build-Depends-Indep: ant,
+                     glassfish-javaee,
                      libactivemq-java,
                      libactivemq-protobuf-java,
                      libbuild-helper-maven-plugin-java,
@@ -25,6 +26,7 @@ Build-Depends-Indep: ant,
                      libmaven-dependency-plugin-java,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
+                     libservlet2.5-java,
                      libspring-beans-java,
                      libspring-context-java,
                      libspring-core-java,
@@ -39,7 +41,7 @@ Build-Depends-Indep: ant,
                      libuima-vinci-java,
                      uima-doc,
                      uima-examples
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-java/uima-as.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/uima-as.git
 Homepage: http://uima.apache.org/doc-uimaas-what.html
diff --git a/debian/copyright b/debian/copyright
index 4adddf6..9a4b7a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache UIMA Asynch Scaleout framework
 Upstream-Contact: The Apache Software Foundation
 Source: http://www.apache.org/dist/uima/
@@ -10,8 +10,9 @@ Comment: 1) Saxon and ActiveMQ are not included into debian tarball,
  UIMA SDK bundling with. debian/patches/disable_uima_extract.diff
 
 Files: *
-Copyright: Copyright (c) 2007, 2008 IBM Corporation
-Copyright: Copyright 2008, 2011 The Apache Software Foundation
+Copyright:
+ Copyright (c) 2007, 2008 IBM Corporation
+ Copyright 2008, 2011 The Apache Software Foundation
 License: Apache-2.0
 
 Files: debian/*
@@ -21,3 +22,4 @@ License: Apache-2.0
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
+
diff --git a/debian/maven.rules b/debian/maven.rules
index fa0ff85..8511b08 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -25,3 +25,8 @@ org.apache.activemq s/activemq-all/activemq-core/ jar s/.*/debian/ * *
 commons-httpclient commons-httpclient jar s/.*/3.x/ * *
 log4j log4j jar s/.*/1.2.x/ * *
 commons-collections commons-collections jar s/.*/3.x/ * *
+s/org.apache.geronimo.specs/javax.servlet/ s/geronimo-servlet_2.5_spec/servlet-api/ jar s/.*/2.5/ * *
+s/org.apache.geronimo.specs/javax.jms/ s/geronimo-jms_1.1_spec/jms/ jar s/.*/debian/ * *
+
+s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-management_1.1_spec/javaee-api/ jar s/.*/debian/ * *
+s/org.apache.geronimo.specs/javax/ s/geronimo-j2ee-connector_1.5_spec/javaee-api/ jar s/.*/debian/ * *
diff --git a/debian/patches/disable_internal_javadoc.diff b/debian/patches/disable_internal_javadoc.diff
index cd93c5e..6f88ef1 100644
--- a/debian/patches/disable_internal_javadoc.diff
+++ b/debian/patches/disable_internal_javadoc.diff
@@ -1,8 +1,6 @@
-Index: b/uima-as/pom.xml
-===================================================================
 --- a/uima-as/pom.xml
 +++ b/uima-as/pom.xml
-@@ -374,8 +374,8 @@
+@@ -363,8 +363,8 @@
  				<executions>
  					<execution>
  						<id>javadocs-distr</id>
diff --git a/debian/patches/disable_uima_extract.diff b/debian/patches/disable_uima_extract.diff
index 75ca1e1..cd43483 100644
--- a/debian/patches/disable_uima_extract.diff
+++ b/debian/patches/disable_uima_extract.diff
@@ -20,7 +20,7 @@ Forwarded: not-needed
      
      <!-- uima-as -->
      <dependency>
-@@ -342,7 +344,10 @@
+@@ -331,7 +333,10 @@
              <!-- use the dependency:unpack goal to unpack the 
                   base binary uimaj sdk distribution -->
              <id>unpackUimajBin</id>
diff --git a/debian/patches/jee_dependencies.diff b/debian/patches/jee_dependencies.diff
index 80346c0..a1c6f47 100644
--- a/debian/patches/jee_dependencies.diff
+++ b/debian/patches/jee_dependencies.diff
@@ -1,78 +1,21 @@
-Description: Fix dependencies on jee.* JAR
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-06-21
-Forwarded: not-needed
---- a/uimaj-as-activemq/pom.xml
-+++ b/uimaj-as-activemq/pom.xml
-@@ -157,7 +157,7 @@
-     </dependency>
+--- a/uimaj-as-jms/pom.xml
++++ b/uimaj-as-jms/pom.xml
+@@ -65,6 +65,11 @@
+ 			<scope>compile</scope>
+ 		</dependency>
  
- 
--
-+<!--
-     <dependency>
-       <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-jms_1.1_spec</artifactId>
-@@ -175,6 +175,14 @@
-       <artifactId>geronimo-servlet_2.5_spec</artifactId>
-       <version>1.2</version>
-     </dependency>
-+-->
 +    <dependency>
-+      <groupId>org.jee</groupId>
-+      <artifactId>org.jee</artifactId>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/glassfish-javaee.jar</systemPath>
++      <groupId>org.apache.geronimo.specs</groupId>
++      <artifactId>geronimo-jms_1.1_spec</artifactId>
 +    </dependency>
 +
- 
- 	<!--
- 	   Jetty
-@@ -296,4 +304,4 @@
-       </build>
-     </profile>
-   </profiles> 
+     <!--  
+      Spring Framework Dependencies
+     -->
+@@ -131,4 +136,4 @@
+ 	<build>
+ 		<finalName>${project.artifactId}</finalName>
+ 	</build>	
 -</project>
 \ No newline at end of file
 +</project>
---- a/uima-as/pom.xml
-+++ b/uima-as/pom.xml
-@@ -242,6 +242,7 @@
-       <version>5.4.1</version>
-     </dependency>
- 
-+<!--
-     <dependency>
-       <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-jms_1.1_spec</artifactId>
-@@ -259,6 +260,14 @@
-       <artifactId>geronimo-servlet_2.5_spec</artifactId>
-       <version>1.2</version>
-     </dependency>
-+-->
-+    <dependency>
-+      <groupId>org.jee</groupId>
-+      <artifactId>org.jee</artifactId>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/glassfish-javaee.jar</systemPath>
-+    </dependency>
-+
- 
- 	<!--
- 	   Jetty
-@@ -294,12 +303,14 @@
-       <artifactId>commons-dbcp</artifactId>
-       <version>1.2.2</version>
-     </dependency>
--    
-+   
-+<!-- 
-     <dependency>
-       <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-       <version>2.0.0</version>
-     </dependency>
-+-->
-   
-     <dependency>
-       <groupId>log4j</groupId>

-- 
Debian packaging for uima-as

More information about the pkg-java-commits mailing list