[pkg-java] r2967 - in trunk/checkstyle/debian: . patches
Paul Cager
paulcager-guest at alioth.debian.org
Fri Feb 2 00:45:36 CET 2007
Author: paulcager-guest
Date: 2007-02-02 00:45:36 +0100 (Fri, 02 Feb 2007)
New Revision: 2967
Removed:
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
trunk/checkstyle/debian/watch
Log:
Rollback 4.2 changes preparatory to producing a 4.1dfsg release
Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/changelog 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1,14 +1,17 @@
-checkstyle (4.2-1) unstable; urgency=low
+checkstyle (4.1+dfsg) unstable; urgency=low
- * kaffe compiler transition
+ * Remove third-party Jars in the orig source tarball.
+ (Closes #383791).
- -- Paul Cager <paul-debian at home.paulcager.org> Thu, 11 Jan 2007 14:22:07 +0000
+ -- Paul Cager <paul-debian at home.paulcager.org> Thu, 1 Feb 2007 23:41:01 +0000
-checkstyle (3.4-10) unstable; urgency=low
+checkstyle (4.1-1) unstable; urgency=low
- * kaffe compiler transition
+ * New upstream release.
+ - Updated debian/patches/00_build_xml.patch.
+ * Updated watch file.
- -- Wolfgang Baer <WBaer at gmx.de> Mon, 16 Jan 2006 14:18:34 +0100
+ -- Michael Koch <konqueror at gmx.de> Wed, 25 Jan 2006 08:53:26 +0000
checkstyle (3.4-9) unstable; urgency=low
Modified: trunk/checkstyle/debian/control
===================================================================
--- trunk/checkstyle/debian/control 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/control 2007-02-01 23:45:36 UTC (rev 2967)
@@ -2,10 +2,9 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
-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), libjdom0-java, liblogkit-java, libregexp-java, antlr, libcommons-cli-java
-Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 4.2.30), ant, tofrodos
-Standards-Version: 3.7.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>
+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, velocity, libjdom0-java
+Standards-Version: 3.6.2
Package: checkstyle
Architecture: all
Modified: trunk/checkstyle/debian/docs
===================================================================
--- trunk/checkstyle/debian/docs 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/docs 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1 +1,2 @@
README
+target/docs/
Modified: trunk/checkstyle/debian/links
===================================================================
--- trunk/checkstyle/debian/links 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/links 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1,2 +1,2 @@
-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
+usr/share/java/checkstyle-4.1.jar usr/share/java/checkstyle.jar
+usr/share/java/checkstyle-optional-4.1.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-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/patches/00_build_xml.patch 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1,32 +1,6 @@
---- 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="jdom.jar" value="/usr/share/java/libjdom1-java" />
-- <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 @@
+--- build.xml.orig 2006-01-25 08:50:13.000000000 +0000
++++ build.xml 2006-01-25 08:52:49.000000000 +0000
+@@ -151,10 +151,51 @@
<entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/>
</propertyfile>
@@ -36,6 +10,69 @@
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="${checkstyle.dest}">
<fileset dir="src/checkstyle" includes="**/*.properties"/>
+@@ -531,6 +531,7 @@
+ <copy file="${cli.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <copy file="${logging.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <mkdir dir="${dist.dir}/checkstyle-${version}/tmp" />
++ <!--
+ <unjar src="${dist.dir}/checkstyle-${version}/antlr.jar"
+ dest="${dist.dir}/checkstyle-${version}/tmp" />
+ <unjar src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar"
+@@ -541,6 +542,7 @@
+ dest="${dist.dir}/checkstyle-${version}/tmp" />
+ <unjar src="${dist.dir}/checkstyle-${version}/commons-logging.jar"
+ dest="${dist.dir}/checkstyle-${version}/tmp" />
++ -->
+ <unjar src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar"
+ dest="${dist.dir}/checkstyle-${version}/tmp" />
+ <delete dir="${dist.dir}/checkstyle-${version}/tmp/META-INF" />
+@@ -648,6 +648,7 @@
+ <exclude name="**/*.dtd" />
+ <exclude name="**/*.xml" />
+ <exclude name="**/*.html" />
++ <exclude name="**/*.smap" />
+ </fileset>
+ </javadoc>
+ </target>
Deleted: trunk/checkstyle/debian/patches/01_build_xml-mega.patch
===================================================================
--- trunk/checkstyle/debian/patches/01_build_xml-mega.patch 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/patches/01_build_xml-mega.patch 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1,18 +0,0 @@
---- 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-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/rules 2007-02-01 23:45:36 UTC (rev 2967)
@@ -12,31 +12,14 @@
JAVA_HOME := /usr/lib/kaffe
ANT_HOME := /usr/share/ant
-DEB_JARS := junit commons-beanutils commons-collections commons-logging regexp antlr commons-cli com-sun-javadoc jdom0 logkit velocity $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar $(ANT_HOME)/lib/ant.jar
+DEB_JARS := junit commons-beanutils commons-collections commons-logging regexp antlr commons-cli com-sun-javadoc $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar $(ANT_HOME)/lib/ant.jar velocity jdom0 xercesImpl logkit log4j-1.2
+DEB_ANT_ARGS := -verbose
DEB_ANT_BUILD_TARGET := build.bindist #compile.checkstyle #javadoc
SOFTWARE=checkstyle
-VERSION=4.2
+VERSION=4.1
-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
-
-
-makebuilddir/checkstyle::
- dos2unix build.xml
-
-post-patches/checkstyle::
- unix2dos build.xml
-
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
Modified: trunk/checkstyle/debian/watch
===================================================================
--- trunk/checkstyle/debian/watch 2007-02-01 23:15:38 UTC (rev 2966)
+++ trunk/checkstyle/debian/watch 2007-02-01 23:45:36 UTC (rev 2967)
@@ -1,2 +1,2 @@
version=2
-http://prdownloads.sourceforge.net/checkstyle/checkstyle-?_?([\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian uupdate
+http://heanet.dl.sourceforge.net/sourceforge/checkstyle/checkstyle-src-([\d+\.]+)\.tar\.gz debian uupdate
More information about the pkg-java-commits
mailing list