This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository pdfsam.
commit b0ca480c5d7329234ff719d6610cbe5ddcdf2e23 Author: Torsten Werner <[email protected]> Date: Fri Aug 29 19:16:03 2008 +0000 build the jars --- debian/build.xml | 19 +++++++++--------- debian/control | 2 +- debian/patches/build.diff | 51 +++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++- 5 files changed, 65 insertions(+), 11 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 37692ee..e6449bf 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project default="compile" name="pdfsam" basedir=".."> +<project default="build-jars" name="pdfsam" basedir=".."> + <target name="clean" description="Clean up"> <delete dir="${build.dir}"/> <delete dir="classes"/> @@ -13,15 +14,15 @@ <ant antfile="ant/build.xml" dir="pdfsam-split" target="clean"/> </target> - <target name="compile" description="Compile the Java files"> + <target name="build-jars" description="Build the jar files"> <mkdir dir="${build.dir}"/> - <ant antfile="ant/build.xml" dir="emp4j" target="compile"/> - <ant antfile="ant/build.xml" dir="jcmdline" target="compile"/> - <ant antfile="ant/build.xml" dir="pdfsam-console-br1" target="compile"/> - <ant antfile="ant/build.xml" dir="pdfsam-langpack" target="compile"/> - <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="compile"/> - <ant antfile="ant/build.xml" dir="pdfsam-merge" target="compile"/> - <ant antfile="ant/build.xml" dir="pdfsam-split" target="compile"/> + <ant antfile="ant/build.xml" dir="emp4j" target="build-jars"/> + <ant antfile="ant/build.xml" dir="jcmdline" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-console-br1" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-langpack" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-maine-br1" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-merge" target="build-jars"/> + <ant antfile="ant/build.xml" dir="pdfsam-split" target="build-jars"/> </target> </project> diff --git a/debian/control b/debian/control index 447038d..b5a9f30 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk-builddep, - libitext-java, libjaxen-java, liblog4j1.2-java + libitext-java, libjaxen-java, liblog4j1.2-java, quilt Standards-Version: 3.8.0 Homepage: http://www.pdfsam.org Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/pdfsam diff --git a/debian/patches/build.diff b/debian/patches/build.diff new file mode 100644 index 0000000..ef98c03 --- /dev/null +++ b/debian/patches/build.diff @@ -0,0 +1,51 @@ +Index: pdfsam-1.0.1/pdfsam-maine-br1/ant/build.xml +=================================================================== +--- pdfsam-1.0.1.orig/pdfsam-maine-br1/ant/build.xml 2008-08-24 19:17:14.000000000 +0200 ++++ pdfsam-1.0.1/pdfsam-maine-br1/ant/build.xml 2008-08-29 21:10:36.000000000 +0200 +@@ -113,46 +113,6 @@ + </fileset> + </jar> + +- <copy todir="${pdfsam.release.jar.dir}"> +- <fileset dir="${pdfsam.dist.dir}"> +- <include name="*.jar" /> +- </fileset> +- </copy> +- +- <!--emp4j--> +- <ant antfile="${emp4j.dir}/ant/build.xml" dir="${emp4j.dir}" target="build-jars"> +- <property name="emp4j.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- <copy file="${pdfsam.release.jar.dir}/${emp4j.jar.name}.jar" todir="${libs.dir}" /> +- +- <!--jcmdline--> +- <ant antfile="${jcmdline.dir}/ant/build.xml" dir="${jcmdline.dir}" target="build-jars"> +- <property name="jcmdline.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- <copy file="${pdfsam.release.jar.dir}/${jcmdline.jar.name}.jar" todir="${libs.dir}" /> +- +- <!--langpack--> +- <ant antfile="${langpack.dir}/ant/build.xml" dir="${langpack.dir}" target="build-jars"> +- <property name="pdfsam-langpack.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- <copy file="${pdfsam.release.jar.dir}/${pdfsam-langpack.jar.name}.jar" todir="${libs.dir}" /> +- +- <!--console--> +- <ant antfile="${console.dir}/ant/build.xml" dir="${console.dir}" target="build-jars"> +- <property name="pdfsam-console.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- <copy file="${pdfsam.release.jar.dir}/${pdfsam-console.jar.name}.jar" todir="${libs.dir}" /> +- +- <!--split--> +- <ant antfile="${split.dir}/ant/build.xml" dir="${split.dir}" target="build-jars"> +- <property name="pdfsam-split.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- +- <!--merge--> +- <ant antfile="${merge.dir}/ant/build.xml" dir="${merge.dir}" target="build-jars"> +- <property name="pdfsam-merge.dist.dir" value="${pdfsam.release.jar.dir}"/> +- </ant> +- + <antcall target="build-jars-enhanced" /> + </target> + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c614a3c --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build.diff diff --git a/debian/rules b/debian/rules index 88d5c73..69f7499 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml DEB_JARS := itext jaxen log4j-1.2 -DEB_ANT_BUILD_TARGET := -Dbuild.dir=$(CURDIR)/build compile +DEB_ANT_BUILD_TARGET := -Dbuild.dir=$(CURDIR)/build DEB_CLASSPATH := $(DEB_CLASSPATH):$(CURDIR)/build/jcmdline/build:$(CURDIR)/build/emp4j/build:$(CURDIR)/build/pdfsam-console-br1/build:$(CURDIR)/build/pdfsam-langpack/build:$(CURDIR)/build/pdfsam-maine-br1/build: get-orig-source: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pdfsam.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
