[pkg-java] r6950 - in trunk/pdfsam/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-08-29 19:16:03 +0000 (Fri, 29 Aug 2008)
New Revision: 6950

Added:
   trunk/pdfsam/debian/patches/
   trunk/pdfsam/debian/patches/build.diff
   trunk/pdfsam/debian/patches/series
Modified:
   trunk/pdfsam/debian/build.xml
   trunk/pdfsam/debian/control
   trunk/pdfsam/debian/rules
Log:
build the jars


Modified: trunk/pdfsam/debian/build.xml
===================================================================
--- trunk/pdfsam/debian/build.xml	2008-08-29 18:49:51 UTC (rev 6949)
+++ trunk/pdfsam/debian/build.xml	2008-08-29 19:16:03 UTC (rev 6950)
@@ -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>

Modified: trunk/pdfsam/debian/control
===================================================================
--- trunk/pdfsam/debian/control	2008-08-29 18:49:51 UTC (rev 6949)
+++ trunk/pdfsam/debian/control	2008-08-29 19:16:03 UTC (rev 6950)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 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

Added: trunk/pdfsam/debian/patches/build.diff
===================================================================
--- trunk/pdfsam/debian/patches/build.diff	                        (rev 0)
+++ trunk/pdfsam/debian/patches/build.diff	2008-08-29 19:16:03 UTC (rev 6950)
@@ -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>
+ 	

Added: trunk/pdfsam/debian/patches/series
===================================================================
--- trunk/pdfsam/debian/patches/series	                        (rev 0)
+++ trunk/pdfsam/debian/patches/series	2008-08-29 19:16:03 UTC (rev 6950)
@@ -0,0 +1 @@
+build.diff

Modified: trunk/pdfsam/debian/rules
===================================================================
--- trunk/pdfsam/debian/rules	2008-08-29 18:49:51 UTC (rev 6949)
+++ trunk/pdfsam/debian/rules	2008-08-29 19:16:03 UTC (rev 6950)
@@ -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: