[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.28-1-2-gc736486

Jakub Adam jakub.adam at ktknet.cz
Tue Jul 10 18:40:46 UTC 2012


The following commit has been merged in the master branch:
commit f915574e7c8cc0ffa1f816a3adb6c36e6bc3c1e1
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jul 9 20:47:21 2012 +0000

    Ensure webapps/examples/WEB-INF/lib exists before files are copied there

diff --git a/debian/changelog b/debian/changelog
index d17f3db..e9ad547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.28-2) UNRELEASED; urgency=low
+
+  * Ensure webapps/examples/WEB-INF/lib exists before files are
+    copied there.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 10 Jul 2012 20:37:49 +0200
+
 tomcat7 (7.0.28-1) unstable; urgency=low
 
   [ Miguel Landaeta ]
diff --git a/debian/rules b/debian/rules
index 8b8f183..85f42b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ build-indep: build-stamp
 build-stamp:
 	dh_testdir
 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_INVOKE) deploy test

-- 
tomcat7: Servlet and JSP engine



More information about the pkg-java-commits mailing list