[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Fix for #512149 - checkstyle: provide /usr/bin/checkstyle



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?

Thanks
Dominik Smatana
Index: control
===================================================================
--- control	(revision 8114)
+++ 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
 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: wrappers/checkstyle
===================================================================
--- wrappers/checkstyle	(revision 0)
+++ wrappers/checkstyle	(revision 0)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$1" = "-classpath" ]
+then
+  CLASSPATH="$2"
+  shift 2
+fi
+
+CLASSPATH="${CLASSPATH:-.}:/usr/share/java/antlr.jar:/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-collections.jar:/usr/share/java/commons-logging.jar:/usr/share/java/commons-cli.jar:/usr/share/java/checkstyle.jar"
+export CLASSPATH
+
+exec /usr/bin/java com.puppycrawl.tools.checkstyle.Main "$@"

Property changes on: wrappers/checkstyle
___________________________________________________________________
Added: svn:executable
   + *

Index: install
===================================================================
--- install	(revision 0)
+++ install	(revision 0)
@@ -0,0 +1 @@
+debian/wrappers/checkstyle usr/bin/
Index: changelog
===================================================================
--- changelog	(revision 8114)
+++ 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: rules
===================================================================
--- rules	(revision 8114)
+++ 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/+.*//')

Reply to: