[tomcat8] 02/06: Moved the tomcat-{servlet|jsp|el}-api artifacts from libservlet3.1-java to libtomcat8-java
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Mon Sep 16 07:21:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit dc5c361a461f88ce065a8d955c75790b9a25b3cb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Sep 14 22:58:53 2013 +0200
Moved the tomcat-{servlet|jsp|el}-api artifacts from libservlet3.1-java to libtomcat8-java
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/libservlet3.1-java.poms | 3 ---
debian/libtomcat8-java.poms | 11 +++++++----
debian/rules | 33 ++++++++++++++++-----------------
debian/tomcat8-common.links | 3 ---
6 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5b48cd..f334af6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
* Added a Lintian override for the incompatible-java-bytecode-format warning
since Tomcat requires Java 7
* Added a patch to ignore the failing tests
+ * Moved the tomcat-{servlet|jsp|el}-api artifacts from libservlet3.1-java
+ to libtomcat8-java
-- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 16:10:10 +0200
diff --git a/debian/control b/debian/control
index 1da8c7c..e1b401e 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,7 @@ Architecture: all
Depends: libecj-java,
libcommons-pool-java,
libcommons-dbcp-java,
- libservlet3.1-java (>= ${source:Version}), ${misc:Depends}
+ ${misc:Depends}
Suggests: tomcat8 (>= ${source:Version})
Description: Apache Tomcat 8 - Servlet and JSP engine -- core libraries
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
diff --git a/debian/libservlet3.1-java.poms b/debian/libservlet3.1-java.poms
index 9d6a4cd..7100b07 100644
--- a/debian/libservlet3.1-java.poms
+++ b/debian/libservlet3.1-java.poms
@@ -1,6 +1,3 @@
-debian/poms/tomcat-servlet-api.pom --no-parent
-debian/poms/tomcat-jsp-api.pom --no-parent
-debian/poms/tomcat-el-api.pom --no-parent
debian/poms/servlet-api.pom --no-rules
debian/poms/jsp-api.pom --no-rules
debian/poms/el-api.pom --no-rules
diff --git a/debian/libtomcat8-java.poms b/debian/libtomcat8-java.poms
index e50a44e..55e7004 100644
--- a/debian/libtomcat8-java.poms
+++ b/debian/libtomcat8-java.poms
@@ -3,13 +3,16 @@ debian/poms/tomcat-api.pom
debian/poms/tomcat-catalina.pom
debian/poms/tomcat-catalina-ha.pom
debian/poms/tomcat-coyote.pom
+debian/poms/tomcat-el-api.pom
debian/poms/tomcat-jasper.pom
debian/poms/tomcat-jasper-el.pom
-debian/poms/tomcat-juli.pom
-debian/poms/tomcat-tribes.pom
-debian/poms/tomcat-util.pom
debian/poms/tomcat-jdbc.pom
debian/poms/tomcat-jni.pom
+debian/poms/tomcat-jsp-api.pom
+debian/poms/tomcat-juli.pom
+debian/poms/tomcat-servlet-api.pom
debian/poms/tomcat-spdy.pom
-debian/poms/tomcat-websocket-api.pom
+debian/poms/tomcat-tribes.pom
+debian/poms/tomcat-util.pom
debian/poms/tomcat-websocket.pom
+debian/poms/tomcat-websocket-api.pom
diff --git a/debian/rules b/debian/rules
index cf62b52..c04d93d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,16 +117,19 @@ binary-indep: build install
usr/share/tomcat8/lib/$$i.jar; \
done
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-tribes debian/poms/tomcat-tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat8/lib/catalina-tribes.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-api debian/poms/tomcat-api.pom $(BLDLIB)/tomcat-api.jar usr/share/tomcat8/lib/tomcat-api.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-coyote debian/poms/tomcat-coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat8/lib/tomcat-coyote.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-juli debian/poms/tomcat-juli.pom $(BLDBIN)/tomcat-juli.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-util debian/poms/tomcat-util.pom $(BLDLIB)/tomcat-util.jar usr/share/tomcat8/lib/tomcat-util.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jni debian/poms/tomcat-jni.pom $(BLDLIB)/tomcat-jni.jar usr/share/tomcat8/lib/tomcat-jni.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-spdy debian/poms/tomcat-spdy.pom $(BLDLIB)/tomcat-spdy.jar usr/share/tomcat8/lib/tomcat-spdy.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-websocket debian/poms/tomcat-websocket.pom $(BLDLIB)/tomcat-websocket.jar usr/share/tomcat8/lib/tomcat-websocket.jar
- mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jdbc debian/poms/tomcat-jdbc.pom output/jdbc-pool/tomcat-jdbc.jar usr/share/tomcat8/lib/tomcat-jdbc.jar
-
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-tribes debian/poms/tomcat-tribes.pom $(BLDLIB)/catalina-tribes.jar usr/share/tomcat8/lib/catalina-tribes.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-api debian/poms/tomcat-api.pom $(BLDLIB)/tomcat-api.jar usr/share/tomcat8/lib/tomcat-api.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-coyote debian/poms/tomcat-coyote.pom $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat8/lib/tomcat-coyote.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-juli debian/poms/tomcat-juli.pom $(BLDBIN)/tomcat-juli.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-util debian/poms/tomcat-util.pom $(BLDLIB)/tomcat-util.jar usr/share/tomcat8/lib/tomcat-util.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jni debian/poms/tomcat-jni.pom $(BLDLIB)/tomcat-jni.jar usr/share/tomcat8/lib/tomcat-jni.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-spdy debian/poms/tomcat-spdy.pom $(BLDLIB)/tomcat-spdy.jar usr/share/tomcat8/lib/tomcat-spdy.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-websocket debian/poms/tomcat-websocket.pom $(BLDLIB)/tomcat-websocket.jar usr/share/tomcat8/lib/tomcat-websocket.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-servlet-api debian/poms/tomcat-servlet-api.pom $(BLDLIB)/servlet-api.jar usr/share/tomcat8/lib/servlet-api.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jsp-api debian/poms/tomcat-jsp-api.pom $(BLDLIB)/jsp-api.jar usr/share/tomcat8/lib/jsp-api.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-el-api debian/poms/tomcat-el-api.pom $(BLDLIB)/el-api.jar usr/share/tomcat8/lib/el-api.jar
+ mh_installjar -plibtomcat8-java -l --usj-name=tomcat8-jdbc debian/poms/tomcat-jdbc.pom output/jdbc-pool/tomcat-jdbc.jar usr/share/tomcat8/lib/tomcat-jdbc.jar
+
# Install the i18n jars
for i in i18n-fr i18n-es i18n-ja; \
do \
@@ -152,13 +155,9 @@ binary-indep: build install
dh_link
mh_installpoms -plibservlet3.1-java
- mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-servlet-api.pom output/build/lib/servlet-api.jar
- mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-jsp-api.pom output/build/lib/jsp-api.jar
- mh_installjar -plibservlet3.1-java -l -s debian/poms/tomcat-el-api.pom output/build/lib/el-api.jar
-
- mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/poms/servlet-api.pom output/build/lib/servlet-api.jar
- mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api debian/poms/jsp-api.pom output/build/lib/jsp-api.jar
- mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api debian/poms/el-api.pom output/build/lib/el-api.jar
+ mh_installjar -plibservlet3.1-java -l -s --usj-name=servlet-api debian/poms/servlet-api.pom $(BLDLIB)/servlet-api.jar
+ mh_installjar -plibservlet3.1-java -l -s --usj-name=jsp-api debian/poms/jsp-api.pom $(BLDLIB)/jsp-api.jar
+ mh_installjar -plibservlet3.1-java -l -s --usj-name=el-api debian/poms/el-api.pom $(BLDLIB)/el-api.jar
rm -r debian/poms
rm -rf \
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 22ca9f9..80e069e 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -1,6 +1,3 @@
/usr/share/java/tomcat8-juli.jar /usr/share/tomcat8/bin/tomcat-juli.jar
/usr/share/java/commons-dbcp.jar /usr/share/tomcat8/lib/commons-dbcp.jar
/usr/share/java/commons-pool.jar /usr/share/tomcat8/lib/commons-pool.jar
-/usr/share/java/el-api-3.0.jar /usr/share/tomcat8/lib/el-api.jar
-/usr/share/java/jsp-api-2.3.jar /usr/share/tomcat8/lib/jsp-api.jar
-/usr/share/java/servlet-api-3.1.jar /usr/share/tomcat8/lib/servlet-api.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list