[tomcat6] 01/04: Build only the libservlet2.5-java and libservlet2.5-java-doc packages
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 22 08:49:40 BST 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat6.
commit e518fcbd3a48ed7caf36f613d1220f1098cfae44
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Oct 22 09:47:31 2014 +0200
Build only the libservlet2.5-java and libservlet2.5-java-doc packages
---
debian/changelog | 8 ++
debian/control | 218 +++++++++++++++++++++++++++----------------------------
debian/rules | 56 +++++++-------
3 files changed, 145 insertions(+), 137 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c0e232..e84db41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat6 (6.0.41-3) UNRELEASED; urgency=medium
+
+ * Build only the libservlet2.5-java and libservlet2.5-java-doc packages.
+ Tomcat 6 will not be supported in Jessie, but the Servlet API is still
+ useful as a build dependency for other packages.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 06 Oct 2014 19:26:21 +0200
+
tomcat6 (6.0.41-2) unstable; urgency=medium
[ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index 8c6ae22..48f7648 100644
--- a/debian/control
+++ b/debian/control
@@ -15,81 +15,81 @@ Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat6.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat6.git
Homepage: http://tomcat.apache.org
-Package: tomcat6-common
-Architecture: all
-Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends},
- default-jre-headless | java7-runtime-headless | java7-runtime | java6-runtime-headless | java6-runtime | java5-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 tomcat6 and tomcat6-user
- packages (Tomcat 6 scripts and libraries).
+#Package: tomcat6-common
+#Architecture: all
+#Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends},
+# default-jre-headless | java7-runtime-headless | java7-runtime | java6-runtime-headless | java6-runtime | java5-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 tomcat6 and tomcat6-user
+# packages (Tomcat 6 scripts and libraries).
-Package: tomcat6
-Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), ucf,
- adduser, ${misc:Depends}
-Recommends: authbind
-Suggests: tomcat6-docs (>= ${source:Version}),
- tomcat6-admin (>= ${source:Version}),
- tomcat6-examples (>= ${source:Version}),
- tomcat6-user (>= ${source:Version}),
- libtcnative-1 (>= 1.1.30)
-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 tomcat6-docs and tomcat6-examples packages if you want them.
- Install the authbind package if you need to use Tomcat on ports 1-1023.
- Install tomcat6-user instead of this package if you don't want Tomcat to
- start as a service.
+#Package: tomcat6
+#Architecture: all
+#Depends: tomcat6-common (>= ${source:Version}), ucf,
+# adduser, ${misc:Depends}
+#Recommends: authbind
+#Suggests: tomcat6-docs (>= ${source:Version}),
+# tomcat6-admin (>= ${source:Version}),
+# tomcat6-examples (>= ${source:Version}),
+# tomcat6-user (>= ${source:Version}),
+# libtcnative-1 (>= 1.1.30)
+#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 tomcat6-docs and tomcat6-examples packages if you want them.
+# Install the authbind package if you need to use Tomcat on ports 1-1023.
+# Install tomcat6-user instead of this package if you don't want Tomcat to
+# start as a service.
-Package: tomcat6-user
-Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
-Suggests: tomcat6-docs (>= ${source:Version}),
- tomcat6-admin (>= ${source:Version}),
- tomcat6-examples (>= ${source:Version}),
- tomcat6 (>= ${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: tomcat6-user
+#Architecture: all
+#Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
+#Suggests: tomcat6-docs (>= ${source:Version}),
+# tomcat6-admin (>= ${source:Version}),
+# tomcat6-examples (>= ${source:Version}),
+# tomcat6 (>= ${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: libtomcat6-java
-Architecture: all
-Depends: libecj-java,
- libcommons-dbcp-java,
- libcommons-pool-java,
- libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
-Suggests: tomcat6 (>= ${source:Version})
-Conflicts: tomcat6-common (<< 6.0.20-5)
-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: libtomcat6-java
+#Architecture: all
+#Depends: libecj-java,
+# libcommons-dbcp-java,
+# libcommons-pool-java,
+# libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
+#Suggests: tomcat6 (>= ${source:Version})
+#Conflicts: tomcat6-common (<< 6.0.20-5)
+#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: libservlet2.4-java
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, libservlet2.5-java
-Description: Transitional package for libservlet2.5-java
- This is a transitional package to facilitate upgrading from
- libservlet2.4-java to libservlet2.5-java, and can be safely
- removed after the installation is complete.
+#Package: libservlet2.4-java
+#Section: oldlibs
+#Priority: extra
+#Architecture: all
+#Depends: ${misc:Depends}, libservlet2.5-java
+#Description: Transitional package for libservlet2.5-java
+# This is a transitional package to facilitate upgrading from
+# libservlet2.4-java to libservlet2.5-java, and can be safely
+# removed after the installation is complete.
Package: libservlet2.5-java
Architecture: all
@@ -114,44 +114,44 @@ Description: Servlet 2.5 and JSP 2.1 Java API documentation
.
This package contains the documentation for the Java Servlet and JSP library.
-Package: tomcat6-admin
-Architecture: all
-Depends: tomcat6-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: tomcat6-admin
+#Architecture: all
+#Depends: tomcat6-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: tomcat6-examples
-Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-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: tomcat6-examples
+#Architecture: all
+#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+#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: tomcat6-docs
-Section: doc
-Architecture: all
-Depends: tomcat6-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: tomcat6-docs
+#Section: doc
+#Architecture: all
+#Depends: tomcat6-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: tomcat6-extras
-Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-Description: Servlet and JSP engine -- additional components
- 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 additional ("extra") component libraries.
- (Currently only catalina-jmx-remote.jar.)
+#Package: tomcat6-extras
+#Architecture: all
+#Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
+#Description: Servlet and JSP engine -- additional components
+# 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 additional ("extra") component libraries.
+# (Currently only catalina-jmx-remote.jar.)
diff --git a/debian/rules b/debian/rules
index 8162d37..b9fe12c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-indep: build install
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installman -ptomcat6-user debian/tomcat6-instance-create.1
+ #dh_installman -ptomcat6-user debian/tomcat6-instance-create.1
dh_installexamples
dh_installinit --error-handler=true -- defaults 92 08
dh_installdebconf
@@ -90,30 +90,30 @@ binary-indep: build install
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/el-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/2.1/' debian/poms/jsp-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(T_VER)/' debian/poms/*.pom
- mh_installpoms -plibtomcat6-java
- for i in $(T_MAVENIZED_JARS); do \
- mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
- mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom \
- $(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
- mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom \
- $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
- mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
- for i in $(T_JARS); do \
- mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
- dh_install -plibtomcat6-java \
- $(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
- dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
- usr/share/java/$$i.jar && \
- dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
- usr/share/tomcat6/lib/$$i.jar; done
- for i in $(T_EXTRAS_JARS); do \
- mv output/extras/$$i.jar output/extras/$$i-$(T_VER).jar && \
- dh_install -plibtomcat6-java \
- output/extras/$$i-$(T_VER).jar usr/share/java && \
- dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
- usr/share/java/$$i.jar && \
- dh_link -ptomcat6-extras usr/share/java/$$i-$(T_VER).jar \
- usr/share/tomcat6/lib/$$i.jar; done
+ #mh_installpoms -plibtomcat6-java
+ #for i in $(T_MAVENIZED_JARS); do \
+ # mh_installjar -plibtomcat6-java -l debian/poms/$$i.pom $(BLDLIB)/$$i.jar usr/share/tomcat6/lib/$$i.jar; done
+ #mh_installjar -plibtomcat6-java -l --usj-name=catalina-tribes debian/poms/tribes.pom \
+ # $(BLDLIB)/catalina-tribes.jar usr/share/tomcat6/lib/catalina-tribes.jar
+ #mh_installjar -plibtomcat6-java -l --usj-name=tomcat-coyote debian/poms/coyote.pom \
+ # $(BLDLIB)/tomcat-coyote.jar usr/share/tomcat6/lib/tomcat-coyote.jar
+ #mh_installjar -plibtomcat6-java -l --usj-name=tomcat-juli debian/poms/juli.pom $(BLDBIN)/tomcat-juli.jar
+ #for i in $(T_JARS); do \
+ # mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
+ # dh_install -plibtomcat6-java \
+ # $(BLDLIB)/$$i-$(T_VER).jar usr/share/java && \
+ # dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
+ # usr/share/java/$$i.jar && \
+ # dh_link -ptomcat6-common usr/share/java/$$i-$(T_VER).jar \
+ # usr/share/tomcat6/lib/$$i.jar; done
+ #for i in $(T_EXTRAS_JARS); do \
+ # mv output/extras/$$i.jar output/extras/$$i-$(T_VER).jar && \
+ # dh_install -plibtomcat6-java \
+ # output/extras/$$i-$(T_VER).jar usr/share/java && \
+ # dh_link -plibtomcat6-java usr/share/java/$$i-$(T_VER).jar \
+ # usr/share/java/$$i.jar && \
+ # dh_link -ptomcat6-extras usr/share/java/$$i-$(T_VER).jar \
+ # usr/share/tomcat6/lib/$$i.jar; done
dh_install --exclude=.bat --exclude=Thumbs.db
dh_link
mh_installpoms -plibservlet2.5-java
@@ -123,9 +123,9 @@ binary-indep: build install
rm -r debian/poms
rm -rf debian/tomcat6/usr/share/tomcat6/webapps/default_root/.svn \
debian/tomcat6/usr/share/tomcat6/webapps/default_root/META-INF/.svn
- chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
- chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
- chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
+ #chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
+ #chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
+ #chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
dh_compress
dh_fixperms
dh_installdeb
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git
More information about the pkg-java-commits
mailing list