This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jruby.
commit d6e512285a072ceb8181c830cf1a2c177fcee3e8 Author: gregor herrmann <[email protected]> Date: Fri Nov 1 17:38:13 2013 +0100 Add patch 0012-nailgun.patch. Use unversioned nailgun.jar. Closes: #713159 --- debian/patches/0012-nailgun.patch | 46 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 47 insertions(+) diff --git a/debian/patches/0012-nailgun.patch b/debian/patches/0012-nailgun.patch new file mode 100644 index 0000000..fa7c050 --- /dev/null +++ b/debian/patches/0012-nailgun.patch @@ -0,0 +1,46 @@ +Description: use unversioned nailgun.jar +Origin: vendor +Bug-Debian: http://bugs.debian.org/713159 +Forwarded: not needed +Author: Julian Taylor <[email protected]> +Reviewed-by: gregor herrmann <[email protected]> +Last-Update: 2013-11-01 + +--- a/build.xml ++++ b/build.xml +@@ -328,7 +328,7 @@ + <zipfileset src="${build.lib.dir}/jffi.jar"/> + <zipfileset src="${build.lib.dir}/joda-time.jar"/> + <zipfileset src="${build.lib.dir}/yydebug.jar"/> +- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> ++ <zipfileset src="${build.lib.dir}/nailgun.jar"/> + <metainf dir="${base.dir}/spi"> + <include name="services/**"/> + </metainf> +@@ -389,7 +389,7 @@ + <zipfileset src="${build.lib.dir}/jffi.jar"/> + <zipfileset src="${build.lib.dir}/joda-time.jar"/> + <zipfileset src="${build.lib.dir}/yydebug.jar"/> +- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> ++ <zipfileset src="${build.lib.dir}/nailgun.jar"/> + <metainf dir="${base.dir}/spi"> + <include name="services/**"/> + </metainf> +@@ -467,7 +467,7 @@ + <zipfileset src="${build.lib.dir}/jffi.jar"/> + <zipfileset src="${build.lib.dir}/joda-time.jar"/> + <zipfileset src="${build.lib.dir}/yydebug.jar"/> +- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> ++ <zipfileset src="${build.lib.dir}/nailgun.jar"/> + <zipfileset src="${local.shared.lib.dir}/yecht.jar"/> + <metainf dir="${base.dir}/spi"> + <include name="services/**"/> +@@ -538,7 +538,7 @@ + <zipfileset src="${build.lib.dir}/jffi.jar"/> + <zipfileset src="${build.lib.dir}/joda-time.jar"/> + <zipfileset src="${build.lib.dir}/yydebug.jar"/> +- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/> ++ <zipfileset src="${build.lib.dir}/nailgun.jar"/> + <zipfileset src="${local.shared.lib.dir}/yecht.jar"/> + <metainf dir="${base.dir}/spi"> + <include name="services/**"/> diff --git a/debian/patches/series b/debian/patches/series index 7cce6c0..875449d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0009-CVE-2012-5370.patch 0010-jruby-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-F_S.patch 0011-java7-compat.patch +0012-nailgun.patch -- 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
