No subject
Miguel Landaeta
nomadium at debian.org
Fri Oct 3 22:33:25 UTC 2014
I tried to fix this bug by replacing the dependencies on tomcat6 with
tomcat8 but it looks like some porting is needed (assuming it can be
ported, of course).
I'm attaching a debdiff with the work I already done in case somebody
want to help. I'll check again in the next days to determine if this
plugin can be build with tomcat8 or not.
I'm also attaching the failed build log.
--
Miguel Landaeta, nomadium at debian.org
secure email with PGP 0x6E608B637D8967E9 available at http://miguel.cc/key.
"Faith means not wanting to know what is true." -- Nietzsche
-------------- next part --------------
diff -Nru tomcat-maven-plugin-1.1/debian/changelog tomcat-maven-plugin-1.1/debian/changelog
--- tomcat-maven-plugin-1.1/debian/changelog 2013-05-27 13:54:47.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/changelog 2014-10-03 19:04:23.000000000 -0300
@@ -1,3 +1,17 @@
+tomcat-maven-plugin (1.1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace dependencies on tomcat6 packages. (Closes: #686877, #759633).
+ - Refresh patch debian/patches/00-fix_build.patch.
+ - Add dependency on libecj-java.
+ - Refresh d/maven.rules.
+ * Fix FTBFS on armel using JamVM. (Closes: 631930).
+ * Bump debhelper compat level to 9.
+ * Bump Standards-Version to 3.9.6. No changes were required.
+ * Update copyright file to 1.0 format.
+
+ -- Miguel Landaeta <nomadium at debian.org> Fri, 03 Oct 2014 19:48:52 -0300
+
tomcat-maven-plugin (1.1-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru tomcat-maven-plugin-1.1/debian/compat tomcat-maven-plugin-1.1/debian/compat
--- tomcat-maven-plugin-1.1/debian/compat 2011-11-26 13:44:40.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/compat 2014-10-03 18:09:34.000000000 -0300
@@ -1 +1 @@
-7
+9
diff -Nru tomcat-maven-plugin-1.1/debian/control tomcat-maven-plugin-1.1/debian/control
--- tomcat-maven-plugin-1.1/debian/control 2013-05-27 13:54:42.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/control 2014-10-03 18:41:19.000000000 -0300
@@ -3,26 +3,28 @@
Priority: extra
Maintainer: David Paleino <dapal at debian.org>
Build-Depends:
- debhelper (>= 7.0.50~)
+ debhelper (>= 9~)
, default-jdk
, maven-debian-helper
, maven-repo-helper
Build-Depends-Indep:
libplexus-component-metadata-java
- , tomcat6-common
+ , libtomcat8-java
+ , libecj-java
, libmaven-plugin-tools-java
, libsurefire-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
Homepage: http://mojo.codehaus.org/tomcat-maven-plugin
-Vcs-Git: git://git.debian.org/collab-maint/tomcat-maven-plugin.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/tomcat-maven-plugin.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/tomcat-maven-plugin.git
+Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/tomcat-maven-plugin.git;a=summary
Package: libtomcat-maven-plugin-java
Architecture: all
Depends:
${misc:Depends}
, ${maven:Depends}
- , libtomcat6-java
+ , libtomcat8-java
+ , libecj-java
, libcommons-codec-java
, libwagon-java
, libplexus-archiver-java
diff -Nru tomcat-maven-plugin-1.1/debian/copyright tomcat-maven-plugin-1.1/debian/copyright
--- tomcat-maven-plugin-1.1/debian/copyright 2011-11-26 13:44:40.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/copyright 2014-10-03 18:12:53.000000000 -0300
@@ -1,11 +1,14 @@
-Format-Specification: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: tomcat-maven-plugin
+Upstream-Contact: Mark Hobson <markhobson at gmail.com>
+Source: http://mojo.codehaus.org/tomcat-maven-plugin
Files: *
-Copyright: ? 2005-2006, Mark Hobson
+Copyright: 2005-2006, Mark Hobson
License: Apache-2.0
Files: debian/*
-Copyright: ? 2010, David Paleino <dapal at debian.org>
+Copyright: 2010, David Paleino <dapal at debian.org>
License: Apache-2.0
License: Apache-2.0
diff -Nru tomcat-maven-plugin-1.1/debian/maven.rules tomcat-maven-plugin-1.1/debian/maven.rules
--- tomcat-maven-plugin-1.1/debian/maven.rules 2011-11-26 13:44:40.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/maven.rules 2014-10-03 19:03:34.000000000 -0300
@@ -1,5 +1,11 @@
org.codehaus.plexus plexus-component-metadata pom s/1\.*/1.0-beta-3.0.7/
-s/org.apache.tomcat/commons-dbcp/ s/dbcp/commons-dbcp/ jar s/.*/debian/
+org.apache.tomcat s/dbcp/tomcat-dbcp/ jar s/.*/8.x/
+org.apache.tomcat s/catalina/tomcat-catalina/ jar s/.*/8.x/
+org.apache.tomcat s/catalina-ha/tomcat-catalina-ha/ jar s/.*/8.x/
+org.apache.tomcat s/tribes/tomcat-tribes/ jar s/.*/8.x/
+org.apache.tomcat s/jasper/tomcat-jasper/ jar s/.*/8.x/
+org.apache.tomcat s/jasper-el/tomcat-jasper-el/ jar s/.*/8.x/
+org.apache.tomcat s/coyote/tomcat-coyote/ jar s/.*/8.x/
s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/
s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/
s/org.apache.tomcat/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
diff -Nru tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch
--- tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch 2011-11-26 13:44:40.000000000 -0300
+++ tomcat-maven-plugin-1.1/debian/patches/00-fix_build.patch 2014-10-03 18:21:15.000000000 -0300
@@ -14,7 +14,7 @@
<version>${tomcat.version}</version>
- <scope>runtime</scope>
+ <scope>system</scope>
-+ <systemPath>/usr/share/tomcat6/lib/jasper-jdt.jar</systemPath>
++ <systemPath>/usr/share/java/ecj.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tomcat-maven-plugin_1.1-2.2_amd64.build.gz
Type: application/octet-stream
Size: 15783 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/attachments/20141003/a72dcee1/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/attachments/20141003/a72dcee1/attachment-0001.sig>
More information about the pkg-java-maintainers
mailing list