[pkg-java] r8033 - in trunk/groovy/debian: . patches

[varun at alioth.debian.org]

Author: varun
Date: 2009-03-02 06:55:48 +0000 (Mon, 02 Mar 2009)
New Revision: 8033

Added:
   trunk/groovy/debian/patches/
   trunk/groovy/debian/patches/build.diff
   trunk/groovy/debian/patches/series
Modified:
   trunk/groovy/debian/build.xml
   trunk/groovy/debian/changelog
   trunk/groovy/debian/control
   trunk/groovy/debian/rules
Log:
* Fix build.xml file
* Add ivy to Build-Depends
* Add build.diff patch to fix a build error
* Use quilt to manage patches

Modified: trunk/groovy/debian/build.xml
===================================================================
--- trunk/groovy/debian/build.xml	2009-03-02 06:41:41 UTC (rev 8032)
+++ trunk/groovy/debian/build.xml	2009-03-02 06:55:48 UTC (rev 8033)
@@ -16,14 +16,25 @@
 
   <target name="compile" description="o Compile the code">
     <mkdir dir="${class.dir}"/>
+
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-	   source="1.5" target="1.5" debug="true" optimize="false"/>
+	   source="1.5" target="1.5" debug="true" optimize="false">
+      <exclude name="groovy/ui/**/*.java"/>
+    </javac>
 
     <taskdef name="groovyc"
 	     classname="org.codehaus.groovy.ant.Groovyc"
 	     classpath="${class.dir}"/> 
-    <groovyc destdir="${class.dir}" srcdir="${source.dir}" listfiles="true" />
 
+    <groovyc srcdir="${source.dir}/groovy/ui/text/" destdir="${class.dir}"/>
+
+    <javac srcdir="${source.dir}" destdir="${class.dir}"
+	   source="1.5" target="1.5" debug="true" optimize="false">
+      <include name="groovy/ui/**/*.java"/>
+    </javac>
+
+    <groovyc srcdir="${source.dir}" destdir="${class.dir}"/>
+
     <copy todir="${class.dir}">
       <fileset dir="${source.dir}">
 	<patternset refid="compiler.resources" />

Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2009-03-02 06:41:41 UTC (rev 8032)
+++ trunk/groovy/debian/changelog	2009-03-02 06:55:48 UTC (rev 8033)
@@ -1,12 +1,18 @@
 groovy (1.6.0-1) unstable; urgency=low
 
-  UNRELEASED (does not build)
+  [ Torsten Werner ]
   * New upstream release
   * Remove Build-Depends: libclassworlds-java.
   * Switch to source and target version 1.5.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 24 Feb 2009 23:21:57 +0100
+  [ Varun Hiremath ]
+  * Fix build.xml file
+  * Add ivy to Build-Depends
+  * Add build.diff patch to fix a build error
+  * Use quilt to manage patches
 
+ -- Varun Hiremath <varun at debian.org>  Mon, 02 Mar 2009 01:53:19 -0500
+
 groovy (1.5.7-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2009-03-02 06:41:41 UTC (rev 8032)
+++ trunk/groovy/debian/control	2009-03-02 06:55:48 UTC (rev 8033)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 6), cdbs
+Build-Depends: debhelper (>= 6), cdbs, quilt
 Build-Depends-Indep: ant-optional, openjdk-6-jdk, bzip2, libasm2-java,
  libbsf-java, libcommons-cli-java (>= 1.0), libcommons-collections3-java (>= 3.1),
  libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>= 0.09),
  libmx4j-java (>= 2.0.1), libregexp-java (>= 1.2), libservlet2.4-java,
- libxstream-java, libjline-java, antlr, tofrodos
+ libxstream-java, libjline-java, antlr, tofrodos, ivy
 Standards-Version: 3.8.0
 Homepage: http://groovy.codehaus.org/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/groovy/

Added: trunk/groovy/debian/patches/build.diff
===================================================================
--- trunk/groovy/debian/patches/build.diff	                        (rev 0)
+++ trunk/groovy/debian/patches/build.diff	2009-03-02 06:55:48 UTC (rev 8033)
@@ -0,0 +1,13 @@
+Index: groovy-1.6.0/src/main/org/codehaus/groovy/ant/Groovy.java
+===================================================================
+--- groovy-1.6.0.orig/src/main/org/codehaus/groovy/ant/Groovy.java	2009-03-02 01:41:35.000000000 -0500
++++ groovy-1.6.0/src/main/org/codehaus/groovy/ant/Groovy.java	2009-03-02 01:41:46.000000000 -0500
+@@ -510,7 +510,7 @@
+     private void createNewArgs(String txt) throws IOException {
+         final String[] args = cmdline.getCommandline();
+         // Temporary file - delete on exit, create (assured unique name).
+-        final File tempFile = FileUtils.getFileUtils().createTempFile(PREFIX, SUFFIX, null, true, true);
++        final File tempFile = FileUtils.getFileUtils().createTempFile(PREFIX, SUFFIX, null, true);
+         final String[] commandline = new String[args.length + 1];
+         DefaultGroovyMethods.write(tempFile, txt);
+         commandline[0] = tempFile.getCanonicalPath();

Added: trunk/groovy/debian/patches/series
===================================================================
--- trunk/groovy/debian/patches/series	                        (rev 0)
+++ trunk/groovy/debian/patches/series	2009-03-02 06:55:48 UTC (rev 8033)
@@ -0,0 +1 @@
+build.diff

Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules	2009-03-02 06:41:41 UTC (rev 8032)
+++ trunk/groovy/debian/rules	2009-03-02 06:55:48 UTC (rev 8033)
@@ -2,13 +2,14 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar javadoc
-DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli antlr	\
+DEB_JARS := ant mockobjects-core servlet-api jsp-api commons-cli antlr	\
              xstream bsf xercesImpl jline junit4 xstream jline asm2	\
-             asm2-util asm2-tree asm2-analysis
+             asm2-util asm2-tree asm2-analysis ivy
 
 binary-install/groovy::
 	fromdos debian/groovy/usr/share/groovy/bin/*