[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.40-2-9-g376093b

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 376093b1ce9ad2b2aa0e5d33487c868489badf26
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 19 10:13:47 2013 +0200

    New upstream release, added some build-deps

diff --git a/debian/changelog b/debian/changelog
index e7ab3fc..a3afc8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 tomcat7 (7.0.42-1) unstable; urgency=low
 
   * New upstream release.
+  * Added libhamcrest-java >= 1.3 as build-dep,
+    tweaked debian/rules.
+  * Bumped compat level to 9.
+  * Removed some version checks, newer releases already in oldstable.
+  * Refresh patches.
+  * debian/control: changed Vcs-Git and Vcs-Browser fields,
+    now they are canonical.
 
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 16 Jul 2013 17:34:58 +0200
 
@@ -92,7 +99,7 @@ tomcat7 (7.0.28-4) unstable; urgency=high
 
   * Acknowledge NMU: 7.0.28-3+nmu1 (Closes: #692440)
     - Thank you to Michael Gilbert.
-  * Add patches for the following security issues: (Closes: #695251)
+  0* Add patches for the following security issues: (Closes: #695251)
     - CVE-2012-4431, CVE-2012-3546
 
  -- tony mancill <tmancill at debian.org>  Thu, 06 Dec 2012 22:25:07 -0800
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index dba21b6..6969178 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Uploaders: James Page <james.page at ubuntu.com>,
  Miguel Landaeta <miguel at miguel.cc>,
  tony mancill <tmancill at debian.org>,
  Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
-Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java, javahelper,
+Build-Depends: default-jdk, ant-optional, debhelper (>= 9), po-debconf, libhamcrest-java (>= 1.3)
+Build-Depends-Indep: maven-repo-helper, libecj-java, javahelper,
  junit4, libjstl1.1-java, libjakarta-taglibs-standard-java
 Standards-Version: 3.9.4
-Vcs-Git: git://git.debian.org/git/pkg-java/tomcat7.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/tomcat7.git
+Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat7.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat7.git
 Homepage: http://tomcat.apache.org
 
 Package: tomcat7-common
diff --git a/debian/rules b/debian/rules
index eb399a7..396acdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ JAVA_CMD := $(JAVA_HOME)/bin/java
 BLDLIB := output/build/lib
 BLDBIN := output/build/bin
 DEB_JARS_BASE := /usr/share/java
-DEB_JARS := ant ant-launcher ant-trax ant-nodeps ant-junit4 ant-junit junit4
+DEB_JARS := ant ant-launcher ant-trax ant-nodeps ant-junit4 ant-junit junit4 hamcrest-1.3
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
 	if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
 	if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
@@ -34,6 +34,7 @@ ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.target=1.6 \
 	-Djdt.jar=/usr/share/java/ecj.jar \
 	-Djunit.jar=/usr/share/java/junit4.jar \
+	-Dhamcrest.jar=/usr/share/java/hamcrest-core.jar \
 	-Dversion=$(T_VER) \
     -Dversion.major="$(T_VER_MAJOR)" \
     -Dversion.minor="$(T_VER_MINOR)" \

-- 
tomcat7: Servlet and JSP engine