<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
On 12/28/2010 03:13 PM, <a class="moz-txt-link-abbreviated" href="mailto:ghedo-guest@users.alioth.debian.org">ghedo-guest@users.alioth.debian.org</a> wrote:<br>
<span style="white-space: pre;">> The following commit has been
merged in the master branch: commit<br>
> dcd13ad891c1299bc49e7718c1f49a6a876391ea Author: Alessandro
Ghedini<br>
> <a class="moz-txt-link-rfc2396E" href="mailto:al3xbio@gmail.com"><al3xbio@gmail.com></a> Date: Tue Dec 28 21:01:11 2010
+0100<br>
> <br>
> Add remove-bundled-zziplib-and-zlib patch<br>
> <br>
> diff --git<br>
> a/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch<br>
> b/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch
new<br>
> file mode 100644 index 0000000..b068ac2 --- /dev/null +++<br>
> b/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch
@@ -0,0<br>
> +1,16755 @@ +From: Alessandro Ghedini
<a class="moz-txt-link-rfc2396E" href="mailto:al3xbio@gmail.com"><al3xbio@gmail.com></a> +Date:<br>
> Tue, 28 Dec 2010 19:08:16 +0100 +Subject: [PATCH] remove
bundled<br>
> zziplib and zlib + +Remove the sources of zziplib and zlib,
and<br>
> update sources to use libzzip +from Debian +--- +<br>
> src/compression/Makefile.am | 6 +- +<br>
> src/compression/Makefile.in | 314 +---- +<br>
> src/compression/ZipExtractor.cpp | 2 +- +<br>
> src/compression/zlib/generic/adler32.cpp | 143 -- +<br>
> src/compression/zlib/generic/compress.cpp | 69 - +<br>
> src/compression/zlib/generic/crc32.cpp | 407 ----- +<br>
> src/compression/zlib/generic/crc32.h | 441 ------ +<br>
> src/compression/zlib/generic/deflate.cpp | 1729<br>
> ---------------------- +
src/compression/zlib/generic/deflate.h<br>
> | 331 ----- + src/compression/zlib/generic/infback.cpp |<br>
> 621 -------- + src/compression/zlib/generic/inffast.cpp |<br>
> 317 ---- + src/compression/zlib/generic/inffast.h | 11<br>
> - + src/compression/zlib/generic/inffixed.h | 94 -- +<br>
> src/compression/zlib/generic/inflate.cpp | 1363<br>
> ----------------- + src/compression/zlib/generic/inflate.h<br>
> | 115 -- + src/compression/zlib/generic/inftrees.cpp | 329<br>
> ---- + src/compression/zlib/generic/inftrees.h | 55 - +<br>
> src/compression/zlib/generic/trees.cpp | 1212<br>
> --------------- + src/compression/zlib/generic/trees.h<br>
> | 128 -- + src/compression/zlib/generic/uncompr.cpp | 61<br>
> - + src/compression/zlib/generic/zconf.h | 332 ----- +<br>
> src/compression/zlib/generic/zlib.h | 1357<br>
> ----------------- + src/compression/zlib/generic/zutil.cpp<br>
> | 317 ---- + src/compression/zlib/generic/zutil.h |<br>
> 269 ---- + src/compression/zziplib/MyIO.h | 4<br>
> +- + src/compression/zziplib/generic/dir.cpp | 296 ---- +<br>
> src/compression/zziplib/generic/err.cpp | 156 -- +<br>
> src/compression/zziplib/generic/fetch.cpp | 117 -- +<br>
> src/compression/zziplib/generic/file.cpp | 1029<br>
> ------------- + src/compression/zziplib/generic/fseeko.cpp
|<br>
> 584 -------- + src/compression/zziplib/generic/info.cpp |<br>
> 161 -- + src/compression/zziplib/generic/plugin.cpp | 86<br>
> -- + src/compression/zziplib/generic/stat.cpp | 119 -- +<br>
> src/compression/zziplib/generic/zip.cpp | 759 ---------- <br>
> + src/compression/zziplib/generic/zzip.h | 323 ---- +<br>
> src/compression/zziplib/generic/zzip___debug.h | 89 -- +<br>
> src/compression/zziplib/generic/zzip___dirent.h | 393 -----
+<br>
> src/compression/zziplib/generic/zzip___fnmatch.h | 28 - +<br>
> src/compression/zziplib/generic/zzip___hints.h | 189 --- +<br>
> src/compression/zziplib/generic/zzip___mmap.h | 107 -- +<br>
> src/compression/zziplib/generic/zzip__config.h | 238 --- +<br>
> src/compression/zziplib/generic/zzip__msvc.h | 211 --- +<br>
> src/compression/zziplib/generic/zzip_autoconf.h | 45 - +<br>
> src/compression/zziplib/generic/zzip_conf.h | 276 ---- +<br>
> src/compression/zziplib/generic/zzip_fetch.h | 325 ---- +<br>
> src/compression/zziplib/generic/zzip_file.h | 81 - +<br>
> src/compression/zziplib/generic/zzip_format.h | 233 --- +<br>
> src/compression/zziplib/generic/zzip_fseeko.h | 116 -- +<br>
> src/compression/zziplib/generic/zzip_info.h | 25 - +<br>
> src/compression/zziplib/generic/zzip_lib.h | 83 - +<br>
> src/compression/zziplib/generic/zzip_plugin.h | 96 -- +<br>
> src/compression/zziplib/generic/zzip_stdint.h | 45 - +<br>
> src/compression/zziplib/generic/zzip_types.h | 51 -<br>
> </span><br>
<br>
Would it be better to remove these files in the get-orig-source
rule?<br>
It's already modifying the tarball for DFSG compliance.<br>
<br>
Micah<br>
<br>
</body>
</html>