[libpdfbox-java] 06/07: Removed the timestamp from pdfbox.version

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libpdfbox-java.

commit 85db11e3f3561fc22bf2d200ca84462599713570
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 18 19:03:30 2015 +0100

    Removed the timestamp from pdfbox.version
---
 debian/changelog                                      |  1 +
 ...ducible-javadoc.patch => reproducible-build.patch} | 19 +++++++++++++++----
 debian/patches/series                                 |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c0b1df..918738c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libpdfbox-java (1:1.8.10-1) UNRELEASED; urgency=medium
     - Adapted debian/*.poms to work with any version
   * Improved the reproducibility:
     - Set the locale when generating the javadoc
+    - Removed the timestamp from pdfbox.version
   * Removed the unused build dependency on liblucene2-java
   * Changed the priority from extra to optional
   * Clean the upstream tarball using the Files-Excluded field
diff --git a/debian/patches/reproducible-javadoc.patch b/debian/patches/reproducible-build.patch
similarity index 56%
rename from debian/patches/reproducible-javadoc.patch
rename to debian/patches/reproducible-build.patch
index 9240b68..38edb88 100644
--- a/debian/patches/reproducible-javadoc.patch
+++ b/debian/patches/reproducible-build.patch
@@ -1,9 +1,20 @@
-Description: Make the javadoc reproducible
+Description: Make the build reproducible
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pdfbox/build.xml
 +++ b/pdfbox/build.xml
-@@ -852,6 +852,7 @@
+@@ -393,9 +393,7 @@
+     </target>
+ 
+     <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file">
+-        <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">
+-            <entry  key="pdfbox.version" value="${pdfbox.release.name}"/>
+-        </propertyfile>
++        <echo file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version">pdfbox.version=${pdfbox.release.name}</echo>
+ 
+         <jar jarfile="./${pdfbox.target.dir}/${pdfbox.release.name}.jar">
+             <fileset dir="${pdfbox.dest.dir}"/>
+@@ -852,6 +850,7 @@
                 verbose="no"
                 classpathref="pdfbox.build.classpath"
                 encoding="ISO-8859-1"
@@ -11,7 +22,7 @@ Forwarded: not-needed
                 breakiterator="yes">
              <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
          </javadoc>
-@@ -876,6 +877,7 @@
+@@ -876,6 +875,7 @@
                 verbose="no"
                 classpathref="fontbox.build.classpath"
                 encoding="ISO-8859-1"
@@ -19,7 +30,7 @@ Forwarded: not-needed
                 breakiterator="yes">
              <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
          </javadoc>
-@@ -900,6 +902,7 @@
+@@ -900,6 +900,7 @@
                 verbose="no"
                 classpathref="jempbox.build.classpath"
                 encoding="ISO-8859-1"
diff --git a/debian/patches/series b/debian/patches/series
index 64c44eb..c13cc0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 build.xml.patch
 build-subproject-docs.patch
 bc-1.47.patch
-reproducible-javadoc.patch
+reproducible-build.patch

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