Author: nomadium-guest Date: 2010-11-29 19:35:45 +0000 (Mon, 29 Nov 2010) New Revision: 13118
Added: trunk/checkstyle/debian/checkstyle.pod trunk/checkstyle/debian/checkstyle.poms trunk/checkstyle/debian/classpath trunk/checkstyle/debian/clean trunk/checkstyle/debian/examples trunk/checkstyle/debian/javadoc trunk/checkstyle/debian/manpages trunk/checkstyle/debian/maven.ignoreRules trunk/checkstyle/debian/maven.rules trunk/checkstyle/debian/patches/01_javadoc.diff trunk/checkstyle/debian/patches/series trunk/checkstyle/debian/source/ trunk/checkstyle/debian/source/format Removed: trunk/checkstyle/debian/Native2Ascii.java trunk/checkstyle/debian/ant.properties trunk/checkstyle/debian/dirs trunk/checkstyle/debian/patches/30-omit-mega-jar.patch trunk/checkstyle/debian/patches/35-native-to-ascii.patch Modified: trunk/checkstyle/debian/changelog trunk/checkstyle/debian/compat trunk/checkstyle/debian/control trunk/checkstyle/debian/docs trunk/checkstyle/debian/install trunk/checkstyle/debian/rules trunk/checkstyle/debian/watch trunk/checkstyle/debian/wrappers/checkstyle Log: * Team upload. * New upstream release. (Closes: #554610). * Switch build system from Ant to Maven + Javahelper. * Rework Build-Depends and Depends. * Bump Standards-Version to 3.9.1. No changes were required. * Bump debhelper compatibility level to 7. * Set debian package source format to 3.0 (quilt). * Add dependencies to classpath. (Closes: #557673). * Update watch file. * Add manpage. * Rework patches. Deleted: trunk/checkstyle/debian/Native2Ascii.java =================================================================== --- trunk/checkstyle/debian/Native2Ascii.java 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/Native2Ascii.java 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,333 +0,0 @@ -/* - * Copyright 2000-2005 The Apache Software Foundation - * Copyright 2007 Paul Cager - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This file is derived from the Ant class org/apache/tools/ant/taskdefs/optional/Native2Ascii.java. - * It provides the native2ascii task for GIJ (the standard ant task only works with SUN and - * Kaffe JREs). - */ - -package org.debian.checkstyle; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.InputStreamReader; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.taskdefs.optional.native2ascii.Native2AsciiAdapterFactory; -import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.SourceFileScanner; -import org.apache.tools.ant.util.facade.FacadeTaskHelper; -import org.apache.tools.ant.util.facade.ImplementationSpecificArgument; - - -/** - * Converts files from native encodings to ASCII. - * - * @since Ant 1.2 - */ -public class Native2Ascii extends MatchingTask { - - private boolean reverse = false; // convert from ascii back to native - private String encoding = null; // encoding to convert to/from - private File srcDir = null; // Where to find input files - private File destDir = null; // Where to put output files - private String extension = null; // Extension of output files if different - - private Mapper mapper; - - public Native2Ascii() { - } - - /** - * Flag the conversion to run in the reverse sense, - * that is Ascii to Native encoding. - * - * @param reverse True if the conversion is to be reversed, - * otherwise false; - */ - public void setReverse(boolean reverse) { - this.reverse = reverse; - } - - /** - * The value of the reverse attribute. - * - * @since Ant 1.6.3 - */ - public boolean getReverse() { - return reverse; - } - - /** - * Set the encoding to translate to/from. - * If unset, the default encoding for the JVM is used. - * - * @param encoding String containing the name of the Native - * encoding to convert from or to. - */ - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - /** - * The value of the reverse attribute. - * - * @since Ant 1.6.3 - */ - public String getEncoding() { - return encoding; - } - - /** - * Set the source directory in which to find files to convert. - * - * @param srcDir directory to find input file in. - */ - public void setSrc(File srcDir) { - this.srcDir = srcDir; - } - - - /** - * Set the destination directory to place converted files into. - * - * @param destDir directory to place output file into. - */ - public void setDest(File destDir) { - this.destDir = destDir; - } - - /** - * Set the extension which converted files should have. - * If unset, files will not be renamed. - * - * @param ext File extension to use for converted files. - */ - public void setExt(String ext) { - this.extension = ext; - } - - /** - * Choose the implementation for this particular task. - * @param impl the name of the implemenation - * @since Ant 1.6.3 - */ - public void setImplementation(String impl) { - } - - /** - * Defines the FileNameMapper to use (nested mapper element). - * - * @return the mapper to use for file name translations. - * - * @throws BuildException if more than one mapper is defined. - */ - public Mapper createMapper() throws BuildException { - if (mapper != null) { - throw new BuildException("Cannot define more than one mapper", - getLocation()); - } - mapper = new Mapper(getProject()); - return mapper; - } - - /** - * A nested filenamemapper - * @param fileNameMapper the mapper to add - * @since Ant 1.6.3 - */ - public void add(FileNameMapper fileNameMapper) { - createMapper().add(fileNameMapper); - } - - /** - * Adds an implementation specific command-line argument. - * @return a ImplementationSpecificArgument to be configured - * - * @since Ant 1.6.3 - */ - public ImplementationSpecificArgument createArg() { - return null; - } - - /** - * Execute the task - * - * @throws BuildException is there is a problem in the task execution. - */ - public void execute() throws BuildException { - - DirectoryScanner scanner = null; // Scanner to find our inputs - String[] files; // list of files to process - - // default srcDir to basedir - if (srcDir == null) { - srcDir = getProject().resolveFile("."); - } - - // Require destDir - if (destDir == null) { - throw new BuildException("The dest attribute must be set."); - } - - // if src and dest dirs are the same, require the extension - // to be set, so we don't stomp every file. One could still - // include a file with the same extension, but .... - if (srcDir.equals(destDir) && extension == null && mapper == null) { - throw new BuildException("The ext attribute or a mapper must be set if" - + " src and dest dirs are the same."); - } - - FileNameMapper m = null; - if (mapper == null) { - if (extension == null) { - m = new IdentityMapper(); - } else { - m = new ExtMapper(); - } - } else { - m = mapper.getImplementation(); - } - - scanner = getDirectoryScanner(srcDir); - files = scanner.getIncludedFiles(); - SourceFileScanner sfs = new SourceFileScanner(this); - files = sfs.restrict(files, srcDir, destDir, m); - int count = files.length; - if (count == 0) { - return; - } - String message = "Converting " + count + " file" - + (count != 1 ? "s" : "") + " from "; - log(message + srcDir + " to " + destDir); - for (int i = 0; i < files.length; i++) { - convert(files[i], m.mapFileName(files[i])[0]); - } - } - - /** - * Convert a single file. - * - * @param srcName name of the input file. - * @param destName name of the input file. - */ - private void convert(String srcName, String destName) - throws BuildException { - File srcFile; // File to convert - File destFile; // where to put the results - - // Build the full file names - srcFile = new File(srcDir, srcName); - destFile = new File(destDir, destName); - - // Make sure we're not about to clobber something - if (srcFile.equals(destFile)) { - throw new BuildException("file " + srcFile - + " would overwrite its self"); - } - - // Make intermediate directories if needed - // XXX JDK 1.1 doesn't have File.getParentFile, - String parentName = destFile.getParent(); - if (parentName != null) { - File parentFile = new File(parentName); - - if ((!parentFile.exists()) && (!parentFile.mkdirs())) { - throw new BuildException("cannot create parent directory " - + parentName); - } - } - - log("converting " + srcName, Project.MSG_VERBOSE); - - process(srcFile, destFile); - } - - private void process(File srcFile, File destFile) throws BuildException - { - BufferedReader br = null; - BufferedWriter bw = null; - - try - { - br = new BufferedReader(new InputStreamReader(new FileInputStream(srcFile), encoding)); - bw = new BufferedWriter(new FileWriter(destFile)); - - String line; - int ch; - while ( (ch = br.read()) != -1) - { - if (ch < 128) - { - bw.write(ch); - } - else - { - bw.write("\\u"); - if (ch < 0x1000) bw.write('0'); - if (ch < 0x100) bw.write('0'); - if (ch < 0x10) bw.write('0'); // Never will be! - bw.write(Integer.toHexString(ch)); - } - } - } - catch (Exception e) - { - throw new BuildException(e); - } - finally - { - if (bw != null) try { bw.close(); } catch (Exception e) { throw new BuildException(e); } - if (br != null) try { br.close(); } catch (Exception e) { throw new BuildException(e); } - } - } - - /** - * Returns the (implementation specific) settings given as nested - * arg elements. - * - * @since Ant 1.6.3 - */ - public String[] getCurrentArgs() { - return null; - } - - private class ExtMapper implements FileNameMapper { - - public void setFrom(String s) { - } - public void setTo(String s) { - } - - public String[] mapFileName(String fileName) { - int lastDot = fileName.lastIndexOf('.'); - if (lastDot >= 0) { - return new String[] {fileName.substring(0, lastDot) - + extension}; - } else { - return new String[] {fileName + extension}; - } - } - } -} Deleted: trunk/checkstyle/debian/ant.properties =================================================================== --- trunk/checkstyle/debian/ant.properties 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/ant.properties 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,9 +0,0 @@ -#Do not use sysclasspath=only as we need to define a user-task -#build.sysclasspath=only -antlr.jar=/usr/share/java/antlr.jar -regexp.jar=/usr/share/java/regexp.jar -collections.jar=/usr/share/java/google-collections.jar -cli.jar=/usr/share/java/commons-cli.jar -beanutils.jar=/usr/share/java/commons-beanutils.jar -logging.jar=/usr/share/java/commons-logging.jar -ant.jar=/usr/share/java/ant.jar Modified: trunk/checkstyle/debian/changelog =================================================================== --- trunk/checkstyle/debian/changelog 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/changelog 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,7 +1,21 @@ +checkstyle (5.3-1) UNRELEASED; urgency=low + + * Team upload. + * New upstream release. (Closes: #554610). + * Switch build system from Ant to Maven + Javahelper. + * Rework Build-Depends and Depends. + * Bump Standards-Version to 3.9.1. No changes were required. + * Bump debhelper compatibility level to 7. + * Set debian package source format to 3.0 (quilt). + * Add dependencies to classpath. (Closes: #557673). + * Update watch file. + * Add manpage. + * Rework patches. + + -- Miguel Landaeta <[email protected]> Sun, 28 Nov 2010 20:57:22 -0430 + checkstyle (5.0+dfsg-1) UNRELEASED; urgency=low - TODO: Needs newer version of libgoogle-collections-java. - * New upstream version. * Reworked Build-Depends. * Cleaned up debian/rules. Added: trunk/checkstyle/debian/checkstyle.pod =================================================================== --- trunk/checkstyle/debian/checkstyle.pod (rev 0) +++ trunk/checkstyle/debian/checkstyle.pod 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,55 @@ +=head1 NAME + +checkstyle - static code analysis tool to check if Java source code complies with coding rules + +=head1 SYNOPSIS + +checkstyle -c configurationFile [options] [file] + +=head1 OVERVIEW + +Checkstyle is a development tool to help programmers write Java code that +adheres to a coding standard. It automates the process of checking Java code +to spare humans of this boring (but important) task. This makes it ideal for +projects that want to enforce a coding standard. + +Checkstyle is highly configurable and can be made to support almost any coding +standard. + +For information about Checkstyle, it can be found at +http://checkstyle.sourceforge.net/. + +=head1 OPTIONS + +=over 2 + +=item B<I<file>> + +Specify the Java source code file to check. + +=item B<-c I<configurationFile>> + +Specify the file that configures the checks to apply. + +=item B<-f I<format>> + +Specify the output format. Options are "plain" for the DefaultLogger and "xml" +for the XMLLogger. Defaults to "plain". + +=item B<-p I<propertiesFile>> + +Specify a properties file to use. + +=item B<-o I<file>> + +Specify the file to output to. + +=item B<-r I<dir>> + +Specify the directory to traverse for Java source files. + +=back + +=head1 SEE ALSO + +http://checkstyle.sourceforge.net/cmdline.html Added: trunk/checkstyle/debian/checkstyle.poms =================================================================== --- trunk/checkstyle/debian/checkstyle.poms (rev 0) +++ trunk/checkstyle/debian/checkstyle.poms 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,7 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option] +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +pom.xml --no-parent Added: trunk/checkstyle/debian/classpath =================================================================== --- trunk/checkstyle/debian/classpath (rev 0) +++ trunk/checkstyle/debian/classpath 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1 @@ +debian/checkstyle/usr/share/java/checkstyle.jar /usr/share/java/antlr.jar /usr/share/java/commons-beanutils.jar /usr/share/java/commons-cli.jar /usr/share/java/google-collections.jar /usr/share/java/ant.jar Added: trunk/checkstyle/debian/clean =================================================================== --- trunk/checkstyle/debian/clean (rev 0) +++ trunk/checkstyle/debian/clean 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,2 @@ +mvn-build +target/checkstyle.1 Modified: trunk/checkstyle/debian/compat =================================================================== --- trunk/checkstyle/debian/compat 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/compat 2010-11-29 19:35:45 UTC (rev 13118) @@ -1 +1 @@ -5 +7 Modified: trunk/checkstyle/debian/control =================================================================== --- trunk/checkstyle/debian/control 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/control 2010-11-29 19:35:45 UTC (rev 13118) @@ -3,16 +3,24 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Dominik Smatana <[email protected]>, Michael Koch <[email protected]>, Paul Cager <[email protected]> -Build-Depends: cdbs, debhelper (>= 7), ant-optional, default-jdk -Build-Depends-Indep: junit (>= 3.8.1), libcommons-beanutils-java (>= 1.5), libgoogle-collections-java (>= 1.0~rc2), libcommons-logging-java (>= 1.0.3), libregexp-java, antlr (>= 2.7.6), libcommons-cli-java, velocity, libjdom1-java, tofrodos -Standards-Version: 3.8.3 +Build-Depends: cdbs, debhelper (>= 7), ant-optional, default-jdk, javahelper +Build-Depends-Indep: junit4 (>= 4.8), libcommons-beanutils-java (>= 1.5), + libgoogle-collections-java (>= 1.0~rc2), antlr (>= 2.7.6), + libcommons-cli-java, maven-debian-helper (>= 1.0), maven-repo-helper (>= 1.1), + libmaven-exec-plugin-java, libmaven-cobertura-plugin-java, + libmaven-enforcer-plugin-java, libantlr-maven-plugin-java, + libmaven-antrun-plugin-java +Standards-Version: 3.9.1 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: default-jre | 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), ${misc:Depends} +Depends: default-jre-headless, libcommons-beanutils-java (>= 1.5), + antlr, libcommons-cli-java, java-wrappers (>= 0.1.6), + libgoogle-collections-java (>= 1.0~rc2), ant-optional, ${misc:Depends} +Suggests: junit4, ${maven:OptionalDepends} 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 @@ -22,4 +30,4 @@ Checkstyle is highly configurable and can be made to support almost any coding standard. An example configuration file is supplied supporting the Sun Code Conventions. As well, other sample configuration files are - supplied for other well known conventions. + supplied for other well known conventions. Deleted: trunk/checkstyle/debian/dirs =================================================================== --- trunk/checkstyle/debian/dirs 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/dirs 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,3 +0,0 @@ -usr/share/java -usr/share/checkstyle/dtd -usr/share/checkstyle/xsl Modified: trunk/checkstyle/debian/docs =================================================================== --- trunk/checkstyle/debian/docs 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/docs 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,2 +1 @@ README -target/docs/ Added: trunk/checkstyle/debian/examples =================================================================== --- trunk/checkstyle/debian/examples (rev 0) +++ trunk/checkstyle/debian/examples 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,2 @@ +contrib/examples/* +contrib/hooks Modified: trunk/checkstyle/debian/install =================================================================== --- trunk/checkstyle/debian/install 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/install 2010-11-29 19:35:45 UTC (rev 13118) @@ -1 +1,4 @@ debian/wrappers/checkstyle usr/bin/ +contrib/*.xsl usr/share/checkstyle/xsl/ +checkstyle_checks.xml usr/share/checkstyle/ +sun_checks.xml usr/share/checkstyle/ Added: trunk/checkstyle/debian/javadoc =================================================================== --- trunk/checkstyle/debian/javadoc (rev 0) +++ trunk/checkstyle/debian/javadoc 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1 @@ +target/docs/ Added: trunk/checkstyle/debian/manpages =================================================================== --- trunk/checkstyle/debian/manpages (rev 0) +++ trunk/checkstyle/debian/manpages 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1 @@ +target/checkstyle.1 Added: trunk/checkstyle/debian/maven.ignoreRules =================================================================== --- trunk/checkstyle/debian/maven.ignoreRules (rev 0) +++ trunk/checkstyle/debian/maven.ignoreRules 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,18 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +org.apache.maven.plugins maven-linkcheck-plugin * * * * +org.apache.maven.plugins maven-eclipse-plugin * * * * Added: trunk/checkstyle/debian/maven.rules =================================================================== --- trunk/checkstyle/debian/maven.rules (rev 0) +++ trunk/checkstyle/debian/maven.rules 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,22 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +antlr antlr jar s/2\..*/2.x/ * * +commons-beanutils s/commons-beanutils-core/commons-beanutils/ * s/.*/debian/ * * +junit junit * s/.*/4.x/ * * +s/ant/org.apache.ant/ * * s/.*/debian/ * * Added: trunk/checkstyle/debian/patches/01_javadoc.diff =================================================================== --- trunk/checkstyle/debian/patches/01_javadoc.diff (rev 0) +++ trunk/checkstyle/debian/patches/01_javadoc.diff 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1,22 @@ +Description: Generate javadoc files +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2010-11-25 + +--- checkstyle-5.3.orig/ant-phase-compile.xml ++++ checkstyle-5.3/ant-phase-compile.xml +@@ -23,5 +23,14 @@ + /> + </doclet> + </javadoc> ++ <javadoc destdir="target/docs" ++ source="1.5" ++ failonerror="yes"> ++ <classpath> ++ <pathelement location="${mvn.project.build.outputDirectory}"/> ++ <pathelement path="${mvn.compile_classpath}"/> ++ </classpath> ++ <packageset dir="src/checkstyle"/> ++ </javadoc> + </target> + </project> Deleted: trunk/checkstyle/debian/patches/30-omit-mega-jar.patch =================================================================== --- trunk/checkstyle/debian/patches/30-omit-mega-jar.patch 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/patches/30-omit-mega-jar.patch 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,16 +0,0 @@ -diff -Nur checkstyle-src-4.4/build.xml checkstyle-src-4.4.new/build.xml ---- checkstyle-src-4.4/build.xml 2007-12-30 11:01:35.000000000 +0000 -+++ checkstyle-src-4.4.new/build.xml 2007-12-30 11:09:13.000000000 +0000 -@@ -509,10 +509,12 @@ - filesetmanifest="skip"> - <zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/> - <!-- beanutils packages parts of commons collections, exclude it here so we don't have it in checkstyle-all.jar twice --> -+ <!-- Do not create a mega-jar in Debian. - <zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,org/apache/commons/collections/*,**/*.html"/> - <zipfileset src="${dist.dir}/checkstyle-${version}/commons-collections.jar" excludes="META-INF/*"/> - <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/> - <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*,**/package.html"/> -+ --> - <zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/> - </jar> - <!-- copy stuff without filtering --> Deleted: trunk/checkstyle/debian/patches/35-native-to-ascii.patch =================================================================== --- trunk/checkstyle/debian/patches/35-native-to-ascii.patch 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/patches/35-native-to-ascii.patch 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,30 +0,0 @@ -diff -Nur checkstyle-src-4.3/build.xml checkstyle-src-4.3.new/build.xml ---- checkstyle-src-4.3/build.xml 2007-08-20 23:30:02.000000000 +0100 -+++ checkstyle-src-4.3.new/build.xml 2007-08-20 23:32:12.000000000 +0100 -@@ -4,6 +4,7 @@ - <!-- Give user a chance to override without editing this file --> - <!-- (and without typing -D each time it compiles it) --> - <property name="target.dir" value="${basedir}/target" /> -+ <property name="target.tmp" value="${basedir}/target/tmp" /> - <property file="checkstyle.buildproperties" /> - <property file="${user.home}/checkstyle.buildproperties" /> - -@@ -150,6 +151,18 @@ - <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/> - </propertyfile> - -+ <mkdir dir="${target.tmp}" /> -+ <javac srcdir="debian" -+ destdir="${target.tmp}" -+ includes="**/*.java" -+ deprecation="on" debug="on" -+ source="${checkstyle.minimum.javaversion}" -+ target="${checkstyle.minimum.javaversion}" -+ classpathref="build.classpath" -+ encoding="iso-8859-1" -+ includeAntRuntime="true"/> -+ -+ <taskdef name="native2ascii" classname="org.debian.checkstyle.Native2Ascii" classpath="/usr/share/ant/lib/ant.jar:${target.tmp}"/> - <native2ascii src="src/checkstyle" - dest="${checkstyle.dest}" - encoding="EUC-JP" Added: trunk/checkstyle/debian/patches/series =================================================================== --- trunk/checkstyle/debian/patches/series (rev 0) +++ trunk/checkstyle/debian/patches/series 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1 @@ +01_javadoc.diff Modified: trunk/checkstyle/debian/rules =================================================================== --- trunk/checkstyle/debian/rules 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/rules 2010-11-29 19:35:45 UTC (rev 13118) @@ -4,41 +4,27 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export CLASSPATH=./target/checkstyle/ - -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+.*//') +JAVA_HOME := /usr/lib/jvm/default-java +DEB_COMPRESS_EXCLUDE_ALL := .xsl .java .xml -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := junit commons-beanutils google-collections commons-logging regexp antlr commons-cli $(ANT_HOME)/lib/ant-nodeps.jar velocity jdom1 xercesImpl logkit log4j-1.2 -DOWNLOAD := http://heanet.dl.sourceforge.net/sourceforge/checkstyle/checkstyle-src-$(VERSION).tar.gz -DEB_ANT_BUILD_TARGET := build.bindist #compile.checkstyle #javadoc +build/checkstyle:: + pod2man -c '' -r '' debian/checkstyle.pod > target/checkstyle.1 -get-orig-source: - echo "Getting $(DOWNLOAD)" - mkdir orig_tmp - cd orig_tmp && \ - wget -O - $(DOWNLOAD) | tar xzf - && \ - rm -rf */lib/* && \ - tar czf ../../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz . - rm -rf orig_tmp +install/checkstyle:: + jh_classpath + jh_installjavadoc -makebuilddir/checkstyle:: - fromdos build.xml - clean:: - todos build.xml + jh_clean -binary-post-install/checkstyle:: - dh_install target/dist/$(PACKAGE)-$(VERSION)/$(PACKAGE)-$(VERSION).jar usr/share/java - dh_install target/dist/$(PACKAGE)-$(VERSION)/$(PACKAGE)-optional-$(VERSION).jar usr/share/java - dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar - dh_link usr/share/java/$(PACKAGE)-optional-$(VERSION).jar usr/share/java/$(PACKAGE)-optional.jar - find target/checkstyle -name '*.dtd' -exec dh_install {} usr/share/checkstyle/dtd \; - find target/dist -name '*.xsl' -exec dh_install {} usr/share/checkstyle/xsl \; - dh_install target/dist/$(PACKAGE)-$(VERSION)/sun_checks.xml usr/share/checkstyle - dh_install target/dist/$(PACKAGE)-$(VERSION)/checkstyle_checks.xml usr/share/checkstyle +get-orig-source: + cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ + uscan \ + --verbose \ + --rename \ + --destdir $(CURDIR) \ + --watchfile debian/watch \ + --force-download Added: trunk/checkstyle/debian/source/format =================================================================== --- trunk/checkstyle/debian/source/format (rev 0) +++ trunk/checkstyle/debian/source/format 2010-11-29 19:35:45 UTC (rev 13118) @@ -0,0 +1 @@ +3.0 (quilt) Modified: trunk/checkstyle/debian/watch =================================================================== --- trunk/checkstyle/debian/watch 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/watch 2010-11-29 19:35:45 UTC (rev 13118) @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/\+dfsg\d*$// \ - http://sf.net/checkstyle/checkstyle-src-([\d+\.]+)\.tar\.gz +http://sf.net/checkstyle/checkstyle-([\d+\.]+)-src\.tar\.gz debian Modified: trunk/checkstyle/debian/wrappers/checkstyle =================================================================== --- trunk/checkstyle/debian/wrappers/checkstyle 2010-11-28 03:42:49 UTC (rev 13117) +++ trunk/checkstyle/debian/wrappers/checkstyle 2010-11-29 19:35:45 UTC (rev 13118) @@ -5,6 +5,6 @@ find_java_runtime default-jre -find_jars antlr commons-beanutils commons-collections commons-logging commons-cli checkstyle +find_jars antlr commons-beanutils google-collections commons-cli ant checkstyle run_java com.puppycrawl.tools.checkstyle.Main "$@" _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
