Author: paulcager-guest Date: 2007-01-12 01:53:23 +0100 (Fri, 12 Jan 2007) New Revision: 2928
Added: trunk/checkstyle/debian/patches/01_build_xml-anakia.patch trunk/checkstyle/debian/patches/01_build_xml-mega.patch Modified: trunk/checkstyle/debian/changelog trunk/checkstyle/debian/control trunk/checkstyle/debian/docs trunk/checkstyle/debian/links trunk/checkstyle/debian/patches/00_build_xml.patch trunk/checkstyle/debian/rules Log: checkstyle upstream release 4.2 (not yet finished) Modified: trunk/checkstyle/debian/changelog =================================================================== --- trunk/checkstyle/debian/changelog 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/changelog 2007-01-12 00:53:23 UTC (rev 2928) @@ -1,3 +1,9 @@ +checkstyle (4.2-1) unstable; urgency=low + + * kaffe compiler transition + + -- Paul Cager <[EMAIL PROTECTED]> Thu, 11 Jan 2007 14:22:07 +0000 + checkstyle (3.4-10) unstable; urgency=low * kaffe compiler transition Modified: trunk/checkstyle/debian/control =================================================================== --- trunk/checkstyle/debian/control 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/control 2007-01-12 00:53:23 UTC (rev 2928) @@ -2,9 +2,10 @@ Section: libs Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]> -Build-Depends-Indep: cdbs, debhelper (>= 4.2.30), kaffe (>= 2:1.1.5-3), ant, 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, libcommons-cli-java -Standards-Version: 3.6.2 +Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>, Paul Cager <[EMAIL PROTECTED]> +Build-Depends-Indep: kaffe (>= 2:1.1.5-3), 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, libcommons-cli-java +Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 4.2.30), ant +Standards-Version: 3.7.2 Package: checkstyle Architecture: all Modified: trunk/checkstyle/debian/docs =================================================================== --- trunk/checkstyle/debian/docs 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/docs 2007-01-12 00:53:23 UTC (rev 2928) @@ -1,3 +1 @@ README -TODO -docs/ Modified: trunk/checkstyle/debian/links =================================================================== --- trunk/checkstyle/debian/links 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/links 2007-01-12 00:53:23 UTC (rev 2928) @@ -1,2 +1,2 @@ -usr/share/java/checkstyle-3.4.jar usr/share/java/checkstyle.jar -usr/share/java/checkstyle-optional-3.4.jar usr/share/java/checkstyle-optional.jar +usr/share/java/checkstyle-4.2.jar usr/share/java/checkstyle.jar +usr/share/java/checkstyle-optional-4.2.jar usr/share/java/checkstyle-optional.jar Modified: trunk/checkstyle/debian/patches/00_build_xml.patch =================================================================== --- trunk/checkstyle/debian/patches/00_build_xml.patch 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/patches/00_build_xml.patch 2007-01-12 00:53:23 UTC (rev 2928) @@ -1,118 +1,40 @@ ---- build.xml.old 2005-02-28 23:04:39.000000000 +0000 -+++ build.xml 2005-02-28 23:05:11.000000000 +0000 -@@ -138,10 +138,51 @@ - <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/> +--- build.xml 2006-07-10 12:55:39.000000000 +0100 ++++ build.xml.patched 2007-01-11 23:41:03.000000000 +0000 +@@ -11,16 +11,16 @@ + <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> + <property name="xerces.jar" value="${ant.home}/lib/xercesImpl.jar" /> + <property name="xml-apis.jar" value="${ant.home}/lib/xml-apis.jar" /> +- <property name="antlr.jar" value="lib/antlr.jar" /> +- <property name="velocity.jar" value="lib/velocity-dep-1.4.jar" /> ++ <property name="antlr.jar" value="/usr/share/java/antlr.jar" /> ++ <property name="velocity.jar" value="/usr/share/java/velocity.jar" /> + <property name="jdom.jar" value="lib/jdom-b9.jar" /> +- <property name="junit.jar" value="lib/junit.jar" /> +- <property name="beanutils.jar" value="lib/commons-beanutils-core.jar" /> +- <property name="collections.jar" value="lib/commons-collections.jar" /> +- <property name="cli.jar" value="lib/commons-cli.jar" /> +- <property name="logging.jar" value="lib/commons-logging.jar" /> ++ <property name="junit.jar" value="/usr/share/java/junit.jar" /> ++ <property name="beanutils.jar" value="/usr/share/java/commons-beanutils.jar" /> ++ <property name="collections.jar" value="/usr/share/java/commons-collections.jar" /> ++ <property name="cli.jar" value="/usr/share/java/commons-cli.jar" /> ++ <property name="logging.jar" value="/usr/share/java/commons-logging.jar" /> + <property name="tools.jar" value="${java.home}/../lib/tools.jar" /> +- <property name="emma.enabled" value="true" /> ++ <property name="emma.enabled" value="false" /> + + <property name="checkstyle.dir" + value="src/checkstyle/com/puppycrawl/tools/checkstyle" /> +@@ -150,10 +150,12 @@ + <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/> </propertyfile> + <!-- <native2ascii src="src/checkstyle" - dest="target/checkstyle" + dest="${checkstyle.dest}" encoding="EUC-JP" includes="**/*_ja.properties" /> + --> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/blocks"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/design"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/naming"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes"/> -+ <mkdir dir="target/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace"/> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/blocks/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/design/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/indentation/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/naming/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/naming/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/whitespace/messages_ja.properties"/> -+ </exec> -+ <exec executable="/usr/lib/kaffe/bin/native2ascii"> -+ <arg line="-encoding EUC-JP src/checkstyle/com/puppycrawl/tools/checkstyle/checks/messages_ja.properties target/checkstyle/com/puppycrawl/tools/checkstyle/checks/messages_ja.properties"/> -+ </exec> - <copy todir="target/checkstyle"> + <copy todir="${checkstyle.dest}"> <fileset dir="src/checkstyle" includes="**/*.properties"/> -@@ -160,6 +212,7 @@ - <mapper type="glob" from="*messages.properties" to="*messages_en.properties"/> - </copy> - -+ <!-- - <javadoc sourcefiles="src/checkstyle/com/puppycrawl/tools/checkstyle/api/TokenTypes.java" - classpathref="javadoc.classpath" - failonerror="yes"> -@@ -168,6 +221,7 @@ - <param name="-destfile" value="${basedir}/target/checkstyle/com/puppycrawl/tools/checkstyle/api/tokentypes.properties"/> - </doclet> - </javadoc> -+ --> - </target> - - <target name="compile.testinputs" description="Compile test inputs"> -@@ -436,6 +490,7 @@ - basedir="target/checkstyle" - includes="**/usage/**, **/j2ee/**"/> - <!-- copy the JARS and make a mega JAR out of them --> -+ <!-- - <copy file="${regexp.jar}" todir="${dist.dir}/checkstyle-${version}" /> - <copy file="${antlr.jar}" todir="${dist.dir}/checkstyle-${version}" /> - <copy file="${beanutils.jar}" todir="${dist.dir}/checkstyle-${version}" /> -@@ -462,6 +517,7 @@ - basedir="${dist.dir}/checkstyle-${version}/tmp" - manifest="config/manifest.mf" /> - <delete dir="${dist.dir}/checkstyle-${version}/tmp" /> -+ --> - <!-- copy stuff without filtering --> - <copy todir="${dist.dir}/checkstyle-${version}"> - <fileset dir="."> -@@ -486,6 +542,7 @@ - </filterset> - </copy> - <!-- create the final zip & tar/gzip files --> -+ <!-- - <zip zipfile="${dist.dir}/checkstyle-${version}.zip"> - <fileset dir="${dist.dir}"> - <include name="checkstyle-${version}/**"/> -@@ -495,6 +552,7 @@ - basedir="${dist.dir}" includes="checkstyle-${version}/**" /> - <gzip zipfile="${dist.dir}/checkstyle-${version}.tar.gz" - src="${dist.dir}/checkstyle-${version}.tar" /> -+ --> - </target> - - <target name="build.srcdist" depends="checkstyle.checkstyle" -@@ -532,6 +590,7 @@ - <target name="javadoc" depends="compile.checkstyle" - description="Creates the javadoc html files"> - <mkdir dir="docs/api" /> -+<!-- - <javadoc sourcepath="src/checkstyle" destdir="docs/api" - Windowtitle="Checkstyle API" - classpathref="javadoc.classpath" -@@ -550,6 +609,7 @@ - <exclude name="**/*.html" /> - </fileset> - </javadoc> -+--> - </target> - - <!-- Added for GUMP testing --> Added: trunk/checkstyle/debian/patches/01_build_xml-anakia.patch =================================================================== --- trunk/checkstyle/debian/patches/01_build_xml-anakia.patch 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/patches/01_build_xml-anakia.patch 2007-01-12 00:53:23 UTC (rev 2928) @@ -0,0 +1,18 @@ +--- build.xml.orig 2007-01-12 00:14:58.000000000 +0000 ++++ build.xml 2007-01-12 00:15:49.000000000 +0000 +@@ -630,6 +630,7 @@ + </fileset> + </javadoc> + ++ <!-- + <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"> + <classpath refid="velocity.classpath"/> + </taskdef> +@@ -652,6 +653,7 @@ + lastModifiedCheck="true" + templatePath="${xdocs.src}/stylesheets"> + </anakia> ++ --> + + </target> + Added: trunk/checkstyle/debian/patches/01_build_xml-mega.patch =================================================================== --- trunk/checkstyle/debian/patches/01_build_xml-mega.patch 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/patches/01_build_xml-mega.patch 2007-01-12 00:53:23 UTC (rev 2928) @@ -0,0 +1,18 @@ +--- build.xml 2007-01-12 00:23:49.000000000 +0000 ++++ build.xml.patched 2007-01-12 00:25:50.000000000 +0000 +@@ -488,6 +488,7 @@ + basedir="${checkstyle.dest}" + includes="**/j2ee/**"/> + <!-- copy the JARS and make a mega JAR out of them --> ++ <!-- + <copy file="${antlr.jar}" todir="${dist.dir}/checkstyle-${version}" /> + <copy file="${beanutils.jar}" todir="${dist.dir}/checkstyle-${version}" /> + <copy file="${collections.jar}" todir="${dist.dir}/checkstyle-${version}" /> +@@ -503,6 +504,7 @@ + <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*"/> + <zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/> + </jar> ++ --> + <!-- copy stuff without filtering --> + <copy todir="${dist.dir}/checkstyle-${version}"> + <fileset dir="."> Modified: trunk/checkstyle/debian/rules =================================================================== --- trunk/checkstyle/debian/rules 2007-01-11 21:46:29 UTC (rev 2927) +++ trunk/checkstyle/debian/rules 2007-01-12 00:53:23 UTC (rev 2928) @@ -17,8 +17,20 @@ DEB_ANT_BUILD_TARGET := build.bindist #compile.checkstyle #javadoc SOFTWARE=checkstyle -VERSION=3.4 +VERSION=4.2 +get-orig-source: + mkdir tmp && \ + cd tmp && \ + wget http://switch.dl.sourceforge.net/sourceforge/checkstyle/checkstyle-src-4.2.tar.gz && \ + tar xzf checkstyle-src-$(VERSION).tar.gz && \ + rm checkstyle-src-$(VERSION).tar.gz && \ + rm checkstyle-src-$(VERSION)/lib/*.jar && \ + tar czf ../checkstyle_$(VERSION).orig.tar.gz . && \ + cd .. && \ + rm -r tmp + + install/checkstyle:: install -m 644 target/dist/$(SOFTWARE)-$(VERSION)/$(SOFTWARE)-$(VERSION).jar debian/checkstyle/usr/share/java/$(SOFTWARE)-$(VERSION).jar install -m 644 target/dist/$(SOFTWARE)-$(VERSION)/$(SOFTWARE)-optional-$(VERSION).jar debian/checkstyle/usr/share/java/$(SOFTWARE)-optional-$(VERSION).jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
