This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jruby.
commit f89827603984b174d46c9d0d6a697ad33ad4aebf Author: tony mancill <[email protected]> Date: Sun Sep 7 05:38:57 2014 +0000 refresh patches --- debian/patches/0003-do-not-install-gems.patch | 21 +++++++++------------ debian/patches/0004-replace-bundled-libraries.patch | 18 ++++++------------ ...006-do-not-build-InvokeDynamicSupport.java.patch | 3 --- .../patches/0007-use-unversioned-jarjar.jar.patch | 15 ++++++--------- debian/patches/0012-nailgun.patch | 8 ++++---- 5 files changed, 25 insertions(+), 40 deletions(-) diff --git a/debian/patches/0003-do-not-install-gems.patch b/debian/patches/0003-do-not-install-gems.patch index e494536..b46d24d 100644 --- a/debian/patches/0003-do-not-install-gems.patch +++ b/debian/patches/0003-do-not-install-gems.patch @@ -6,11 +6,9 @@ Subject: do not install gems build.xml | 75 +------------------------------------------------------------ 1 files changed, 1 insertions(+), 74 deletions(-) -diff --git a/build.xml b/build.xml -index 9857cd2..5fd40cf 100644 --- a/build.xml +++ b/build.xml -@@ -452,7 +452,6 @@ +@@ -462,7 +462,6 @@ <sysproperty key="jruby.home" value="${build.dir}/jar-complete/META-INF/jruby.home"/> <env key="RUBYOPT" value=""/> <jvmarg value="${run.jvm.model}"/> @@ -18,7 +16,7 @@ index 9857cd2..5fd40cf 100644 <arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/> </java> -@@ -542,7 +541,6 @@ +@@ -552,7 +551,6 @@ <sysproperty key="jruby.home" value="${build.dir}/jar-complete/META-INF/jruby.home"/> <env key="RUBYOPT" value=""/> <jvmarg value="${run.jvm.model}"/> @@ -26,7 +24,7 @@ index 9857cd2..5fd40cf 100644 <arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/> </java> -@@ -690,33 +688,8 @@ +@@ -700,33 +698,8 @@ </emma> </target> @@ -60,7 +58,7 @@ index 9857cd2..5fd40cf 100644 run-junit-interpreted-short, test-rake-targets" description="Runs unit tests."> -@@ -724,7 +697,6 @@ +@@ -734,7 +707,6 @@ <target name="test-indy" depends=" copy-test-files, @@ -68,7 +66,7 @@ index 9857cd2..5fd40cf 100644 run-junit-indy-short, test-rake-targets" description="Runs unit tests."> -@@ -732,7 +704,6 @@ +@@ -742,7 +714,6 @@ <target name="test-extended" depends=" copy-test-files, @@ -76,7 +74,7 @@ index 9857cd2..5fd40cf 100644 run-junit-compiled, run-junit-embed, test-rake-targets" -@@ -1066,48 +1037,6 @@ +@@ -1076,48 +1047,6 @@ </sequential> </macrodef> @@ -125,7 +123,7 @@ index 9857cd2..5fd40cf 100644 <target name="update-excludes"> <java classname="org.jruby.Main" fork="true" maxmemory="${jruby.launch.memory}" failonerror="false" dir="${spec.dir}"> <classpath refid="jruby.execute.classpath"/> -@@ -1289,7 +1218,6 @@ +@@ -1299,7 +1228,6 @@ <mkdir dir="${dist.stage.bin.dir}/lib/native"/> <unzip-native-libs destination.dir="${dist.stage.bin.dir}/lib/native"/> <fixEOLs dist-stage-dir="${dist.stage.bin.dir}"/> @@ -133,7 +131,7 @@ index 9857cd2..5fd40cf 100644 <tar destfile="${dist.dir}/jruby-bin-${version.jruby}.tar.gz" compression="gzip"> <tarfileset dir="${dist.stage.bin.dir}" mode="755" prefix="jruby-${version.jruby}"> <include name="bin/**"/> -@@ -1339,7 +1267,6 @@ +@@ -1349,7 +1277,6 @@ <patternset refid="dist.lib.files"/> </fileset> </copy> @@ -141,7 +139,7 @@ index 9857cd2..5fd40cf 100644 <fixEOLs dist-stage-dir="${dist.stage.src.dir}"/> <tar destfile="${dist.dir}/jruby-src-${version.jruby}.tar.gz" compression="gzip"> <tarfileset dir="${dist.stage.src.dir}" mode="755" prefix="jruby-${version.jruby}"> -@@ -1425,7 +1352,7 @@ +@@ -1435,7 +1362,7 @@ </antcall> </target> @@ -150,4 +148,3 @@ index 9857cd2..5fd40cf 100644 <target name="dist-clean"> <delete dir="${dist.dir}"/> --- diff --git a/debian/patches/0004-replace-bundled-libraries.patch b/debian/patches/0004-replace-bundled-libraries.patch index 7683210..9a79308 100644 --- a/debian/patches/0004-replace-bundled-libraries.patch +++ b/debian/patches/0004-replace-bundled-libraries.patch @@ -9,16 +9,11 @@ Subject: replace bundled libraries 2 files changed, 64 insertions(+), 108 deletions(-) create mode 100644 build.properties -diff --git a/build.properties b/build.properties -new file mode 100644 -index 0000000..5308747 --- /dev/null +++ b/build.properties @@ -0,0 +1,2 @@ +build.lib.dir=/usr/share/java/ +local.build.lib.dir=build_lib -diff --git a/build.xml b/build.xml -index 5fd40cf..fe433f9 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,29 @@ @@ -52,7 +47,7 @@ index 5fd40cf..fe433f9 100644 </path> <path id="jruby.execute.classpath"> -@@ -289,38 +311,21 @@ +@@ -299,38 +321,21 @@ <jar destfile="${lib.dir}/jruby.jar" compress="true" index="true"> <fileset dir="${jruby.classes.dir}"/> @@ -99,7 +94,7 @@ index 5fd40cf..fe433f9 100644 <zipfileset src="${build.lib.dir}/yydebug.jar"/> <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> <metainf dir="${base.dir}/spi"> -@@ -345,15 +350,15 @@ +@@ -355,15 +360,15 @@ <exclude name="org/jruby/ext/ffi/**/*"/> <exclude name="org/jruby/embed/**/*"/> </fileset> @@ -119,7 +114,7 @@ index 5fd40cf..fe433f9 100644 <manifest> <attribute name="Built-By" value="${user.name}"/> <attribute name="Main-Class" value="org.jruby.Main"/> -@@ -367,38 +372,21 @@ +@@ -377,38 +382,21 @@ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0.jar"/> <jarjar destfile="${lib.dir}/jruby.jar" compress="true"> <fileset dir="${jruby.classes.dir}"/> @@ -166,7 +161,7 @@ index 5fd40cf..fe433f9 100644 <zipfileset src="${build.lib.dir}/yydebug.jar"/> <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> <metainf dir="${base.dir}/spi"> -@@ -462,41 +450,24 @@ +@@ -472,41 +460,24 @@ <exclude name="META-INF/jruby.home/lib/ruby/site_ruby/shared/builtin/**"/> <exclude name="META-INF/jruby.home/lib/ruby/1.9/**"/> </fileset> @@ -217,7 +212,7 @@ index 5fd40cf..fe433f9 100644 <metainf dir="${base.dir}/spi"> <include name="services/**"/> </metainf> -@@ -550,41 +521,24 @@ +@@ -560,41 +531,24 @@ <fileset dir="${build.dir}/jar-complete"> <exclude name="META-INF/jruby.home/lib/ruby/1.8/**"/> </fileset> @@ -268,7 +263,7 @@ index 5fd40cf..fe433f9 100644 <metainf dir="${base.dir}/spi"> <include name="services/**"/> </metainf> -@@ -757,7 +711,7 @@ +@@ -767,7 +721,7 @@ <path id="test.class.path"> <pathelement path="${build.lib.dir}/junit.jar"/> @@ -277,4 +272,3 @@ index 5fd40cf..fe433f9 100644 <pathelement path="${build.lib.dir}/bsf.jar"/> <pathelement path="${build.lib.dir}/commons-logging-1.1.1.jar"/> <pathelement path="${java.class.path}"/> --- diff --git a/debian/patches/0006-do-not-build-InvokeDynamicSupport.java.patch b/debian/patches/0006-do-not-build-InvokeDynamicSupport.java.patch index fd810e3..c7826dd 100644 --- a/debian/patches/0006-do-not-build-InvokeDynamicSupport.java.patch +++ b/debian/patches/0006-do-not-build-InvokeDynamicSupport.java.patch @@ -8,8 +8,6 @@ yet. build.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/build.xml b/build.xml -index bf2b9e8..ed8cf76 100644 --- a/build.xml +++ b/build.xml @@ -57,6 +57,7 @@ @@ -20,4 +18,3 @@ index bf2b9e8..ed8cf76 100644 </patternset> <patternset id="ruby.src.pattern"> --- diff --git a/debian/patches/0007-use-unversioned-jarjar.jar.patch b/debian/patches/0007-use-unversioned-jarjar.jar.patch index d4ad941..bc0bc25 100644 --- a/debian/patches/0007-use-unversioned-jarjar.jar.patch +++ b/debian/patches/0007-use-unversioned-jarjar.jar.patch @@ -6,11 +6,9 @@ Subject: use unversioned jarjar.jar build.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/build.xml b/build.xml -index ed8cf76..ecb0227 100644 --- a/build.xml +++ b/build.xml -@@ -370,7 +370,7 @@ +@@ -380,7 +380,7 @@ <target name="jar-jruby-dist" depends="generate-method-classes, generate-unsafe" unless="jar-up-to-date"> <antcall target="_update_scm_revision_"/> @@ -19,7 +17,7 @@ index ed8cf76..ecb0227 100644 <jarjar destfile="${lib.dir}/jruby.jar" compress="true"> <fileset dir="${jruby.classes.dir}"/> <zipfileset src="${build.lib.dir}/asm3.jar"/> -@@ -423,7 +423,7 @@ +@@ -433,7 +433,7 @@ <property name="mainclass" value="org.jruby.Main"/> <property name="filename" value="jruby-complete.jar"/> <property name="bilename" value="jruby-complete.bar"/> @@ -28,7 +26,7 @@ index ed8cf76..ecb0227 100644 <property name="jar-complete-home" value="${build.dir}/jar-complete/META-INF/jruby.home"/> <mkdir dir="${jar-complete-home}"/> <copy todir="${jar-complete-home}"> -@@ -444,7 +444,7 @@ +@@ -454,7 +454,7 @@ <arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/> </java> @@ -37,7 +35,7 @@ index ed8cf76..ecb0227 100644 <jarjar destfile="${dest.lib.dir}/${filename}"> <fileset dir="${jruby.classes.dir}"/> <fileset dir="${build.dir}/jar-complete"> -@@ -495,7 +495,7 @@ +@@ -505,7 +505,7 @@ <target name="jar-complete-1.9" depends="generate-method-classes, generate-unsafe" description="Create the 'complete' JRuby jar. Pass 'mainclass' and 'filename' to adjust."> <property name="mainclass" value="org.jruby.Main"/> <property name="filename" value="jruby-complete.jar"/> @@ -46,7 +44,7 @@ index ed8cf76..ecb0227 100644 <property name="jar-complete-home" value="${build.dir}/jar-complete/META-INF/jruby.home"/> <mkdir dir="${jar-complete-home}"/> <copy todir="${jar-complete-home}"> -@@ -516,7 +516,7 @@ +@@ -526,7 +526,7 @@ <arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/> </java> @@ -55,7 +53,7 @@ index ed8cf76..ecb0227 100644 <jarjar destfile="${dest.lib.dir}/${filename}"> <fileset dir="${jruby.classes.dir}"/> <fileset dir="${build.dir}/jar-complete"> -@@ -1116,7 +1116,7 @@ +@@ -1126,7 +1126,7 @@ <exclude name="lib/emma.jar"/> <exclude name="lib/emma_ant.jar"/> <exclude name="lib/junit.jar"/> @@ -64,4 +62,3 @@ index ed8cf76..ecb0227 100644 <exclude name="docs/rdocs.tar.gz"/> <exclude name="bench/**"/> <include name="share/**"/> --- diff --git a/debian/patches/0012-nailgun.patch b/debian/patches/0012-nailgun.patch index fa7c050..f51bebc 100644 --- a/debian/patches/0012-nailgun.patch +++ b/debian/patches/0012-nailgun.patch @@ -8,7 +8,7 @@ Last-Update: 2013-11-01 --- a/build.xml +++ b/build.xml -@@ -328,7 +328,7 @@ +@@ -338,7 +338,7 @@ <zipfileset src="${build.lib.dir}/jffi.jar"/> <zipfileset src="${build.lib.dir}/joda-time.jar"/> <zipfileset src="${build.lib.dir}/yydebug.jar"/> @@ -17,7 +17,7 @@ Last-Update: 2013-11-01 <metainf dir="${base.dir}/spi"> <include name="services/**"/> </metainf> -@@ -389,7 +389,7 @@ +@@ -399,7 +399,7 @@ <zipfileset src="${build.lib.dir}/jffi.jar"/> <zipfileset src="${build.lib.dir}/joda-time.jar"/> <zipfileset src="${build.lib.dir}/yydebug.jar"/> @@ -26,7 +26,7 @@ Last-Update: 2013-11-01 <metainf dir="${base.dir}/spi"> <include name="services/**"/> </metainf> -@@ -467,7 +467,7 @@ +@@ -477,7 +477,7 @@ <zipfileset src="${build.lib.dir}/jffi.jar"/> <zipfileset src="${build.lib.dir}/joda-time.jar"/> <zipfileset src="${build.lib.dir}/yydebug.jar"/> @@ -35,7 +35,7 @@ Last-Update: 2013-11-01 <zipfileset src="${local.shared.lib.dir}/yecht.jar"/> <metainf dir="${base.dir}/spi"> <include name="services/**"/> -@@ -538,7 +538,7 @@ +@@ -548,7 +548,7 @@ <zipfileset src="${build.lib.dir}/jffi.jar"/> <zipfileset src="${build.lib.dir}/joda-time.jar"/> <zipfileset src="${build.lib.dir}/yydebug.jar"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
