Hello, On Tue, Mar 24, 2009 at 11:42 PM, Sylvestre Ledru <sylvestre.ledru@inria.fr> wrote:
Le mardi 24 mars 2009 à 23:38 +0100, Dominik Smatana a écrit :Hello, I made fix for bug #512149 - checkstyle: provide /usr/bin/checkstyle http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512149 (see attached diff.txt) Could I commit this fix to SVN for review please?Sounds good. However, have you considered using java-wrappers ? It is providing some intersting features for this kind of wrappers.
I'm sending improved version (using java-wrappers) for review please. (see attached diff2.txt)
Any feedback is welcome. Thanks Dominik Smatana
Attachment:
signature.asc
Description: OpenPGP digital signature
Index: debian/control =================================================================== --- debian/control (revision 8114) +++ debian/control (working copy) @@ -4,15 +4,15 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>, Paul Cager <paul-debian@home.paulcager.org> Build-Depends: cdbs, debhelper (>= 5), ant -Build-Depends-Indep: java-gcj-compat-dev, ant-optional, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr (>= 2.7.6), libcommons-cli-java, velocity, libjdom0-java, tofrodos -Standards-Version: 3.7.3 +Build-Depends-Indep: default-jdk, ant-optional, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr (>= 2.7.6), libcommons-cli-java, velocity, libjdom0-java, tofrodos +Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/checkstyle Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/checkstyle Homepage: http://checkstyle.sourceforge.net/ Package: checkstyle Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr, libcommons-cli-java +Depends: default-jre | java1-runtime | java2-runtime, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libcommons-collections-java (>= 2.1), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr, libcommons-cli-java, java-wrappers (>= 0.1.6) Description: checks Java source against a coding standard Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard. It automates the process of checking Java Index: debian/dirs =================================================================== --- debian/dirs (revision 8114) +++ debian/dirs (working copy) @@ -1,3 +1,4 @@ +usr/bin usr/share/java usr/share/checkstyle/dtd usr/share/checkstyle/xsl Index: debian/wrappers/checkstyle =================================================================== --- debian/wrappers/checkstyle (revision 0) +++ debian/wrappers/checkstyle (revision 0) @@ -0,0 +1,11 @@ +#!/bin/sh + +# Include the wrappers utility script +. /usr/lib/java-wrappers/java-wrappers.sh + +find_java_runtime default-jre + +find_jars antlr commons-beanutils commons-collections commons-logging commons-cli checkstyle + +run_java com.puppycrawl.tools.checkstyle.Main "$@" + Property changes on: debian/wrappers/checkstyle ___________________________________________________________________ Added: svn:executable + * Index: debian/install =================================================================== --- debian/install (revision 0) +++ debian/install (revision 0) @@ -0,0 +1 @@ +debian/wrappers/checkstyle usr/bin/ Index: debian/changelog =================================================================== --- debian/changelog (revision 8114) +++ debian/changelog (working copy) @@ -1,3 +1,10 @@ +checkstyle (4.4+dfsg-3) unstable; urgency=low + + * Added wrapper for checkstyle.jar (closes: #512149) + * Updated to standards version 3.8.0 + + -- Dominik Smatana <dominik.smatana@gmail.com> Tue, 24 Mar 2009 23:23:03 +0100 + checkstyle (4.4+dfsg-2) UNRELEASED; urgency=low * Fixed watch file to match current version scheme also. Index: debian/rules =================================================================== --- debian/rules (revision 8114) +++ debian/rules (working copy) @@ -10,7 +10,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ ANT_HOME := /usr/share/ant DEB_JARS := junit commons-beanutils commons-collections commons-logging regexp antlr commons-cli $(ANT_HOME)/lib/ant-nodeps.jar velocity jdom0 xercesImpl logkit log4j-1.2 VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+.*//')