[tomcat7] 01/03: Revert "Build only the Servlet API (Closes: #819259, #834680)"
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat May 27 23:47:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/7.0.75-1_bpo8+1
in repository tomcat7.
commit e448723c6b85b892c030b3e15c76371785fda5b1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Nov 22 13:15:01 2016 +0100
Revert "Build only the Servlet API (Closes: #819259, #834680)"
This reverts commit b1a0bf4a4fb9c250b71267f06d07feba988abf14.
---
debian/control | 188 ++++++++++++++++++++++++++++-----------------------------
debian/rules | 104 +++++++++++++++----------------
2 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/debian/control b/debian/control
index 659dc1c..3d3859b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,79 +19,79 @@ Build-Depends-Indep: maven-repo-helper,
libobjenesis-java,
javahelper,
junit4,
-# libjstl1.1-java,
-# libjakarta-taglibs-standard-java,
-# lsb-release
+ libjstl1.1-java,
+ libjakarta-taglibs-standard-java,
+ lsb-release
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/tomcat7.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tomcat7.git
Homepage: http://tomcat.apache.org
-#Package: tomcat7-common
-#Architecture: all
-#Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
-# default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
-#Description: Servlet and JSP engine -- common files
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains common files needed by the tomcat7 and tomcat7-user
-# packages (Tomcat 6 scripts and libraries).
+Package: tomcat7-common
+Architecture: all
+Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
+ default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
+Description: Servlet and JSP engine -- common files
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains common files needed by the tomcat7 and tomcat7-user
+ packages (Tomcat 6 scripts and libraries).
-#Package: tomcat7
-#Architecture: all
-#Depends: tomcat7-common (>= ${source:Version}), ucf,
-# adduser, ${misc:Depends}
-#Recommends: authbind
-#Suggests: tomcat7-docs (>= ${source:Version}),
-# tomcat7-admin (>= ${source:Version}),
-# tomcat7-examples (>= ${source:Version}),
-# tomcat7-user (>= ${source:Version}),
-# libtcnative-1 (>= 1.1.32~)
-#Description: Servlet and JSP engine
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains only the startup scripts for the system-wide daemon.
-# No documentation or web applications are included here, please install
-# the tomcat7-docs and tomcat7-examples packages if you want them.
-# Install the authbind package if you need to use Tomcat on ports 1-1023.
-# Install tomcat7-user instead of this package if you don't want Tomcat to
-# start as a service.
+Package: tomcat7
+Architecture: all
+Depends: tomcat7-common (>= ${source:Version}), ucf,
+ adduser, ${misc:Depends}
+Recommends: authbind
+Suggests: tomcat7-docs (>= ${source:Version}),
+ tomcat7-admin (>= ${source:Version}),
+ tomcat7-examples (>= ${source:Version}),
+ tomcat7-user (>= ${source:Version}),
+ libtcnative-1 (>= 1.1.32~)
+Description: Servlet and JSP engine
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains only the startup scripts for the system-wide daemon.
+ No documentation or web applications are included here, please install
+ the tomcat7-docs and tomcat7-examples packages if you want them.
+ Install the authbind package if you need to use Tomcat on ports 1-1023.
+ Install tomcat7-user instead of this package if you don't want Tomcat to
+ start as a service.
-#Package: tomcat7-user
-#Architecture: all
-#Depends: tomcat7-common (>= ${source:Version}), netcat, ${misc:Depends}
-#Suggests: tomcat7-docs (>= ${source:Version}),
-# tomcat7-admin (>= ${source:Version}),
-# tomcat7-examples (>= ${source:Version}),
-# tomcat7 (>= ${source:Version})
-#Description: Servlet and JSP engine -- tools to create user instances
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains files needed to create a user Tomcat instance.
-# This user Tomcat instance can be started and stopped using the scripts
-# provided in the Tomcat instance directory.
+Package: tomcat7-user
+Architecture: all
+Depends: tomcat7-common (>= ${source:Version}), netcat, ${misc:Depends}
+Suggests: tomcat7-docs (>= ${source:Version}),
+ tomcat7-admin (>= ${source:Version}),
+ tomcat7-examples (>= ${source:Version}),
+ tomcat7 (>= ${source:Version})
+Description: Servlet and JSP engine -- tools to create user instances
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains files needed to create a user Tomcat instance.
+ This user Tomcat instance can be started and stopped using the scripts
+ provided in the Tomcat instance directory.
-#Package: libtomcat7-java
-#Architecture: all
-#Depends: libecj-java (>= 3.10.1~),
-# libcommons-pool-java,
-# libcommons-dbcp-java,
-# libservlet3.0-java (>= ${source:Version}), ${misc:Depends}
-#Conflicts: libtomcat6-java
-#Suggests: tomcat7 (>= ${source:Version})
-#Description: Servlet and JSP engine -- core libraries
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the Tomcat core classes which can be used by other
-# Java applications to embed Tomcat.
+Package: libtomcat7-java
+Architecture: all
+Depends: libecj-java (>= 3.10.1~),
+ libcommons-pool-java,
+ libcommons-dbcp-java,
+ libservlet3.0-java (>= ${source:Version}), ${misc:Depends}
+Conflicts: libtomcat6-java
+Suggests: tomcat7 (>= ${source:Version})
+Description: Servlet and JSP engine -- core libraries
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the Tomcat core classes which can be used by other
+ Java applications to embed Tomcat.
Package: libservlet3.0-java
Architecture: all
@@ -115,34 +115,34 @@ Description: Servlet 3.0 and JSP 2.2 Java API documentation
.
This package contains the documentation for the Java Servlet and JSP library.
-#Package: tomcat7-admin
-#Architecture: all
-#Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- admin web applications
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the administrative web interfaces.
+Package: tomcat7-admin
+Architecture: all
+Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- admin web applications
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the administrative web interfaces.
-#Package: tomcat7-examples
-#Architecture: all
-#Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends},
-# libjstl1.1-java, libjakarta-taglibs-standard-java
-#Description: Servlet and JSP engine -- example web applications
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the default Tomcat example webapps.
+Package: tomcat7-examples
+Architecture: all
+Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends},
+ libjstl1.1-java, libjakarta-taglibs-standard-java
+Description: Servlet and JSP engine -- example web applications
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the default Tomcat example webapps.
-#Package: tomcat7-docs
-#Section: doc
-#Architecture: all
-#Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends}
-#Description: Servlet and JSP engine -- documentation
-# Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
-# specifications from Sun Microsystems, and provides a "pure Java" HTTP web
-# server environment for Java code to run.
-# .
-# This package contains the online documentation web application.
+Package: tomcat7-docs
+Section: doc
+Architecture: all
+Depends: tomcat7-common (>= ${source:Version}), ${misc:Depends}
+Description: Servlet and JSP engine -- documentation
+ Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
+ specifications from Sun Microsystems, and provides a "pure Java" HTTP web
+ server environment for Java code to run.
+ .
+ This package contains the online documentation web application.
diff --git a/debian/rules b/debian/rules
index 5e19b49..f4087c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,12 @@ override_dh_auto_build:
-bottom "Copyright © 2000-2016 Apache Software Foundation. All Rights Reserved."
override_dh_auto_test:
-#ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-# mkdir -p webapps/examples/WEB-INF/lib
-# cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
-# cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
-# $(ANT) test
-#endif
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ mkdir -p webapps/examples/WEB-INF/lib
+ cp /usr/share/java/jstl1.1.jar webapps/examples/WEB-INF/lib/jstl.jar
+ cp /usr/share/java/standard.jar webapps/examples/WEB-INF/lib/standard.jar
+ $(ANT) test
+endif
override_dh_install-indep:
dh_install -i --exclude=.bat --exclude=Thumbs.db
@@ -53,50 +53,50 @@ override_dh_install-indep:
debian/javaxpoms/jsp-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' \
debian/poms/*.pom
-# mh_installpoms -plibtomcat7-java
-# for i in $(T_MAVENIZED_JARS); \
-# do \
-# mh_installjar -plibtomcat7-java -l \
-# debian/poms/tomcat-$$i.pom \
-# $(BLDLIB)/$$i.jar \
-# usr/share/tomcat7/lib/$$i.jar; \
-# done
-# mh_installjar -plibtomcat7-java -l --usj-name=catalina-tribes \
-# debian/poms/tomcat-tribes.pom \
-# $(BLDLIB)/catalina-tribes.jar \
-# usr/share/tomcat7/lib/catalina-tribes.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-api \
-# debian/poms/tomcat-api.pom \
-# $(BLDLIB)/tomcat-api.jar \
-# usr/share/tomcat7/lib/tomcat-api.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-coyote \
-# debian/poms/tomcat-coyote.pom \
-# $(BLDLIB)/tomcat-coyote.jar \
-# usr/share/tomcat7/lib/tomcat-coyote.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-juli \
-# debian/poms/tomcat-juli.pom \
-# $(BLDBIN)/tomcat-juli.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-util \
-# debian/poms/tomcat-util.pom \
-# $(BLDLIB)/tomcat-util.jar \
-# usr/share/tomcat7/lib/tomcat-util.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-jdbc \
-# debian/poms/tomcat-jdbc.pom \
-# output/jdbc-pool/tomcat-jdbc.jar \
-# usr/share/tomcat7/lib/tomcat-jdbc.jar
-# mh_installjar -plibtomcat7-java -l --usj-name=tomcat-catalina-jmx-remote \
-# debian/poms/tomcat-catalina-jmx-remote.pom \
-# output/extras/catalina-jmx-remote.jar \
-# usr/share/tomcat7/lib/catalina-jmx-remote.jar
+ mh_installpoms -plibtomcat7-java
+ for i in $(T_MAVENIZED_JARS); \
+ do \
+ mh_installjar -plibtomcat7-java -l \
+ debian/poms/tomcat-$$i.pom \
+ $(BLDLIB)/$$i.jar \
+ usr/share/tomcat7/lib/$$i.jar; \
+ done
+ mh_installjar -plibtomcat7-java -l --usj-name=catalina-tribes \
+ debian/poms/tomcat-tribes.pom \
+ $(BLDLIB)/catalina-tribes.jar \
+ usr/share/tomcat7/lib/catalina-tribes.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-api \
+ debian/poms/tomcat-api.pom \
+ $(BLDLIB)/tomcat-api.jar \
+ usr/share/tomcat7/lib/tomcat-api.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-coyote \
+ debian/poms/tomcat-coyote.pom \
+ $(BLDLIB)/tomcat-coyote.jar \
+ usr/share/tomcat7/lib/tomcat-coyote.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-juli \
+ debian/poms/tomcat-juli.pom \
+ $(BLDBIN)/tomcat-juli.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-util \
+ debian/poms/tomcat-util.pom \
+ $(BLDLIB)/tomcat-util.jar \
+ usr/share/tomcat7/lib/tomcat-util.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-jdbc \
+ debian/poms/tomcat-jdbc.pom \
+ output/jdbc-pool/tomcat-jdbc.jar \
+ usr/share/tomcat7/lib/tomcat-jdbc.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-catalina-jmx-remote \
+ debian/poms/tomcat-catalina-jmx-remote.pom \
+ output/extras/catalina-jmx-remote.jar \
+ usr/share/tomcat7/lib/catalina-jmx-remote.jar
-# for i in $(T_JARS); do \
-# mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(VERSION).jar && \
-# dh_install -plibtomcat7-java \
-# $(BLDLIB)/$$i-$(VERSION).jar usr/share/java && \
-# dh_link -plibtomcat7-java usr/share/java/$$i-$(VERSION).jar \
-# usr/share/java/$$i.jar && \
-# dh_link -ptomcat7-common usr/share/java/$$i-$(VERSION).jar \
-# usr/share/tomcat7/lib/$$i.jar; done
+ for i in $(T_JARS); do \
+ mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(VERSION).jar && \
+ dh_install -plibtomcat7-java \
+ $(BLDLIB)/$$i-$(VERSION).jar usr/share/java && \
+ dh_link -plibtomcat7-java usr/share/java/$$i-$(VERSION).jar \
+ usr/share/java/$$i.jar && \
+ dh_link -ptomcat7-common usr/share/java/$$i-$(VERSION).jar \
+ usr/share/tomcat7/lib/$$i.jar; done
mh_installpoms -plibservlet3.0-java
mh_installjar -plibservlet3.0-java -l -s \
@@ -119,9 +119,9 @@ override_dh_install-indep:
output/build/lib/el-api.jar
# update the checksum for the root webapp
-# unset rwmd5sum \
-# && rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \
-# && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm
+ unset rwmd5sum \
+ && rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \
+ && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm
jh_manifest
override_dh_auto_clean:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list