[tomcat7] 02/02: Prepare 7.0.53-1 upload to unstable
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri May 2 01:34:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository tomcat7.
commit d9328e2f79d5273ef7e3a9c74b27886df976f99a
Author: Miguel Landaeta <nomadium at debian.org>
Date: Thu May 1 22:35:26 2014 -0300
Prepare 7.0.53-1 upload to unstable
---
debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/patches/0011-fix-classpath-lintian-warnings.patch | 15 +++++++--------
debian/patches/0015_disable_test_TestCometProcessor.patch | 13 +++++++------
4 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index be32e9c..c89a792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tomcat7 (7.0.53-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh patches:
+ - debian/patches/0011-fix-classpath-lintian-warnings.patch.
+ - debian/patches/0015_disable_test_TestCometProcessor.patch.
+ * Update my email address in Uploaders list.
+
+ -- Miguel Landaeta <nomadium at debian.org> Thu, 01 May 2014 21:58:20 -0300
+
tomcat7 (7.0.52-1) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index 38f4cea..2762f9c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: James Page <james.page at ubuntu.com>,
- Miguel Landaeta <miguel at miguel.cc>,
+ Miguel Landaeta <nomadium at debian.org>,
tony mancill <tmancill at debian.org>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: default-jdk,
diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch
index dae8362..e000869 100644
--- a/debian/patches/0011-fix-classpath-lintian-warnings.patch
+++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch
@@ -1,7 +1,7 @@
Description: Fix codeless-jar and missing-classpath lintian warnings
-Author: Miguel Landaeta <miguel at miguel.cc>
+Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
-Last-Update: 2011-05-16
+Last-Update: 2014-05-01
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,7 @@ Last-Update: 2011-05-16
<!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
-- manifest="${tomcat.manifests}/default.manifest" >
+- manifest="${tomcat.manifests}/default.manifest" filesonly="true">
+ <zip destfile="${tomcat.build}/lib/tomcat-i18n-es.jar">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_es.properties" />
@@ -31,25 +31,24 @@ Last-Update: 2011-05-16
fullpath="META-INF/LICENSE" />
- </jar>
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
-- manifest="${tomcat.manifests}/default.manifest" >
+- manifest="${tomcat.manifests}/default.manifest" filesonly="true">
+ </zip>
+ <zip destfile="${tomcat.build}/lib/tomcat-i18n-fr.jar">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
-@@ -781,9 +780,8 @@
+@@ -781,8 +780,8 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
- </jar>
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
-- manifest="${tomcat.manifests}/default.manifest" >
+ </zip>
+ <zip destfile="${tomcat.build}/lib/tomcat-i18n-ja.jar">
+ manifest="${tomcat.manifests}/default.manifest" filesonly="true">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_ja.properties" />
- </fileset>
-@@ -791,7 +789,7 @@
+@@ -791,7 +790,7 @@
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch
index 5fa28f6..7cbce7c 100644
--- a/debian/patches/0015_disable_test_TestCometProcessor.patch
+++ b/debian/patches/0015_disable_test_TestCometProcessor.patch
@@ -1,18 +1,19 @@
--- a/test/org/apache/catalina/comet/TestCometProcessor.java
+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
-@@ -34,6 +34,7 @@ import static org.junit.Assert.fail;
-
+@@ -35,6 +35,7 @@ import static org.junit.Assert.fail;
import org.junit.Assert;
+ import org.junit.Assume;
import org.junit.Test;
+import org.junit.Ignore;
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
-@@ -191,6 +192,7 @@ public class TestCometProcessor extends
+@@ -187,7 +188,7 @@ public class TestCometProcessor extends
+ is.close();
}
- @Test
+- @Test
+ @Ignore("fails consistently on Debian/Linux")
public void testConnectionClose() throws Exception {
-
- if (!isCometSupported()) {
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support Comet.",
--
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