Copying message to the main bug report. On Sun, May 11, 2014 at 7:47 PM, Mark Brown wrote: >> Merged 574798 709803 > > Please always CC a plain text version of the explanation for why bug > manipulation is happening to the relevant package manintainer especially > if it involves a reassignment. minizip has been in Debian for some > considerable time as zlib-bin. The bug it's merged with is for making > it a zip alternative which is something different and would rely on a > compatible command line interface (something that it doesn't have right > now).
I was in the process of putting together a patch addressing both of these requests, and hadn't yet finished this mail, which has the desired context. I'm attaching a proposed patch that adds support for building the requested minizip packages. Best wishes, Mike
diff -Nru zlib-1.2.8.dfsg/debian/changelog zlib-1.2.8.dfsg/debian/changelog --- zlib-1.2.8.dfsg/debian/changelog 2013-05-03 16:00:51.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/changelog 2014-05-12 00:00:10.000000000 +0000 @@ -1,3 +1,10 @@ +zlib (1:1.2.8.dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build minizip packages (closes: #574798). + + -- Michael Gilbert <mgilb...@debian.org> Sun, 11 May 2014 22:27:45 +0000 + zlib (1:1.2.8.dfsg-1) unstable; urgency=low * New upstream release. diff -Nru zlib-1.2.8.dfsg/debian/control zlib-1.2.8.dfsg/debian/control --- zlib-1.2.8.dfsg/debian/control 2013-05-03 15:32:22.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/control 2014-05-12 00:23:44.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Mark Brown <broo...@debian.org> Standards-Version: 3.9.4 Homepage: http://zlib.net/ -Build-Depends: debhelper (>= 8.1.3~), binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x], dpkg-dev (>= 1.16.1) +Build-Depends: debhelper (>= 8.1.3~), autoconf, binutils (>= 2.18.1~cvs20080103-2) [mips mipsel], gcc-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc s390x], dpkg-dev (>= 1.16.1) Package: zlib1g Architecture: any @@ -43,13 +43,13 @@ when debugging applications which use zlib. Package: zlib-bin -Section: utils +Section: oldlibs +Priority: extra Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: compression library - sample programs - Some generally useful sample programs from the contrib directory. - Includes a "mini" implementation of `zip' and `unzip' called - `minizip' and `miniunzip' respectively. +Depends: minizip +Description: compression library - transitional package + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This is a transitional package to minizip. Package: zlib1g-udeb XC-Package-Type: udeb @@ -120,3 +120,33 @@ zlib is a library implementing the deflate compression method found in gzip and PKZIP. This package includes the development support files for building n32 applications. + +Package: minizip +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: zlib-bin (<< 1:1.2.8.dfsg-1.1) +Conflicts: zlib-bin (<< 1:1.2.8.dfsg-1.1) +Description: compression library - minizip tools + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes a "mini" implementation + of `zip' and `unzip' called `minizip' and `miniunzip' respectively. + +Package: libminizip1 +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: compression library - minizip library + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the minizip library. + +Package: libminizip-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: ${misc:Depends}, libminizip1 (= ${binary:Version}) +Description: compression library - minizip development files + zlib is a library implementing the deflate compression method found + in gzip and PKZIP. This package includes the development support + files for the minizip library. diff -Nru zlib-1.2.8.dfsg/debian/libminizip1.install zlib-1.2.8.dfsg/debian/libminizip1.install --- zlib-1.2.8.dfsg/debian/libminizip1.install 1970-01-01 00:00:00.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/libminizip1.install 2014-05-11 23:17:39.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libminizip.so.* diff -Nru zlib-1.2.8.dfsg/debian/libminizip-dev.install zlib-1.2.8.dfsg/debian/libminizip-dev.install --- zlib-1.2.8.dfsg/debian/libminizip-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/libminizip-dev.install 2014-05-11 23:30:44.000000000 +0000 @@ -0,0 +1,4 @@ +usr/lib/*/libminizip.a +usr/lib/*/libminizip.so +usr/lib/*/pkgconfig/minizip.pc +usr/include/minizip diff -Nru zlib-1.2.8.dfsg/debian/minizip.install zlib-1.2.8.dfsg/debian/minizip.install --- zlib-1.2.8.dfsg/debian/minizip.install 1970-01-01 00:00:00.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/minizip.install 2013-05-03 15:30:15.000000000 +0000 @@ -0,0 +1,2 @@ +usr/bin/minizip +usr/bin/miniunzip diff -Nru zlib-1.2.8.dfsg/debian/minizip.manpages zlib-1.2.8.dfsg/debian/minizip.manpages --- zlib-1.2.8.dfsg/debian/minizip.manpages 1970-01-01 00:00:00.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/minizip.manpages 2013-05-03 15:30:15.000000000 +0000 @@ -0,0 +1,2 @@ +debian/minizip.1 +debian/miniunzip.1 diff -Nru zlib-1.2.8.dfsg/debian/rules zlib-1.2.8.dfsg/debian/rules --- zlib-1.2.8.dfsg/debian/rules 2013-05-03 16:00:06.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/rules 2014-05-12 00:12:19.000000000 +0000 @@ -83,6 +83,8 @@ AR=$(AR) CC="$(DEB_HOST_GNU_TYPE)-gcc" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" uname=GNU ./configure --shared --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + cd contrib/minizip && autoreconf -fis && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" uname=GNU ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + touch $@ configure64-stamp: configure @@ -120,7 +122,7 @@ dh_testdir $(MAKE) - $(MAKE) CC=$(DEB_HOST_GNU_TYPE)-gcc CFLAGS="-I../.. $(CFLAGS)" LDFLAGS="$(LDFLAGS)" -C contrib/minizip + $(MAKE) CC=$(DEB_HOST_GNU_TYPE)-gcc CFLAGS="-I../.. $(CFLAGS)" LDFLAGS="$(LDFLAGS)" -C contrib/minizip minizip miniunzip -$(MAKE) test touch $@ @@ -144,7 +146,9 @@ dh_testdir dh_testroot - $(MAKE) -C contrib/minizip clean + test ! -f contrib/minizip/Makefile || $(MAKE) -C contrib/minizip distclean + cd contrib/minizip && rm -f compile config.* configure depcomp install-sh libtool Makefile.in aclocal.m4 ltmain.sh missing minizip.pc minizip miniunzip + $(MAKE) distclean rm -f build-stamp configure-stamp foo.gz @@ -163,6 +167,7 @@ dh_installdirs $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install + $(MAKE) -C contrib/minizip prefix=$(CURDIR)/debian/tmp/usr install install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include/$(DEB_HOST_MULTIARCH) mv debian/tmp/usr/include/zconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/ @@ -190,8 +195,8 @@ dh_installdocs -s dh_installexamples -s mkdir -p debian/tmp/usr/bin - cp contrib/minizip/minizip debian/tmp/usr/bin - cp contrib/minizip/miniunz debian/tmp/usr/bin/miniunzip + cp contrib/minizip/.libs/minizip debian/tmp/usr/bin + cp contrib/minizip/.libs/miniunzip debian/tmp/usr/bin dh_install -s --sourcedir=debian/tmp dh_installman -s dh_lintian -s @@ -199,6 +204,7 @@ dh_strip -s --dbg-package=zlib1g-dbg dh_compress -s dh_fixperms -s + dh_makeshlibs -plibminizip1 -V"libminizip1 (>= 1:1.2.8.dfsg-1.1)" dh_makeshlibs -pzlib1g -V"zlib1g (>= 1:1.2.3.3.dfsg-1)" --add-udeb=zlib1g-udeb ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS))) dh_makeshlibs -plib32z1 -V"lib32z1 (>= 1:1.2.3.3.dfsg-1)" diff -Nru zlib-1.2.8.dfsg/debian/zlib1g.install zlib-1.2.8.dfsg/debian/zlib1g.install --- zlib-1.2.8.dfsg/debian/zlib1g.install 2013-05-03 15:30:15.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/zlib1g.install 2014-05-11 23:17:11.000000000 +0000 @@ -1 +1 @@ -lib/*/lib*.so.* +lib/*/libz.so.* diff -Nru zlib-1.2.8.dfsg/debian/zlib-bin.install zlib-1.2.8.dfsg/debian/zlib-bin.install --- zlib-1.2.8.dfsg/debian/zlib-bin.install 2013-05-03 15:30:15.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/zlib-bin.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/minizip -usr/bin/miniunzip diff -Nru zlib-1.2.8.dfsg/debian/zlib-bin.manpages zlib-1.2.8.dfsg/debian/zlib-bin.manpages --- zlib-1.2.8.dfsg/debian/zlib-bin.manpages 2013-05-03 15:30:15.000000000 +0000 +++ zlib-1.2.8.dfsg/debian/zlib-bin.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/minizip.1 -debian/miniunzip.1
