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

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-09-06 23:31:21 +0000 (Thu, 06 Sep 2007)
New Revision: 4122

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/control
   trunk/checkstyle/debian/dirs
   trunk/checkstyle/debian/patches/35-native-ro-ascii.patch
   trunk/checkstyle/debian/rules
Log:
Checkpoint before renaming patch

Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2007-09-06 19:27:26 UTC (rev 4121)
+++ trunk/checkstyle/debian/changelog	2007-09-06 23:31:21 UTC (rev 4122)
@@ -1,9 +1,15 @@
 checkstyle (4.3+dfsg1-1) unstable; urgency=low
 
-  * New upstream + other stuff
-    TODO
+  * New upstream release.  (Closes: #433350)
+  * FTBFS: Illegal class or package name.
+     Now built with GIJ and new Ant.  (Closes: #432540)
+  * Antlr dependency should be == 2.7.2.
+     New version of checkstyle compatible with antlr 2.7.6 (see
+     upstream change log).
+     (Closes: #305325)
+  * Ships additional files.  (Closes: #434316)
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 16 Jul 2007 15:21:22 +0100
+ -- Paul Cager <paul-debian at home.paulcager.org>  Mon, 20 Aug 2007 11:34:10 +0100
 
 checkstyle (4.1+dfsg-1) unstable; urgency=high
 

Modified: trunk/checkstyle/debian/control
===================================================================
--- trunk/checkstyle/debian/control	2007-09-06 19:27:26 UTC (rev 4121)
+++ trunk/checkstyle/debian/control	2007-09-06 23:31:21 UTC (rev 4122)
@@ -4,8 +4,9 @@
 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>, 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, libcommons-cli-java, velocity, libjdom0-java, tofrodos
+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
+Homepage: http://checkstyle.sourceforge.net/
 
 Package: checkstyle
 Architecture: all

Modified: trunk/checkstyle/debian/dirs
===================================================================
--- trunk/checkstyle/debian/dirs	2007-09-06 19:27:26 UTC (rev 4121)
+++ trunk/checkstyle/debian/dirs	2007-09-06 23:31:21 UTC (rev 4122)
@@ -1 +1,3 @@
 usr/share/java
+usr/share/checkstyle/dtd
+usr/share/checkstyle/xsl

Modified: trunk/checkstyle/debian/patches/35-native-ro-ascii.patch
===================================================================
--- trunk/checkstyle/debian/patches/35-native-ro-ascii.patch	2007-09-06 19:27:26 UTC (rev 4121)
+++ trunk/checkstyle/debian/patches/35-native-ro-ascii.patch	2007-09-06 23:31:21 UTC (rev 4122)
@@ -1,13 +1,21 @@
 diff -Nur checkstyle-src-4.3/build.xml checkstyle-src-4.3.new/build.xml
---- checkstyle-src-4.3/build.xml	2007-08-19 17:50:17.000000000 +0100
-+++ checkstyle-src-4.3.new/build.xml	2007-08-19 17:51:17.000000000 +0100
-@@ -150,7 +150,18 @@
+--- checkstyle-src-4.3/build.xml	2007-08-20 23:30:02.000000000 +0100
++++ checkstyle-src-4.3.new/build.xml	2007-08-20 23:32:12.000000000 +0100
+@@ -4,6 +4,7 @@
+   <!-- Give user a chance to override without editing this file -->
+   <!-- (and without typing -D each time it compiles it) -->
+   <property name="target.dir" value="${basedir}/target" />
++  <property name="target.tmp" value="${basedir}/target/tmp" />
+   <property file="checkstyle.buildproperties" />
+   <property file="${user.home}/checkstyle.buildproperties" />
+ 
+@@ -150,6 +151,18 @@
        <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/>
      </propertyfile>
  
--    <native2ascii src="src/checkstyle"
++    <mkdir dir="${target.tmp}" />
 +    <javac srcdir="debian"
-+           destdir="${checkstyle.dest}"
++           destdir="${target.tmp}"
 +           includes="**/*.java"
 +           deprecation="on" debug="on"
 +           source="${checkstyle.minimum.javaversion}"
@@ -16,8 +24,7 @@
 +           encoding="iso-8859-1"
 +           includeAntRuntime="true"/>
 +
-+    <taskdef name="native2ascii" classname="org.debian.checkstyle.Native2Ascii" classpath="/usr/share/ant/lib/ant.jar:${checkstyle.dest}"/>
-+    <native2ascii src="src/checkstyle"
++    <taskdef name="native2ascii" classname="org.debian.checkstyle.Native2Ascii" classpath="/usr/share/ant/lib/ant.jar:${target.tmp}"/>
+     <native2ascii src="src/checkstyle"
                    dest="${checkstyle.dest}"
                    encoding="EUC-JP"
-                   includes="**/*_ja.properties" />

Modified: trunk/checkstyle/debian/rules
===================================================================
--- trunk/checkstyle/debian/rules	2007-09-06 19:27:26 UTC (rev 4121)
+++ trunk/checkstyle/debian/rules	2007-09-06 23:31:21 UTC (rev 4122)
@@ -39,3 +39,5 @@
 	dh_install target/dist/$(PACKAGE)-$(VERSION)/$(PACKAGE)-optional-$(VERSION).jar usr/share/java
 	dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
 	dh_link usr/share/java/$(PACKAGE)-optional-$(VERSION).jar usr/share/java/$(PACKAGE)-optional.jar
+	find target/checkstyle -name '*.dtd' -exec dh_install {} usr/share/checkstyle/dtd \;
+	find target/dist -name '*.xsl' -exec dh_install {} usr/share/checkstyle/xsl \;