[SCM] Debian packaging for uimaj branch, master, updated. debian/2.4.0-2-1-g451e6c1

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 451e6c1422be2146dffdd4c27db3f02d39d1b128
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 30 00:37:36 2013 +0200

    Removed the dependency on libgeronimo-activation-1.1-spec-java (no longer required with Java 6)

diff --git a/debian/changelog b/debian/changelog
index 6e34b09..a76b7fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+uimaj (2.4.0-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Removed the dependency on libgeronimo-activation-1.1-spec-java
+  * Updated Standards-Version to 3.9.4 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Apr 2013 17:53:45 +0200
+
 uimaj (2.4.0-2) unstable; urgency=low
 
   * d/patches/java7-compat.diff: Fix FTBFS with Java7.
diff --git a/debian/control b/debian/control
index b7c7b84..83a8d85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>,
-           Damien Raude-Morvan <drazzib at debian.org>
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: cdbs,
                debhelper (>= 7),
                default-jdk,
@@ -21,7 +22,6 @@ Build-Depends-Indep: ant,
                      libaxis-java,
                      libbuild-helper-maven-plugin-java,
                      libcommons-io-java,
-                     libgeronimo-activation-1.1-spec-java,
                      libjaxp1.3-java,
                      liblog4j1.2-java,
                      libmaven-install-plugin-java,
@@ -32,7 +32,7 @@ Build-Depends-Indep: ant,
                      libxerces2-java,
                      libxml-commons-resolver1.1-java,
                      xsltproc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/pkg-java/uimaj.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/uimaj.git
 Homepage: http://uima.apache.org/
@@ -78,7 +78,6 @@ Description: Library to handle Vinci web service protocol
 Package: libuima-adapter-soap-java
 Architecture: all
 Depends: libaxis-java,
-         libgeronimo-activation-1.1-spec-java,
          libuima-core-java (>= ${source:Version}),
          ${misc:Depends}
 Description: Library to provide SOAP web services within UIMA
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 21a5706..08f7508 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,3 +16,4 @@
 
 org.apache.maven.plugins maven-eclipse-plugin maven-plugin * * *
 org.apache.rat apache-rat-plugin maven-plugin * * *
+org.apache.geronimo.specs geronimo-activation_1.0.2_spec * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index b8f591f..d2b7032 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,5 +18,4 @@
 
 junit junit jar s/.*/3.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
-org.apache.geronimo.specs s/geronimo-activation_1.0.2_spec/geronimo-activation_1.1_spec/ jar s/.*/debian/ * *
 org.apache.uima * jar s/.*/debian/ * *

-- 
Debian packaging for uimaj