[tomcat8] 05/06: Removed the tomcat8-examples package

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/8.5.11-1_bpo7+1
in repository tomcat8.

commit 43dbb4022a9e03abee4cb922e4a61531c118a09f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 26 15:12:09 2017 +0100

    Removed the tomcat8-examples package
---
 debian/changelog |  1 +
 debian/control   | 19 +------------------
 debian/rules     |  3 ---
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86ca299..4a762f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ tomcat8 (8.5.11-1~bpo7+1) wheezy-backports-sloppy; urgency=medium
     - Modified the tests to compile and run with the versions of JUnit,
       Hamcrest and EasyMock available in Wheezy
     - Switch back to debhelper level 9
+    - Removed the tomcat8-examples package
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 Jan 2017 22:58:42 +0100
 
diff --git a/debian/control b/debian/control
index bf27fc8..b241021 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,6 @@ Build-Depends-Indep: javahelper,
                      libeasymock-java,
                      libecj-java (>= 3.11.0),
                      libhamcrest-java (>= 1.2),
-                     libtaglibs-standard-spec-java,
-                     libtaglibs-standard-impl-java,
                      libtcnative-1,
                      libobjenesis-java,
                      lsb-release,
@@ -47,7 +45,6 @@ Depends: adduser, tomcat8-common (>= ${source:Version}), ucf, ${misc:Depends}
 Recommends: authbind, libtcnative-1 (>= 1.2.6~)
 Suggests: tomcat8-admin (>= ${source:Version}),
           tomcat8-docs (>= ${source:Version}),
-          tomcat8-examples (>= ${source:Version}),
           tomcat8-user (>= ${source:Version})
 Description: Apache Tomcat 8 - Servlet and JSP engine
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
@@ -66,8 +63,7 @@ Architecture: all
 Depends: netcat, tomcat8-common (>= ${source:Version}), ${misc:Depends}
 Suggests: tomcat8 (>= ${source:Version}),
           tomcat8-admin (>= ${source:Version}),
-          tomcat8-docs (>= ${source:Version}),
-          tomcat8-examples (>= ${source:Version})
+          tomcat8-docs (>= ${source:Version})
 Description: Apache Tomcat 8 - Servlet and JSP engine -- tools to create user instances
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
@@ -133,19 +129,6 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- admin web applications
  .
  This package contains the administrative web interfaces.
 
-Package: tomcat8-examples
-Architecture: all
-Depends: libtaglibs-standard-spec-java,
-         libtaglibs-standard-impl-java,
-         tomcat8-common (>= ${source:Version}),
-         ${misc:Depends}
-Description: Apache Tomcat 8 - Servlet and JSP engine -- example web applications
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Oracle, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains the default Tomcat example webapps.
-
 Package: tomcat8-docs
 Section: doc
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 8f0609b..856a049 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,6 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	mkdir -p webapps/examples/WEB-INF/lib
-	cp /usr/share/java/taglibs-standard-spec.jar webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar
-	cp /usr/share/java/taglibs-standard-impl.jar webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
 	$(ANT) test -Dtest.apr.loc=/usr/lib/$(shell dpkg-architecture --query DEB_BUILD_MULTIARCH) -Dtest.verbose=false
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git