On Thu, Dec 15, 2011 at 01:08:55PM +0100, Mònica Ramírez Arceda wrote: > Relevant part: > > > > Results : > > > > Failed tests: com.puppycrawl.tools.checkstyle.UtilsTest.testBadRegex(): > > Failed to initialise regexp expression [ > > [snip]
The tests don't appear to fail anymore, but the package then fails to
build because it can't find checkstyle.jar. This looks like it's due to
changes in some of the helper tools used for building.
Applying the below diff (noisier than it should be due to extra comments
added by the helper tools) to debian/checkstyle.poms looks like it fixes
the build. The only worrying difference is that checkstyle-javadoc.jar
is no longer present in checkstyle-doc. I don't know enough about java
packaging to know if that's a problem or not.
$ svn diff debian/checkstyle.poms
Index: debian/checkstyle.poms
===================================================================
--- debian/checkstyle.poms (revision 16124)
+++ debian/checkstyle.poms (working copy)
@@ -1,7 +1,28 @@
# List of POM files for the package
# Format of this file is:
-# <path to pom file> [option]
+# <path to pom file> [option]*
# where option can be:
-# --ignore: ignore this POM or
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install,
mh_installpoms]
# --no-parent: remove the <parent> tag from the POM
-pom.xml --no-parent
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is
the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in
/usr/share/java
+# --usj-version=<version>: version to use when installing the library in
/usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by
default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to
be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --artifact=target/checkstyle-*.jar --java-lib
$ debdiff ../checkstyle_5.4-1_all.deb ../checkstyle_5.4-1.1_all.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /usr/share/java/checkstyle.jar
lrwxrwxrwx root/root /usr/share/java/checkstyle-5.4.jar -> checkstyle.jar
lrwxrwxrwx root/root
/usr/share/maven-repo/com/puppycrawl/tools/checkstyle/5.4/checkstyle-5.4.jar ->
../../../../../../java/checkstyle.jar
lrwxrwxrwx root/root
/usr/share/maven-repo/com/puppycrawl/tools/checkstyle/debian/checkstyle-debian.jar
-> ../../../../../../java/checkstyle.jar
Files in first .deb but not in second
-------------------------------------
-rw-r--r-- root/root
/usr/share/maven-repo/com/puppycrawl/tools/checkstyle/5.4/checkstyle-5.4.jar
lrwxrwxrwx root/root /usr/share/java/checkstyle-5.4.jar ->
../maven-repo/com/puppycrawl/tools/checkstyle/5.4/checkstyle-5.4.jar
lrwxrwxrwx root/root /usr/share/java/checkstyle.jar ->
../maven-repo/com/puppycrawl/tools/checkstyle/5.4/checkstyle-5.4.jar
lrwxrwxrwx root/root
/usr/share/maven-repo/com/puppycrawl/tools/checkstyle/debian/checkstyle-debian.jar
-> ../5.4/checkstyle-5.4.jar
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-844-] {+792+}
Version: [-5.4-1-] {+5.4-1.1+}
$ debdiff ../checkstyle-doc_5.4-1_all.deb ../checkstyle-doc_5.4-1.1_all.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in first .deb but not in second
-------------------------------------
-rw-r--r-- root/root
/usr/share/maven-repo/com/puppycrawl/tools/checkstyle/5.4/checkstyle-5.4-javadoc.jar
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-14876-] {+12903+}
Version: [-5.4-1-] {+5.4-1.1+}
--
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
signature.asc
Description: Digital signature
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.
