[mojarra] 04/06: Add build.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository mojarra.

commit 5f2bd39e75bf78fa5c2cf2c83c7461b602a20e99
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Aug 25 14:52:59 2014 +0200

    Add build.patch
---
 debian/patches/build.patch | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 81 insertions(+)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..5adf64e
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,80 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 25 Aug 2014 14:52:44 +0200
+Subject: build
+
+---
+ common/ant/common.xml | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/common/ant/common.xml b/common/ant/common.xml
+index d1f476c..18fb19f 100644
+--- a/common/ant/common.xml
++++ b/common/ant/common.xml
+@@ -43,22 +43,22 @@
+ 
+ <project name="JSF Common" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+ 
+-    <import file="${jsf.build.home}/common/ant/dependencies.xml"/>
++    <!--<import file="${jsf.build.home}/common/ant/dependencies.xml"/>-->
+     <import file="${jsf.build.home}/common/ant/test-app.xml"/>
+     <import file="${jsf.build.home}/common/ant/maven.xml"/>
+     <taskdef resource="net/sf/antcontrib/antlib.xml">
+         <classpath>
+             <pathelement
+-                  location="${jsf.build.home}/common/lib/ant-contrib.jar"/>
++                location="/usr/share/java/ant-contrib.jar"/>
+         </classpath>
+     </taskdef>
+     <taskdef resource="aQute/bnd/ant/taskdef.properties">
+         <classpath>
+             <pathelement
+-                  location="${jsf.build.home}/common/lib/bnd-0.0.249.jar"/>
++                location="/usr/share/java/bnd.jar"/>
+         </classpath>
+     </taskdef>
+-
++    <!--
+     <taskdef name="installerBuilder" classname="org.jvnet.poormans_installer.builder.BuilderTask">
+         <classpath>
+             <pathelement location="${jsf.build.home}/common/lib/installer-builder.jar"/>
+@@ -69,7 +69,7 @@
+       <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+                uri="antlib:org.apache.maven.artifact.ant"
+                classpathref="maven-ant-tasks.classpath" />
+-
++    -->
+     
+     <!-- Setup the time properties for use with the project -->
+     <tstamp/>
+@@ -155,17 +155,20 @@
+     </target>
+ 
+     -->
++    <path id="compile.path">
++        <fileset dir="/" includesfile="${jsf.build.home}/debian/classpath-debian"/>
++    </path>
++
+     <condition property="maven.repo.local" value="${maven.repo.local}" else="${user.home}/.m2/repository">
+         <isset property="maven.repo.local"/>
+     </condition>
+ 
+     <artifact:localRepository id="local.repository" path="${maven.repo.local}"/>
+-    
++    <!--
+     <artifact:remoteRepository id="j.n.repo" url="https://maven.java.net/content/repositories/releases/"/>
+     <artifact:remoteRepository id="j.n.repo.snapshot" url="https://maven.java.net/content/repositories/snapshots/"/>
+     <artifact:remoteRepository id="codehaus.repo" url="http://repository.codehaus.org/"/>
+     <artifact:remoteRepository id="ibiblio.repo" url="http://mirrors.ibiblio.org/pub/mirrors/maven2/"/>
+-
+     <artifact:dependencies filesetId="compile.filepath" pathId="compile.path">
+         <dependency groupId="javax.el" artifactId="javax.el-api" version="2.2.1" scope="provided"/>
+         <dependency groupId="javax.servlet" artifactId="javax.servlet-api" version="3.0.1" scope="provided"/>
+@@ -216,7 +219,7 @@
+         <remoteRepository refid="j.n.repo"/>
+         <remoteRepository refid="j.n.repo.snapshot"/>
+     </artifact:dependencies>
+-
++    -->
+ 
+     <!-- Intra-project dependency property names -->
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mojarra.git