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

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-07-21 11:12:57 +0000 (Thu, 21 Jul 2011)
New Revision: 13870

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/control
   trunk/checkstyle/debian/maven.rules
   trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff
   trunk/checkstyle/debian/wrappers/checkstyle
Log:
* New upstream release.
* Fix FTBFS due to changes introduced with Ant 1.8.2. (Closes: #634574).
* Add optional dependency on java5-runtime-headless.
* Refresh patches.
* Bump Standards-Version to 3.9.2. No changes were required.


Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2011-07-21 07:07:51 UTC (rev 13869)
+++ trunk/checkstyle/debian/changelog	2011-07-21 11:12:57 UTC (rev 13870)
@@ -1,10 +1,17 @@
-checkstyle (5.3-3) UNRELEASED; urgency=low
+checkstyle (5.4-1) UNRELEASED; urgency=low
 
-  * Team upload.
-  * Adjust java-wrappers invocation (Closes: #620868)
+  [ tony mancill ]
+  * Adjust java-wrappers invocation (Closes: #620868).
 
- -- tony mancill <tmancill at debian.org>  Mon, 04 Apr 2011 20:39:00 -0700
+  [ Miguel Landaeta ]
+  * New upstream release.
+  * Fix FTBFS due to changes introduced with Ant 1.8.2. (Closes: #634574).
+  * Add optional dependency on java5-runtime-headless.
+  * Refresh patches.
+  * Bump Standards-Version to 3.9.2. No changes were required.
 
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 20 Jul 2011 19:33:52 -0430
+
 checkstyle (5.3-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/checkstyle/debian/control
===================================================================
--- trunk/checkstyle/debian/control	2011-07-21 07:07:51 UTC (rev 13869)
+++ trunk/checkstyle/debian/control	2011-07-21 11:12:57 UTC (rev 13870)
@@ -9,18 +9,19 @@
  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, libmaven-javadoc-plugin-java, default-jdk-doc
-Standards-Version: 3.9.1
+ libmaven-antrun-plugin-java (>= 1.6), libmaven-javadoc-plugin-java,
+ default-jdk-doc
+Standards-Version: 3.9.2
 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-headless, libcommons-beanutils-java (>= 1.5),
- antlr, libcommons-cli-java, java-wrappers (>= 0.1.6),
- libgoogle-collections-java (>= 1.0~rc2), libcommons-logging-java,
- ${misc:Depends}
+Depends: default-jre-headless | java5-runtime-headless,
+ libcommons-beanutils-java (>= 1.5), antlr, libcommons-cli-java,
+ java-wrappers (>= 0.1.6), libgoogle-collections-java (>= 1.0~rc2),
+ libcommons-logging-java, ${misc:Depends}
 Suggests: junit4, ant-optional, ${maven:OptionalDepends}
 Description: checks Java source against a coding standard
  Checkstyle is a development tool to help programmers write Java code that 

Modified: trunk/checkstyle/debian/maven.rules
===================================================================
--- trunk/checkstyle/debian/maven.rules	2011-07-21 07:07:51 UTC (rev 13869)
+++ trunk/checkstyle/debian/maven.rules	2011-07-21 11:12:57 UTC (rev 13870)
@@ -20,3 +20,4 @@
 commons-beanutils s/commons-beanutils-core/commons-beanutils/ * s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.apache.ant s/ant-nodeps/ant/ * s/.*/debian/ * *

Modified: trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff
===================================================================
--- trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff	2011-07-21 07:07:51 UTC (rev 13869)
+++ trunk/checkstyle/debian/patches/01_link_to_system_javadocs.diff	2011-07-21 11:12:57 UTC (rev 13870)
@@ -1,12 +1,12 @@
 Description: Link javadocs to default-jdk-doc
 Author: Miguel Landaeta <miguel at miguel.cc>
 Forwarded: no
-Last-Update: 2011-02-11
+Last-Update: 2011-07-19
 
---- checkstyle-5.3.orig/pom.xml
-+++ checkstyle-5.3/pom.xml
-@@ -375,6 +375,12 @@
-         <artifactId>maven-javadoc-plugin</artifactId>
+--- checkstyle-5.4.orig/pom.xml
++++ checkstyle-5.4/pom.xml
+@@ -399,6 +399,12 @@
+         <version>2.8</version>
          <configuration>
            <source>1.5</source>
 +          <offlineLinks>

Modified: trunk/checkstyle/debian/wrappers/checkstyle
===================================================================
--- trunk/checkstyle/debian/wrappers/checkstyle	2011-07-21 07:07:51 UTC (rev 13869)
+++ trunk/checkstyle/debian/wrappers/checkstyle	2011-07-21 11:12:57 UTC (rev 13870)
@@ -3,7 +3,7 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-find_java_runtime default
+find_java_runtime default sunmin5
 
 find_jars antlr commons-beanutils google-collections commons-cli commons-logging checkstyle