This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 938491167a26c89bbf12ab3c88567010c584a646 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 16 10:36:34 2013 +0200 Use a Lintian override to clear the codeless-jar warnings on the tomcat-i18n jars instead of a patch turning them into zip files --- debian/changelog | 2 + debian/libtomcat8-java.lintian-overrides | 2 + .../0011-fix-classpath-lintian-warnings.patch | 46 +------------------- 3 files changed, 5 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22c9aa5..634f92d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low deploys only the jars in /usr/share/java and the Maven artifacts in /usr/share/maven-repo. * Added the EL and WebSocket APIs to libservlet3.1-java-doc + * Use a Lintian override to clear the codeless-jar warnings on the tomcat-i18n + jars instead of a patch turning them into zip files. -- Emmanuel Bourg <[email protected]> Thu, 12 Sep 2013 16:10:10 +0200 diff --git a/debian/libtomcat8-java.lintian-overrides b/debian/libtomcat8-java.lintian-overrides new file mode 100644 index 0000000..88a68da --- /dev/null +++ b/debian/libtomcat8-java.lintian-overrides @@ -0,0 +1,2 @@ +# The i18n jars contain only properties files +libtomcat8-java: codeless-jar usr/share/java/tomcat8-i18n* diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch index 242e8c8..b6c0c2b 100644 --- a/debian/patches/0011-fix-classpath-lintian-warnings.patch +++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch @@ -1,8 +1,7 @@ -Description: Fix codeless-jar and missing-classpath lintian warnings +Description: Fix missing-classpath lintian warnings Author: Miguel Landaeta <[email protected]> Forwarded: no Last-Update: 2011-05-16 - --- a/build.xml +++ b/build.xml @@ -755,6 +755,7 @@ @@ -13,49 +12,6 @@ Last-Update: 2011-05-16 meta-inf="${tomcat.manifests}/jasper.jar"/> <!-- Jasper EL Implementation JAR File --> -@@ -763,8 +764,7 @@ - filesId="files.jasper-el" /> - - <!-- i18n JARs --> -- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar" -- manifest="${tomcat.manifests}/default.manifest" > -+ <zip destfile="${tomcat.build}/lib/tomcat-i18n-es.jar"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_es.properties" /> - </fileset> -@@ -772,9 +772,8 @@ - fullpath="META-INF/NOTICE" /> - <zipfileset file="${tomcat.manifests}/default.license" - fullpath="META-INF/LICENSE" /> -- </jar> -- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar" -- manifest="${tomcat.manifests}/default.manifest" > -+ </zip> -+ <zip destfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_fr.properties" /> - </fileset> -@@ -782,9 +781,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"> - <fileset dir="${tomcat.classes}"> - <include name="**/LocalStrings_ja.properties" /> - </fileset> -@@ -792,7 +790,7 @@ - fullpath="META-INF/NOTICE" /> - <zipfileset file="${tomcat.manifests}/default.license" - fullpath="META-INF/LICENSE" /> -- </jar> -+ </zip> - - </target> - --- /dev/null +++ b/res/META-INF/jasper.jar.manifest @@ -0,0 +1,10 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
