This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jruby.
commit 72c8e50e4152473a01445fee26c79fe586183210 Author: tony mancill <[email protected]> Date: Mon Oct 27 06:50:58 2014 -0700 Revert "test patch" This reverts commit f8127490f0d34584176d38f8dd002d7188ba7781. --- debian/patches/0013-apt.patch | 28 ---------------------------- debian/patches/series | 1 - 2 files changed, 29 deletions(-) diff --git a/debian/patches/0013-apt.patch b/debian/patches/0013-apt.patch deleted file mode 100644 index 22dfe66..0000000 --- a/debian/patches/0013-apt.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/build.xml b/build.xml -index 9857cd2..cdd687b 100644 ---- a/build.xml -+++ b/build.xml -@@ -188,6 +188,7 @@ - - <target name="compile-jruby" depends="prepare-resources, compile-annotation-binder, check-for-optional-packages"> - <!-- Generate binding logic ahead of time --> -+ <!-- - <apt factory="org.jruby.anno.AnnotationBinder" destdir="${jruby.classes.dir}" debug="true" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8"> - <classpath refid="jruby.execute.classpath"/> - <src path="${src.dir}"/> -@@ -195,6 +196,15 @@ - <compilerarg line="-XDignore.symbol.file=true"/> - <compilerarg line="-J-Xmx${jruby.compile.memory}"/> - </apt> -+ --> -+ <javac destdir="${jruby.classes.dir}" debug="true" srcdir="${src.dir}" sourcepath="" classpathref="build.classpath" source="${javac.version}" target="${javac.version}" deprecation="true" encoding="UTF-8"> -+ -+ <classpath refid="jruby.execute.classpath"/> -+ <src path="${src.dir}"/> -+ <patternset refid="java.src.pattern"/> -+ <compilerarg line="-XDignore.symbol.file=true"/> -+ <compilerarg line="-J-Xmx${jruby.compile.memory}"/> -+ </javac> - </target> - - <target name="compile" depends="compile-jruby" diff --git a/debian/patches/series b/debian/patches/series index dc01d26..875449d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ 0010-jruby-Set-FD_CLOEXEC-correctly-using-F_SETFD-not-F_S.patch 0011-java7-compat.patch 0012-nailgun.patch -0013-apt.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
