[openjdk-8] 01/01: Removed the embedded copy of zlib

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 5abe9890321069a3ef61c1395e3358846ccc9b6c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 2 19:13:38 2014 +0200

    Removed the embedded copy of zlib
---
 debian/copyright                  | 32 --------------------------------
 debian/generate_source_tarball.sh |  3 +++
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 94a488e..6f93ec5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3282,38 +3282,6 @@ info at urwpp.de or design at bigelowandholmes.com
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.5, which may be included
-with JRE 8, JDK 8, and OpenJDK 8.
-
---- begin of LICENSE ---
-
-  version 1.2.5, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup at gzip.org          madler at alumni.caltech.edu
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to the following which may be
 included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
 
diff --git a/debian/generate_source_tarball.sh b/debian/generate_source_tarball.sh
index 1632376..f88c3ba 100755
--- a/debian/generate_source_tarball.sh
+++ b/debian/generate_source_tarball.sh
@@ -65,6 +65,9 @@ rm -vr jdk/src/share/native/sun/awt/libpng/*
 echo "Removing the embedded copy of libgif..."
 rm -vr jdk/src/share/native/sun/awt/giflib/*
 
+echo "Removing the embedded copy of zlib..."
+rm -vrf jdk/src/share/native/java/util/zip/zlib-*
+
 echo "Removing the embedded copy of liblcms2..."
 rm -vr jdk/src/share/native/sun/java2d/cmm/lcms/cms*
 rm -vr jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*

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