[zookeeper] 01/03: Removed the Built-At, Built-By and Built-On entries in the manifests

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/3.4.6-4
in repository zookeeper.

commit cf96f8171ab0cbf8440d488edc5649479c94e1aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 28 10:06:08 2015 +0200

    Removed the Built-At, Built-By and Built-On entries in the manifests
---
 debian/changelog                                   |  8 ++++
 .../remove-non-reproducible-manifest-entries.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 64 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 917639e..c5504ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zookeeper (3.4.6-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Improved the build reproducibility by removing the Built-At, Built-By
+    and Built-On entries in the manifests.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Apr 2015 10:03:34 +0200
+
 zookeeper (3.4.6-3) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/debian/remove-non-reproducible-manifest-entries.patch b/debian/patches/debian/remove-non-reproducible-manifest-entries.patch
new file mode 100644
index 0000000..3a92754
--- /dev/null
+++ b/debian/patches/debian/remove-non-reproducible-manifest-entries.patch
@@ -0,0 +1,55 @@
+Description: Remove the Built-At, Built-By and Built-On entries in the manifest of the jar files to improve the build reproducibility
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -540,9 +540,6 @@
+             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
+             <manifest>
+                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+-                <attribute name="Built-By" value="${user.name}"/>
+-                <attribute name="Built-At" value="${build.time}"/>
+-                <attribute name="Built-On" value="${host.name}" />
+                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
+                 <attribute name="Implementation-Version" value="${revision}"/> 
+                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+@@ -581,9 +578,6 @@
+             <fileset dir="${build.classes}" excludes="**/.generated"/>
+             <manifest>
+                 <attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeer" />
+-                <attribute name="Built-By" value="${user.name}"/>
+-                <attribute name="Built-At" value="${build.time}"/>
+-                <attribute name="Built-On" value="${host.name}" />
+                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
+                 <attribute name="Implementation-Version" value="${revision}"/> 
+                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+@@ -613,9 +607,6 @@
+             <fileset dir="${java.src.dir}"/>
+             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
+             <manifest>
+-                <attribute name="Built-By" value="${user.name}"/>
+-                <attribute name="Built-At" value="${build.time}"/>
+-                <attribute name="Built-On" value="${host.name}" />
+                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
+                 <attribute name="Implementation-Version" value="${revision}"/> 
+                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+@@ -631,9 +622,6 @@
+             <fileset file="LICENSE.txt" />
+             <fileset dir="${build.javadoc}"/>
+             <manifest>
+-                <attribute name="Built-By" value="${user.name}"/>
+-                <attribute name="Built-At" value="${build.time}"/>
+-                <attribute name="Built-On" value="${host.name}" />
+                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
+                 <attribute name="Implementation-Version" value="${revision}"/> 
+                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+@@ -649,9 +637,6 @@
+             <fileset file="LICENSE.txt" />
+             <fileset dir="${test.java.classes}"/>
+             <manifest>
+-                <attribute name="Built-By" value="${user.name}"/>
+-                <attribute name="Built-At" value="${build.time}"/>
+-                <attribute name="Built-On" value="${host.name}" />
+                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
+                 <attribute name="Implementation-Version" value="${revision}"/> 
+                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
diff --git a/debian/patches/series b/debian/patches/series
index f212bdc..6138795 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ debian/disable-cygwin-detection.patch
 fixes/ZOOKEEPER-705.patch
 ftbfs-gcc-4.7.patch
 fixes/ZOOKEEPER-770.patch
+debian/remove-non-reproducible-manifest-entries.patch

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