Author: onkarshinde-guest Date: 2009-11-19 15:38:22 +0000 (Thu, 19 Nov 2009) New Revision: 11079
Added: trunk/cruisecontrol/debian/patches/02_checkstyle_fixes.diff Modified: trunk/cruisecontrol/debian/control trunk/cruisecontrol/debian/patches/01_disable_components.diff trunk/cruisecontrol/debian/patches/series trunk/cruisecontrol/debian/rules Log: more work on cruisecontrol Modified: trunk/cruisecontrol/debian/control =================================================================== --- trunk/cruisecontrol/debian/control 2009-11-19 15:21:35 UTC (rev 11078) +++ trunk/cruisecontrol/debian/control 2009-11-19 15:38:22 UTC (rev 11079) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Onkar Shinde <[email protected]> Build-Depends: debhelper (>= 5), cdbs, ant, quilt, libemma-java -Build-Depends-Indep: default-jdk, ant-optional, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libxstream-java +Build-Depends-Indep: default-jdk, ant-optional, checkstyle, ivy, junit4, libcommons-httpclient-java, libcommons-net-java, libcommons-validator-java, libfast-md5-java, libgnumail-java, libjdom1-java, libjetty-java, liblog4j1.2-java, libmaven2-core-java, libmaven-embedder-java, libmx4j-java, liboro-java, libplexus-component-api-java, libwagon-java, libxstream-java Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cruisecontrol Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cruisecontrol Modified: trunk/cruisecontrol/debian/patches/01_disable_components.diff =================================================================== --- trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-11-19 15:21:35 UTC (rev 11078) +++ trunk/cruisecontrol/debian/patches/01_disable_components.diff 2009-11-19 15:38:22 UTC (rev 11079) @@ -1,7 +1,7 @@ Index: cruisecontrol-2.8.2/main/build.xml =================================================================== ---- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-18 19:29:58.000000000 +0530 -+++ cruisecontrol-2.8.2/main/build.xml 2009-11-18 19:34:38.000000000 +0530 +--- cruisecontrol-2.8.2.orig/main/build.xml 2009-11-19 19:01:43.000000000 +0530 ++++ cruisecontrol-2.8.2/main/build.xml 2009-11-19 19:14:09.000000000 +0530 @@ -136,14 +136,20 @@ <attribute name="classpathref" default="project.classpath" /> <element name="nested" implicit="true" optional="true" /> @@ -25,3 +25,16 @@ <copy todir="${classes}"> <fileset dir="${basedir}" includes="*.properties" /> +@@ -161,6 +167,12 @@ + <target name="compile-test" depends="compile" description="Compile test code"> + <compile-macro srcdir="${test}" destdir="${test.classes}"> + <classpath refid="project.runtime.classpath" /> ++ <exclude name="**/*Jabber*.java"/> ++ <exclude name="**/*Origo*.java"/> ++ <exclude name="**/*Sfee*.java"/> ++ <exclude name="**/*SFEE*.java"/> ++ <exclude name="**/*Weblog*.java"/> ++ <exclude name="**/*X10*.java"/> + </compile-macro> + + <copy todir="${test.classes}"> Added: trunk/cruisecontrol/debian/patches/02_checkstyle_fixes.diff =================================================================== --- trunk/cruisecontrol/debian/patches/02_checkstyle_fixes.diff (rev 0) +++ trunk/cruisecontrol/debian/patches/02_checkstyle_fixes.diff 2009-11-19 15:38:22 UTC (rev 11079) @@ -0,0 +1,23 @@ +Index: cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/rss/RSS.java +=================================================================== +--- cruisecontrol-2.8.2.orig/main/src/net/sourceforge/cruisecontrol/publishers/rss/RSS.java 2009-11-19 18:47:11.000000000 +0530 ++++ cruisecontrol-2.8.2/main/src/net/sourceforge/cruisecontrol/publishers/rss/RSS.java 2009-11-19 18:48:23.000000000 +0530 +@@ -40,7 +40,10 @@ + * Copyright (c) 2005 Hewlett-Packard Development Company, L.P. + */ + +-class RSS { ++final class RSS { ++ private RSS() { ++ } ++ + static final String DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss z"; + + static final String NODE_ROOT = "rss"; +@@ -55,4 +58,4 @@ + static final String NODE_ITEM_PUBLISH_DATE = "pubDate"; + static final String NODE_ITEM_GUID = "guid"; + static final String ATTRIB_ITEM_IS_PERMA_LINK = "isPermaLink"; +-} +\ No newline at end of file ++} Modified: trunk/cruisecontrol/debian/patches/series =================================================================== --- trunk/cruisecontrol/debian/patches/series 2009-11-19 15:21:35 UTC (rev 11078) +++ trunk/cruisecontrol/debian/patches/series 2009-11-19 15:38:22 UTC (rev 11079) @@ -1 +1,2 @@ 01_disable_components.diff +02_checkstyle_fixes.diff Modified: trunk/cruisecontrol/debian/rules =================================================================== --- trunk/cruisecontrol/debian/rules 2009-11-19 15:21:35 UTC (rev 11078) +++ trunk/cruisecontrol/debian/rules 2009-11-19 15:38:22 UTC (rev 11079) @@ -5,7 +5,8 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-trax ant-junit commons-httpclient commons-net commons-validator emma emma_ant fast-md5 gnumail ivy jdom1 jetty junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project mx4j mx4j-tools oro plexus-component-api xstream +DEB_JARS := ant-trax ant-junit commons-httpclient commons-net commons-validator emma emma_ant fast-md5 gnumail ivy jdom1 jetty jetty-util junit4 log4j-1.2.jar maven-artifact maven-core maven-embedder maven-model maven-project maven-settings mx4j mx4j-tools oro plexus-component-api wagon-provider-api xstream +DEB_ANT_BUILD_TARGET := build get-orig-source:: uscan --verbose --force-download _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
