[pkg-java] r5239 - in trunk/checkstyle/debian: . patches

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-12-30 11:53:04 +0000 (Sun, 30 Dec 2007)
New Revision: 5239

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/control
   trunk/checkstyle/debian/patches/30-omit-mega-jar.patch
Log:
checkstyle (4.4+dfsg-1) unstable; urgency=low

  * New upstream release.
  * Updated to standards version 3.7.3

 -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 29 Dec 2007 21:14:13 +0000

Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2007-12-29 20:30:06 UTC (rev 5238)
+++ trunk/checkstyle/debian/changelog	2007-12-30 11:53:04 UTC (rev 5239)
@@ -1,3 +1,10 @@
+checkstyle (4.4+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated to standards version 3.7.3
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 29 Dec 2007 21:14:13 +0000
+
 checkstyle (4.3+dfsg1-2) unstable; urgency=low
 
   * Include sun_checks.xml and checkstyle_checks.xml

Modified: trunk/checkstyle/debian/control
===================================================================
--- trunk/checkstyle/debian/control	2007-12-29 20:30:06 UTC (rev 5238)
+++ trunk/checkstyle/debian/control	2007-12-30 11:53:04 UTC (rev 5239)
@@ -5,7 +5,7 @@
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at 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.2
+Standards-Version: 3.7.3
 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/
@@ -13,7 +13,6 @@
 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
-Homepage: http://checkstyle.sourceforge.net/
 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 

Modified: trunk/checkstyle/debian/patches/30-omit-mega-jar.patch
===================================================================
--- trunk/checkstyle/debian/patches/30-omit-mega-jar.patch	2007-12-29 20:30:06 UTC (rev 5238)
+++ trunk/checkstyle/debian/patches/30-omit-mega-jar.patch	2007-12-30 11:53:04 UTC (rev 5239)
@@ -1,16 +1,15 @@
-diff -Nur checkstyle-src-4.3/build.xml checkstyle-src-4.3.new/build.xml
---- checkstyle-src-4.3/build.xml	2007-07-17 00:10:44.000000000 +0100
-+++ checkstyle-src-4.3.new/build.xml	2007-07-17 00:11:57.000000000 +0100
-@@ -496,11 +496,13 @@
-     <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-all-${version}.jar"
-     	 manifest="${target.dir}/manifest.mf" 
+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">
-+	<!-- Not in Debian.
          <zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
-         <zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,overview.html"/>
+         <!-- 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/*"/>
+         <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>