[SCM] libpdfbox-java packaging branch, master, updated. debian/1.8.2+dfsg-1-4-g4d78000

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 4d78000e4724aaa3d1986c67809cb04117aaee00
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 22 15:31:15 2013 +0200

    Removed the test classes from the jars

diff --git a/debian/patches/build-subproject-docs.patch b/debian/patches/build-subproject-docs.patch
index 8ed38b2..681ca00 100644
--- a/debian/patches/build-subproject-docs.patch
+++ b/debian/patches/build-subproject-docs.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-06-01
 
 --- a/pdfbox/build.xml
 +++ b/pdfbox/build.xml
-@@ -481,7 +481,7 @@
+@@ -487,7 +487,7 @@
  
      <!-- We use Maven to create the release packages. Keep this target for -->
      <!-- now for backwards compatibility with old build scripts and habits -->
@@ -15,7 +15,7 @@ Last-Update: 2012-06-01
  
      <target name="clean" depends="fontbox.clean,jempbox.clean,pdfbox.clean"/>
  
-@@ -880,7 +880,7 @@
+@@ -886,7 +886,7 @@
          </exec>
      </target>
  
@@ -24,7 +24,7 @@ Last-Update: 2012-06-01
          <javadoc packagenames="org.*"
                 sourcepath="${pdfbox.src.dir}"
                 destdir="${pdfbox.target.dir}/javadoc"
-@@ -903,4 +903,52 @@
+@@ -909,4 +909,52 @@
          </replaceregexp>
      </target>
  
diff --git a/debian/patches/build.xml.patch b/debian/patches/build.xml.patch
index 7c2e8f0..0b43603 100644
--- a/debian/patches/build.xml.patch
+++ b/debian/patches/build.xml.patch
@@ -1,6 +1,7 @@
 Description: adjust for Debian:
  - use Debian packages for building
  - fix a variable
+ - remove the test classes from the jars
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa at debian.org>
@@ -48,7 +49,41 @@ Last-Update: 2012-06-01
      <property name="icu4j.url" value="${maven.repo1}/com/ibm/icu/icu4j/3.8/${icu4j.name}.jar" />
      <property name="icu4j.jar" value="${jar.dir}/${icu4j.name}.jar" />
  
-@@ -217,7 +217,7 @@
+@@ -187,9 +187,11 @@
+         <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
++<!--
+         <javac srcdir="${pdfbox.test.dir}" destdir="${pdfbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="pdfbox.build.classpath" encoding="ISO-8859-1"/>
++-->
+     </target>
+ 
+     <target name="fontbox.compile" depends="fontbox.init"
+@@ -198,9 +200,11 @@
+         <javac srcdir="${fontbox.src.dir}" destdir="${fontbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
++<!--
+         <javac srcdir="${fontbox.test.dir}" destdir="${fontbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="fontbox.build.classpath" encoding="ISO-8859-1"/>
++-->
+     </target>
+ 
+     <target name="jempbox.compile" depends="jempbox.init"
+@@ -209,15 +213,17 @@
+         <javac srcdir="${jempbox.src.dir}" destdir="${jempbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
++<!--
+         <javac srcdir="${jempbox.test.dir}" destdir="${jempbox.dest.dir}"
+                target="1.5" source="1.5" debug="on" deprecation="on"
+                classpathref="jempbox.build.classpath" encoding="ISO-8859-1"/>
++-->
+     </target>
+ 
      <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/>
  
      <target name="find.adobefiles">

-- 
libpdfbox-java packaging