diff -Nru zipios-2.1.7.5~xenial/CMakeLists.txt zipios-2.1.7.6~xenial/CMakeLists.txt --- zipios-2.1.7.5~xenial/CMakeLists.txt 2017-10-22 21:03:51.000000000 +0000 +++ zipios-2.1.7.6~xenial/CMakeLists.txt 2017-10-27 00:55:33.000000000 +0000 @@ -32,7 +32,10 @@ project( zipios_project ) -enable_testing() +option( RUN_TESTS "Enable CTest support and turn on the 'test' make target." OFF ) +if( ${RUN_TESTS} ) + enable_testing() +endif() set( ZIPIOS_VERSION_MAJOR 2 ) set( ZIPIOS_VERSION_MINOR 1 ) diff -Nru zipios-2.1.7.5~xenial/debian/changelog zipios-2.1.7.6~xenial/debian/changelog --- zipios-2.1.7.5~xenial/debian/changelog 2017-10-26 23:20:08.000000000 +0000 +++ zipios-2.1.7.6~xenial/debian/changelog 2017-10-27 00:40:52.000000000 +0000 @@ -1,4 +1,4 @@ -zipios (2.1.7.5~xenial) xenial; urgency=high +zipios (2.1.7.6~xenial) xenial; urgency=high * Fixed packaging to use DEB_HOST_MULTIARCH for library. diff -Nru zipios-2.1.7.5~xenial/debian/control zipios-2.1.7.6~xenial/debian/control --- zipios-2.1.7.5~xenial/debian/control 2017-10-25 03:16:22.000000000 +0000 +++ zipios-2.1.7.6~xenial/debian/control 2017-10-27 00:40:03.000000000 +0000 @@ -4,7 +4,8 @@ Maintainer: Masayuki Hatta (mhatta) Build-Depends: catch, cmake, - debhelper (>> 4.0.0), + debhelper (>> 9), + dh-exec (>=0.3), doxygen, graphicsmagick-imagemagick-compat, graphviz, @@ -13,29 +14,30 @@ zip Standards-Version: 3.9.4 -Package: libzipios-dev -Section: libdevel +Package: libzipios +Section: libs Architecture: any -Depends: libzipios (= ${binary:Version}), libz-dev -Description: a small C++ library for reading zip files (development) +Pre-Depends: multiarch-support, ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a small C++ library for reading zip files (library) Zipios is a java.util.zip-like C++ library for reading and writing Zip files. Access to individual entries is provided through standard C++ iostreams. A simple read-only virtual file system that mounts regular directories and zip files is also provided. . - This package contains files needed for development with Zipios. + This package contains shared library. -Package: libzipios -Section: libs +Package: libzipios-dev +Section: libdevel Architecture: any -Depends: ${shlibs:Depends} -Description: a small C++ library for reading zip files (library) +Depends: libzipios (= ${binary:Version}), libz-dev +Description: a small C++ library for reading zip files (development) Zipios is a java.util.zip-like C++ library for reading and writing Zip files. Access to individual entries is provided through standard C++ iostreams. A simple read-only virtual file system that mounts regular directories and zip files is also provided. . - This package contains shared library. + This package contains files needed for development with Zipios. Package: libzipios-doc Section: doc diff -Nru zipios-2.1.7.5~xenial/debian/libzipios-dev.install zipios-2.1.7.6~xenial/debian/libzipios-dev.install --- zipios-2.1.7.5~xenial/debian/libzipios-dev.install 2017-10-26 23:18:31.000000000 +0000 +++ zipios-2.1.7.6~xenial/debian/libzipios-dev.install 2017-10-27 00:56:32.000000000 +0000 @@ -1,3 +1,4 @@ -debian/tmp/usr/include/* usr/include/ -debian/tmp/usr/${DEB_HOST_MULTIARCH}/*.so usr/lib/${DEB_HOST_MULTIARCH} -debian/tmp/usr/share/cmake/ZipIos/* usr/share/cmake/ZipIos/ +#! /usr/bin/dh-exec +debian/tmp/usr/include/* usr/include/ +debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.so usr/lib/${DEB_HOST_MULTIARCH}/ +debian/tmp/usr/share/cmake/ZipIos/* usr/share/cmake/ZipIos/ diff -Nru zipios-2.1.7.5~xenial/debian/libzipios.install zipios-2.1.7.6~xenial/debian/libzipios.install --- zipios-2.1.7.5~xenial/debian/libzipios.install 2017-10-26 21:01:52.000000000 +0000 +++ zipios-2.1.7.6~xenial/debian/libzipios.install 2017-10-27 00:38:11.000000000 +0000 @@ -1,2 +1,3 @@ +#! /usr/bin/dh-exec debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.so.* usr/lib/${DEB_HOST_MULTIARCH}/ debian/tmp/usr/bin usr/bin/ diff -Nru zipios-2.1.7.5~xenial/.git/COMMIT_EDITMSG zipios-2.1.7.6~xenial/.git/COMMIT_EDITMSG --- zipios-2.1.7.5~xenial/.git/COMMIT_EDITMSG 2017-10-22 21:10:24.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/COMMIT_EDITMSG 2017-10-27 00:57:24.000000000 +0000 @@ -1 +1,10 @@ -Forgot to add the CMakeLists.txt file in cmake! +Tests require a CMake option, and fixed source in -dev install. +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# Your branch is up-to-date with 'origin/master'. +# +# Changes to be committed: +# modified: CMakeLists.txt +# modified: debian/libzipios-dev.install +# Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/index and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/index differ diff -Nru zipios-2.1.7.5~xenial/.git/logs/HEAD zipios-2.1.7.6~xenial/.git/logs/HEAD --- zipios-2.1.7.5~xenial/.git/logs/HEAD 2017-10-26 20:59:16.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/logs/HEAD 2017-10-27 00:57:24.000000000 +0000 @@ -6,3 +6,6 @@ 74f9b1abd7fa4af2716f4c911d6e335247204d8b 9ac74d2439839bd712029f66c8c14dda12d011de R. Douglas Barbieri 1508706531 -0700 commit: Merged changelog from snapcpp, improved cmake module install. 9ac74d2439839bd712029f66c8c14dda12d011de 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 R. Douglas Barbieri 1508706624 -0700 commit: Forgot to add the CMakeLists.txt file in cmake! 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 44ac2d05d608b0a2997d67c6becd1f4d2654122f R. Douglas Barbieri 1509051556 -0700 pull: Fast-forward +44ac2d05d608b0a2997d67c6becd1f4d2654122f 3848262bbe59c30f556db97225bbcb5c8088b58a R. Douglas Barbieri 1509060092 -0700 commit: Added DEB_HOST_MULTIARCH support to debian packaging. +3848262bbe59c30f556db97225bbcb5c8088b58a 11a621516601e274a157e28dadf19e1d73c0e825 R. Douglas Barbieri 1509064854 -0700 commit: Added multi-arch support correctly. +11a621516601e274a157e28dadf19e1d73c0e825 1387ae70cc4876e126b06fb8f97262e5adb4e3ba R. Douglas Barbieri 1509065823 -0700 commit: Tests require a CMake option, and fixed source in -dev install. diff -Nru zipios-2.1.7.5~xenial/.git/logs/refs/heads/master zipios-2.1.7.6~xenial/.git/logs/refs/heads/master --- zipios-2.1.7.5~xenial/.git/logs/refs/heads/master 2017-10-26 20:59:16.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/logs/refs/heads/master 2017-10-27 00:57:24.000000000 +0000 @@ -6,3 +6,6 @@ 74f9b1abd7fa4af2716f4c911d6e335247204d8b 9ac74d2439839bd712029f66c8c14dda12d011de R. Douglas Barbieri 1508706531 -0700 commit: Merged changelog from snapcpp, improved cmake module install. 9ac74d2439839bd712029f66c8c14dda12d011de 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 R. Douglas Barbieri 1508706624 -0700 commit: Forgot to add the CMakeLists.txt file in cmake! 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 44ac2d05d608b0a2997d67c6becd1f4d2654122f R. Douglas Barbieri 1509051556 -0700 pull: Fast-forward +44ac2d05d608b0a2997d67c6becd1f4d2654122f 3848262bbe59c30f556db97225bbcb5c8088b58a R. Douglas Barbieri 1509060092 -0700 commit: Added DEB_HOST_MULTIARCH support to debian packaging. +3848262bbe59c30f556db97225bbcb5c8088b58a 11a621516601e274a157e28dadf19e1d73c0e825 R. Douglas Barbieri 1509064854 -0700 commit: Added multi-arch support correctly. +11a621516601e274a157e28dadf19e1d73c0e825 1387ae70cc4876e126b06fb8f97262e5adb4e3ba R. Douglas Barbieri 1509065823 -0700 commit: Tests require a CMake option, and fixed source in -dev install. diff -Nru zipios-2.1.7.5~xenial/.git/logs/refs/remotes/origin/master zipios-2.1.7.6~xenial/.git/logs/refs/remotes/origin/master --- zipios-2.1.7.5~xenial/.git/logs/refs/remotes/origin/master 2017-10-26 20:59:16.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/logs/refs/remotes/origin/master 2017-10-27 00:57:34.000000000 +0000 @@ -4,3 +4,6 @@ 74f9b1abd7fa4af2716f4c911d6e335247204d8b 9ac74d2439839bd712029f66c8c14dda12d011de R. Douglas Barbieri 1508706558 -0700 update by push 9ac74d2439839bd712029f66c8c14dda12d011de 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 R. Douglas Barbieri 1508706631 -0700 update by push 455f5c46a83eeed03f7f65cc78c3fafaae5dda42 44ac2d05d608b0a2997d67c6becd1f4d2654122f R. Douglas Barbieri 1509051556 -0700 pull: fast-forward +44ac2d05d608b0a2997d67c6becd1f4d2654122f 3848262bbe59c30f556db97225bbcb5c8088b58a R. Douglas Barbieri 1509060117 -0700 update by push +3848262bbe59c30f556db97225bbcb5c8088b58a 11a621516601e274a157e28dadf19e1d73c0e825 R. Douglas Barbieri 1509064871 -0700 update by push +11a621516601e274a157e28dadf19e1d73c0e825 1387ae70cc4876e126b06fb8f97262e5adb4e3ba R. Douglas Barbieri 1509065854 -0700 update by push diff -Nru zipios-2.1.7.5~xenial/.git/objects/0d/49d6c4ce10e2bcc396609b05461aa122bcd522 zipios-2.1.7.6~xenial/.git/objects/0d/49d6c4ce10e2bcc396609b05461aa122bcd522 --- zipios-2.1.7.5~xenial/.git/objects/0d/49d6c4ce10e2bcc396609b05461aa122bcd522 1970-01-01 00:00:00.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/objects/0d/49d6c4ce10e2bcc396609b05461aa122bcd522 2017-10-27 00:40:38.000000000 +0000 @@ -0,0 +1,6 @@ +x+)JMU053g040031QK,L/Je({,z(sO7T +r  +f2S;N2P%ξ٩>%z%% <*K4>s#Qp)0~ LPs_mflI>Tkx0 {FO==Eu:0̊ӽbG9kސy +UЯUv^} ՊL @!9` +_#e?>@h|~^IQf265^ھđOiDEJjRfb_&w2ܒ1MvS0e MuN*SDn1l~2Cw]ϔ+,cx_榦 + kVN~RWejr-P-.Jfpkn霛WccRMMȖagGfd*9F*SpS3;:/]d̂b"\/>K{KƖ;= \ No newline at end of file Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/objects/0d/9f1ea56d7b3915f12f55b63a1fe96565543512 and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/objects/0d/9f1ea56d7b3915f12f55b63a1fe96565543512 differ Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/objects/0e/b5eb90b67ce8039e142514c7c89433835569a7 and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/objects/0e/b5eb90b67ce8039e142514c7c89433835569a7 differ Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/objects/11/a621516601e274a157e28dadf19e1d73c0e825 and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/objects/11/a621516601e274a157e28dadf19e1d73c0e825 differ Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/objects/13/87ae70cc4876e126b06fb8f97262e5adb4e3ba and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/objects/13/87ae70cc4876e126b06fb8f97262e5adb4e3ba differ Binary files /tmp/tmptr0fiK/vEceGxGiab/zipios-2.1.7.5~xenial/.git/objects/17/3fa8dfd75e7ae51fe135a602bdb4ae8365463d and /tmp/tmptr0fiK/iDHmF9RWHb/zipios-2.1.7.6~xenial/.git/objects/17/3fa8dfd75e7ae51fe135a602bdb4ae8365463d differ diff -Nru zipios-2.1.7.5~xenial/.git/objects/38/48262bbe59c30f556db97225bbcb5c8088b58a zipios-2.1.7.6~xenial/.git/objects/38/48262bbe59c30f556db97225bbcb5c8088b58a --- zipios-2.1.7.5~xenial/.git/objects/38/48262bbe59c30f556db97225bbcb5c8088b58a 1970-01-01 00:00:00.000000000 +0000 +++ zipios-2.1.7.6~xenial/.git/objects/38/48262bbe59c30f556db97225bbcb5c8088b58a 2017-10-26 23:21:51.000000000 +0000 @@ -0,0 +1 @@ +xJ0a,'i4 089)YrIjNFPH{:38'C8D