[SCM] libpdfbox-java packaging branch, master, updated. debian/1%1.6.0+dfsg-2-9-g6b1e28b

[gregor herrmann]

The following commit has been merged in the master branch:
commit 854e2f95923de5816106af3bdf499fd2bb0082f5
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 1 21:05:02 2012 +0200

    Refresh patches.

diff --git a/debian/patches/build-subproject-docs.patch b/debian/patches/build-subproject-docs.patch
index bf66522..8ed38b2 100644
--- a/debian/patches/build-subproject-docs.patch
+++ b/debian/patches/build-subproject-docs.patch
@@ -2,7 +2,7 @@ Description: build javadocs for JempBox and FontBox
 Origin: vendor
 Forwarded: no
 Author: tony mancill <tmancill at debian.org>
-Last-Update: 2011-07-02
+Last-Update: 2012-06-01
 
 --- a/pdfbox/build.xml
 +++ b/pdfbox/build.xml
@@ -15,8 +15,8 @@ Last-Update: 2011-07-02
  
      <target name="clean" depends="fontbox.clean,jempbox.clean,pdfbox.clean"/>
  
-@@ -813,7 +813,7 @@
-         </exec>-->
+@@ -880,7 +880,7 @@
+         </exec>
      </target>
  
 -    <target name="javadoc" depends="pdfbox.compile" description="Create Javadocs">
@@ -24,7 +24,7 @@ Last-Update: 2011-07-02
          <javadoc packagenames="org.*"
                 sourcepath="${pdfbox.src.dir}"
                 destdir="${pdfbox.target.dir}/javadoc"
-@@ -836,4 +836,52 @@
+@@ -903,4 +903,52 @@
          </replaceregexp>
      </target>
  
diff --git a/debian/patches/build.xml.patch b/debian/patches/build.xml.patch
index e3c65da..448dff1 100644
--- a/debian/patches/build.xml.patch
+++ b/debian/patches/build.xml.patch
@@ -1,15 +1,14 @@
 Description: adjust for Debian:
  - use Debian packages for building
- - fix version number while we're there
  - fix a variable
 Origin: vendor
 Forwarded: not-needed
 Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-07-02
+Last-Update: 2012-06-01
 
 --- a/pdfbox/build.xml
 +++ b/pdfbox/build.xml
-@@ -24,11 +24,11 @@
+@@ -24,8 +24,8 @@
      <property name="build.compiler" value="modern" />
  
      <property name="download.dir" value="download" />
@@ -19,11 +18,7 @@ Last-Update: 2011-07-02
 +    <property name="tool.dir" value="/usr/share/java" />
      <property name="bin.dir" value="bin" />
  
--    <property name="project.version" value="1.6.0-SNAPSHOT" />
-+    <property name="project.version" value="1.6.0" />
- 
-     <!-- pdfbox -->
-     <property name="pdfbox.project.name" value="pdfbox"/>
+     <property name="project.version" value="1.7.0" />
 @@ -64,23 +64,23 @@
      <property name="maven.repo1" value="http://repo1.maven.org/maven2" />
      <property name="maven.repo2" value="http://repo2.maven.org/maven2" />

-- 
libpdfbox-java packaging