On 12/28/2010 03:13 PM, ghedo-gu...@users.alioth.debian.org wrote:
> The following commit has been merged in the master branch: commit
> dcd13ad891c1299bc49e7718c1f49a6a876391ea Author: Alessandro Ghedini
> Date: Tue Dec 28 21:01:11 2010 +0100
>
> Add remove-bundled-zziplib-and-zlib patch
>
> diff --git
> a/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch
> b/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch new
> file mode 100644 index 000..b068ac2 --- /dev/null +++
> b/debian/patches/0002-remove-bundled-zziplib-and-zlib.patch @@ -0,0
> +1,16755 @@ +From: Alessandro Ghedini +Date:
> Tue, 28 Dec 2010 19:08:16 +0100 +Subject: [PATCH] remove bundled
> zziplib and zlib + +Remove the sources of zziplib and zlib, and
> update sources to use libzzip +from Debian +--- +
> src/compression/Makefile.am | 6 +- +
> src/compression/Makefile.in | 314 + +
> src/compression/ZipExtractor.cpp | 2 +- +
> src/compression/zlib/generic/adler32.cpp | 143 -- +
> src/compression/zlib/generic/compress.cpp | 69 - +
> src/compression/zlib/generic/crc32.cpp | 407 - +
> src/compression/zlib/generic/crc32.h | 441 -- +
> src/compression/zlib/generic/deflate.cpp | 1729
> -- + src/compression/zlib/generic/deflate.h
> | 331 - + src/compression/zlib/generic/infback.cpp |
> 621 + src/compression/zlib/generic/inffast.cpp |
> 317 + src/compression/zlib/generic/inffast.h | 11
> - + src/compression/zlib/generic/inffixed.h | 94 -- +
> src/compression/zlib/generic/inflate.cpp | 1363
> - + src/compression/zlib/generic/inflate.h
> | 115 -- + src/compression/zlib/generic/inftrees.cpp | 329
> + src/compression/zlib/generic/inftrees.h | 55 - +
> src/compression/zlib/generic/trees.cpp | 1212
> --- + src/compression/zlib/generic/trees.h
> | 128 -- + src/compression/zlib/generic/uncompr.cpp | 61
> - + src/compression/zlib/generic/zconf.h | 332 - +
> src/compression/zlib/generic/zlib.h | 1357
> - + src/compression/zlib/generic/zutil.cpp
> | 317 + src/compression/zlib/generic/zutil.h |
> 269 + src/compression/zziplib/MyIO.h | 4
> +- + src/compression/zziplib/generic/dir.cpp | 296 +
> src/compression/zziplib/generic/err.cpp | 156 -- +
> src/compression/zziplib/generic/fetch.cpp | 117 -- +
> src/compression/zziplib/generic/file.cpp | 1029
> - + src/compression/zziplib/generic/fseeko.cpp |
> 584 + src/compression/zziplib/generic/info.cpp |
> 161 -- + src/compression/zziplib/generic/plugin.cpp | 86
> -- + src/compression/zziplib/generic/stat.cpp | 119 -- +
> src/compression/zziplib/generic/zip.cpp | 759 --
> + src/compression/zziplib/generic/zzip.h | 323 +
> src/compression/zziplib/generic/zzip___debug.h | 89 -- +
> src/compression/zziplib/generic/zzip___dirent.h | 393 - +
> src/compression/zziplib/generic/zzip___fnmatch.h | 28 - +
> src/compression/zziplib/generic/zzip___hints.h | 189 --- +
> src/compression/zziplib/generic/zzip___mmap.h | 107 -- +
> src/compression/zziplib/generic/zzip__config.h | 238 --- +
> src/compression/zziplib/generic/zzip__msvc.h | 211 --- +
> src/compression/zziplib/generic/zzip_autoconf.h | 45 - +
> src/compression/zziplib/generic/zzip_conf.h | 276 +
> src/compression/zziplib/generic/zzip_fetch.h | 325 +
> src/compression/zziplib/generic/zzip_file.h | 81 - +
> src/compression/zziplib/generic/zzip_format.h | 233 --- +
> src/compression/zziplib/generic/zzip_fseeko.h | 116 -- +
> src/compression/zziplib/generic/zzip_info.h | 25 - +
> src/compression/zziplib/generic/zzip_lib.h | 83 - +
> src/compression/zziplib/generic/zzip_plugin.h | 96 -- +
> src/compression/zziplib/generic/zzip_stdint.h | 45 - +
> src/compression/zziplib/generic/zzip_types.h | 51 -
>
Would it be better to remove these files in the get-orig-source rule?
It's already modifying the tarball for DFSG compliance.
Micah
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
