[pkg-java] r12869 - in trunk/groovy/debian: . patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Thu Aug 5 19:21:45 UTC 2010
Author: nomadium-guest
Date: 2010-08-05 19:21:35 +0000 (Thu, 05 Aug 2010)
New Revision: 12869
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/control
trunk/groovy/debian/groovy.links
trunk/groovy/debian/patches/0002-ant-build.diff.patch
trunk/groovy/debian/rules
Log:
* Add myself as Uploader.
* Add Build-Depends and Depends on libjansi-java.
* Refresh patches/0002-ant-build.diff.patch.
* Add mh_clean invocation to clean target.
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2010-08-05 17:58:02 UTC (rev 12868)
+++ trunk/groovy/debian/changelog 2010-08-05 19:21:35 UTC (rev 12869)
@@ -1,14 +1,17 @@
-groovy (1.7.3-1) unstable; urgency=low
+groovy (1.7.3-1) UNRELEASED; urgency=low
+ [ Steffen Moeller ]
* New upstream release, refreshed patches.
* Bumped policy to 3.9.0, no changes required
- * Still does not build because of missing jansi package (builds with
- manual install of the latter)
- * "doc" target does not build, but "javadoc" target does, adapted
- groovy-doc.docs accordingly.
- -- Steffen Moeller <moeller at debian.org> Wed, 21 Jul 2010 14:07:52 +0200
+ [ Miguel Landaeta ]
+ * Add myself as Uploader.
+ * Add Build-Depends and Depends on libjansi-java.
+ * Refresh patches/0002-ant-build.diff.patch.
+ * Add mh_clean invocation to clean target.
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 05 Aug 2010 14:49:05 -0430
+
groovy (1.7.2-1) unstable; urgency=low
[ Torsten Werner ]
Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2010-08-05 17:58:02 UTC (rev 12868)
+++ trunk/groovy/debian/control 2010-08-05 19:21:35 UTC (rev 12869)
@@ -2,13 +2,13 @@
Section: java
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>, Ludovic Claude <ludovic.claude at laposte.net>
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Miguel Landaeta <miguel at miguel.cc>
Build-Depends: debhelper (>= 7), cdbs
Build-Depends-Indep: maven-repo-helper, ant (>= 1.7.1), ant-optional, default-jdk, bzip2, libasm3-java,
libbsf-java, libcommons-cli-java (>= 1.2), libcommons-logging-java
(>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
1.2), libservlet2.5-java, libxstream-java, libjline-java, antlr,
- tofrodos, ivy, libqdox-java, libjarjar-java
+ tofrodos, ivy, libqdox-java, libjarjar-java, libjansi-java
Standards-Version: 3.9.0
Homepage: http://groovy.codehaus.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy/
@@ -20,7 +20,8 @@
libcommons-cli-java (>= 1.0),
libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>=
0.09), libregexp-java (>= 1.2), libservlet2.5-java, libjline-java,
- libxstream-java, ivy, default-jre-headless | java5-runtime-headless
+ libxstream-java, ivy, libjansi-java,
+ default-jre-headless | java5-runtime-headless
Suggests: groovy-doc, ant (>= 1.7.1)
Description: Agile dynamic language for the Java Virtual Machine
Groovy is an agile dynamic language for the JVM combining lots of great
Modified: trunk/groovy/debian/groovy.links
===================================================================
--- trunk/groovy/debian/groovy.links 2010-08-05 17:58:02 UTC (rev 12868)
+++ trunk/groovy/debian/groovy.links 2010-08-05 19:21:35 UTC (rev 12869)
@@ -17,6 +17,7 @@
/usr/share/java/commons-cli.jar /usr/share/groovy/lib/commons-cli.jar
/usr/share/java/commons-logging.jar /usr/share/groovy/lib/commons-logging.jar
/usr/share/java/ivy.jar /usr/share/groovy/lib/ivy.jar
+/usr/share/java/jansi.jar /usr/share/groovy/lib/jansi.jar
/usr/share/java/jline.jar /usr/share/groovy/lib/jline.jar
/usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar
/usr/share/java/jsp-api.jar /usr/share/groovy/lib/jsp-api.jar
Modified: trunk/groovy/debian/patches/0002-ant-build.diff.patch
===================================================================
--- trunk/groovy/debian/patches/0002-ant-build.diff.patch 2010-08-05 17:58:02 UTC (rev 12868)
+++ trunk/groovy/debian/patches/0002-ant-build.diff.patch 2010-08-05 19:21:35 UTC (rev 12869)
@@ -1,18 +1,10 @@
From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Sun, 11 Apr 2010 22:05:03 +0200
+Date: Thu, 05 Aug 2010 13:51:46 -0430
Subject: [PATCH] ant-build.diff
-===================================================================
----
- build.xml | 53 ++++++++++++++++++++++++-------------------
- config/ant/build-setup.xml | 1 +
- 2 files changed, 31 insertions(+), 23 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index e9a99b0..ab54309 100644
---- a/build.xml
-+++ b/build.xml
-@@ -28,10 +28,17 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+--- groovy-1.7.3.orig/build.xml
++++ groovy-1.7.3/build.xml
+@@ -28,10 +28,17 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<property name="ant.requiredVersion" value="1.6.5"/>
<!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
@@ -31,8 +23,8 @@
<condition property="_skipTests_">
<or>
<equals arg1="${test}" arg2="false"/>
-@@ -98,7 +105,9 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
- </copy>
+@@ -96,7 +103,9 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+ </antlr>
</target>
- <target name="-init" depends="-fetchDependencies"/>
@@ -42,7 +34,7 @@
<target name="-banner">
<echo message="Java Runtime Environment version: ${java.version}"/>
-@@ -406,13 +415,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -408,13 +417,13 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<fail message="Test failed, not processing further targets."/>
</target>
@@ -59,7 +51,7 @@
</target>
<target name="-actuallyCreateJars"
-@@ -525,12 +534,12 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -527,12 +536,12 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<delete dir="${stagingDirectory}" quiet="true"/>
<mkdir dir="${stagingDirectory}"/>
<unzip dest="${stagingDirectory}">
@@ -78,7 +70,7 @@
</fileset>
</unzip>
<unzip dest="${stagingDirectory}">
-@@ -550,8 +559,8 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -552,8 +561,8 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<exclude name="META-INF/MANIFEST.MF"/>
</patternset>
<globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
@@ -88,8 +80,8 @@
+ <include name="commons-cli.jar"/>
</fileset>
</unzip>
- <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
-@@ -575,7 +584,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+ <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
+@@ -579,7 +588,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
description="Build Groovy and create the jarfiles."/>
<target name="updateJarsForOsgi" unless="_skipOsgi_">
@@ -98,7 +90,7 @@
<copy todir="${targetDistDirectory}">
<fileset dir="config/bnd" includes="groovy*.bnd"/>
<filterset>
-@@ -631,7 +640,6 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -637,7 +646,6 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<mkdir dir="${installDirectory}/lib"/>
<copy todir="${installDirectory}/lib">
<fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
@@ -106,7 +98,7 @@
</copy>
<!-- Install the embeddable bits -->
-@@ -669,7 +677,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -675,7 +683,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
</chmod>
</target>
@@ -115,24 +107,25 @@
description="Create the code style reports.">
<checkAndReport
reportDirectory="${reportsDirectory}/checkstyle"
-@@ -721,7 +729,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -727,7 +735,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
<target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
-- <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
-+ <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
- description="Create the javadoc documentation.">
+- <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
++ <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
+ unless="_skipDocs_" description="Create the javadoc documentation.">
<javadoc destdir="${docsDirectory}/api" author="true" version="true"
windowtitle="${title}" doctitle="${title}"
-@@ -748,15 +756,14 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -755,15 +763,15 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
</copy>
</target>
-- <target name="groovydoc" depends="-fetchDependencies">
+- <target name="groovydoc" depends="-fetchDependencies" unless="_skipDocs_">
+ <target name="groovydoc">
<path id="groovydocpath">
<path path="${mainClassesDirectory}"/>
- <path refid="runtimePath"/>
++ <path refid="compilePath"/>
</path>
<antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
</target>
@@ -142,7 +135,7 @@
<taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
<classpath>
<path path="${mainClassesDirectory}"/>
-@@ -781,7 +788,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -789,7 +797,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
</groovydoc>
</target>
@@ -151,15 +144,17 @@
<java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
<classpath>
<pathelement path="${toolsClassesDirectory}"/>
-@@ -809,13 +816,13 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $
+@@ -821,7 +829,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
</delete>
</target>
-- <target name="deploy" depends="-mavenDeployInit,install,doc"
+- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployDefault,-deployFromServer"
+ <target name="deploy" depends="install,doc"
- description="Deploy jars to maven repository.">
- <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
- <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
+ description="Deploy jars to maven repository."/>
+
+ <target name="-deployDefault" unless="_forceServerSettings_">
+@@ -842,7 +850,7 @@ $Date: 2010-06-07 02:45:33 +0200 (Mo, 07
+ <delete file="target/settings.xml"/>
</target>
- <target name="installRepo" depends="-mavenInit,install,doc"
@@ -167,11 +162,9 @@
description="Deploy artifacts to local maven repository.">
<mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
<mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
-diff --git a/config/ant/build-setup.xml b/config/ant/build-setup.xml
-index cd24088..d497e40 100644
---- a/config/ant/build-setup.xml
-+++ b/config/ant/build-setup.xml
-@@ -67,6 +67,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
+--- groovy-1.7.3.orig/config/ant/build-setup.xml
++++ groovy-1.7.3/config/ant/build-setup.xml
+@@ -67,6 +67,7 @@ $Date: 2007-03-11 19:14:07 +1000 (Sun, 1
<java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
<classpath refid="@{classpathref}"/>
<jvmarg value="-Duser.home=${user.home}" />
@@ -179,4 +172,3 @@
<arg value="@{target}"/>
<arg value="-DskipFetch=${skipFetch}"/>
<arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
---
Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules 2010-08-05 17:58:02 UTC (rev 12868)
+++ trunk/groovy/debian/rules 2010-08-05 19:21:35 UTC (rev 12869)
@@ -7,7 +7,7 @@
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := install javadoc
+DEB_ANT_BUILD_TARGET := install doc
DEB_ANT_ARGS := -debug -DskipTests=true -DskipFetch=true
DEB_JARS := ant mockobjects-core servlet-api-2.5 jsp-api-2.1 commons-cli antlr \
ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm3 \
@@ -32,6 +32,7 @@
clean::
-rm -rf debian/tmp
+ mh_clean
get-orig-source:
-uscan --download-version $(VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list