diff -Nru zipios-2.3.2.0~jammy/CMakeLists.txt zipios-2.3.3.0~jammy/CMakeLists.txt --- zipios-2.3.2.0~jammy/CMakeLists.txt 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/CMakeLists.txt 2023-08-09 04:11:58.000000000 +0000 @@ -28,7 +28,7 @@ # See `dev/version` set( ZIPIOS_VERSION_MAJOR 2 ) set( ZIPIOS_VERSION_MINOR 3 ) -set( ZIPIOS_VERSION_PATCH 2 ) +set( ZIPIOS_VERSION_PATCH 3 ) set( ZIPIOS_VERSION_BUILD 0 ) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) @@ -112,10 +112,10 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zipios/zipios-config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/zipios/zipios-config.hpp ) -# Generate the RPM package specification file +# Generate the RPM package specification and metainfo files set(PACKAGE "libzipios") -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zipios.spec.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/zipios.spec ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zipios.metainfo.xml.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/zipios.metainfo.xml ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contrib/zipios.spec.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/zipios.spec) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contrib/zipios.metainfo.xml.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/zipios.metainfo.xml) include_directories( ${CMAKE_SOURCE_DIR} diff -Nru zipios-2.3.2.0~jammy/debian/changelog zipios-2.3.3.0~jammy/debian/changelog --- zipios-2.3.2.0~jammy/debian/changelog 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/debian/changelog 2023-08-09 04:11:58.000000000 +0000 @@ -1,3 +1,9 @@ +zipios (2.3.3.0~jammy) jammy; urgency=high + + * Bump version since 2.3.2 is an official release. + + -- Alexis Wilke Tue, 08 Aug 2023 21:11:58 -0700 + zipios (2.3.2.0~jammy) jammy; urgency=high * Added support for an std::istream when creating a ZipFile object. diff -Nru zipios-2.3.2.0~jammy/debian/compat zipios-2.3.3.0~jammy/debian/compat --- zipios-2.3.2.0~jammy/debian/compat 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/debian/compat 2023-08-09 04:11:58.000000000 +0000 @@ -1 +1 @@ -10 +15 diff -Nru zipios-2.3.2.0~jammy/debian/control zipios-2.3.3.0~jammy/debian/control --- zipios-2.3.2.0~jammy/debian/control 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/debian/control 2023-08-09 04:11:58.000000000 +0000 @@ -2,8 +2,7 @@ Section: libs Priority: optional Maintainer: Masayuki Hatta (mhatta) -Build-Depends: catch, - cmake, +Build-Depends: cmake, debhelper (>> 9), dh-exec (>=0.3), doxygen, @@ -18,7 +17,6 @@ Package: libzipios Section: libs Architecture: any -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 diff -Nru zipios-2.3.2.0~jammy/debian/libzipios.install zipios-2.3.3.0~jammy/debian/libzipios.install --- zipios-2.3.2.0~jammy/debian/libzipios.install 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/debian/libzipios.install 2023-08-09 04:11:58.000000000 +0000 @@ -1,3 +1,4 @@ #! /usr/bin/dh-exec debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.so.* usr/lib/${DEB_HOST_MULTIARCH}/ debian/tmp/usr/bin usr/bin/ +debian/tmp/usr/share/metainfo usr/share/metainfo/ diff -Nru zipios-2.3.2.0~jammy/README.md zipios-2.3.3.0~jammy/README.md --- zipios-2.3.2.0~jammy/README.md 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/README.md 2023-07-06 22:39:34.000000000 +0000 @@ -70,7 +70,7 @@ # Installation This version of the software uses `cmake` to generate the necessary make -files or solutions and projects under MS-Windows. +files or solutions and projects under your operating system. The following options are supported: @@ -145,6 +145,10 @@ ## Windows +_**Note:** at the moment we do not support the MS-Windows version. +If you have a working version, we can try to incorporate your changes +as long as they follow our coding style closely enough._ + CMake comes with a graphical tool one can use under MS-Windows to configure and generate a project supporting cmake. You will find more information about cmake on their official website Binary files /tmp/tmplcl3h86m/dJWzQ77e01/zipios-2.3.2.0~jammy/.README.md.swp and /tmp/tmplcl3h86m/dPTan40CSj/zipios-2.3.3.0~jammy/.README.md.swp differ diff -Nru zipios-2.3.2.0~jammy/seed.txt zipios-2.3.3.0~jammy/seed.txt --- zipios-2.3.2.0~jammy/seed.txt 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/seed.txt 2023-08-09 04:11:58.000000000 +0000 @@ -1 +1 @@ -1664768679 +1698965543 diff -Nru zipios-2.3.2.0~jammy/src/directorycollection.cpp zipios-2.3.3.0~jammy/src/directorycollection.cpp --- zipios-2.3.2.0~jammy/src/directorycollection.cpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/src/directorycollection.cpp 2023-07-06 22:15:56.000000000 +0000 @@ -287,14 +287,14 @@ * (require utf8 -> wchar_t, then use _wfindfirsti64().) * We'll have to update the next() function too, of course. */ - m_handle = _findfirsti64(path.getName().c_str(), &m_findinfo); + m_handle = _findfirsti64(static_cast(path).c_str(), &m_fileinfo); if(m_handle == 0) { if(errno == ENOENT) { // this can happen, the directory is empty and thus has // absolutely no information - f_read_first = true; + m_read_first = true; } else { @@ -338,7 +338,7 @@ private: long m_handle = 0; - struct _finddata_t m_fileinfo = {}; + struct _finddatai64_t m_fileinfo = {}; bool m_read_first = 0; }; #else diff -Nru zipios-2.3.2.0~jammy/src/dosdatetime.cpp zipios-2.3.3.0~jammy/src/dosdatetime.cpp --- zipios-2.3.2.0~jammy/src/dosdatetime.cpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/src/dosdatetime.cpp 2023-07-06 22:19:42.000000000 +0000 @@ -552,7 +552,11 @@ unix_timestamp &= ~1; struct tm t; +#ifdef ZIPIOS_WINDOWS + localtime_s(&t, &unix_timestamp); +#else localtime_r(&unix_timestamp, &t); +#endif //std::cerr << "test with: " << unix_timestamp << " -- " << t.tm_year // << " (" << (t.tm_year < 1980 - 1900 ? 1 : 0) diff -Nru zipios-2.3.2.0~jammy/src/zipinputstreambuf.cpp zipios-2.3.3.0~jammy/src/zipinputstreambuf.cpp --- zipios-2.3.2.0~jammy/src/zipinputstreambuf.cpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/src/zipinputstreambuf.cpp 2023-07-06 22:22:20.000000000 +0000 @@ -29,6 +29,8 @@ #include "zipios/zipiosexceptions.hpp" +#include + namespace zipios { diff -Nru zipios-2.3.2.0~jammy/src/zipios_common.hpp zipios-2.3.3.0~jammy/src/zipios_common.hpp --- zipios-2.3.2.0~jammy/src/zipios_common.hpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/src/zipios_common.hpp 2023-08-09 04:11:58.000000000 +0000 @@ -34,7 +34,7 @@ #include #include -#include +#include #if defined( ZIPIOS_WINDOWS ) typedef int32_t ssize_t; diff -Nru zipios-2.3.2.0~jammy/tools/appendzip.cpp zipios-2.3.3.0~jammy/tools/appendzip.cpp --- zipios-2.3.2.0~jammy/tools/appendzip.cpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/tools/appendzip.cpp 2023-08-09 04:11:58.000000000 +0000 @@ -32,7 +32,7 @@ #include #include #include -#include +#include // static variables diff -Nru zipios-2.3.2.0~jammy/tools/zipdir.cpp zipios-2.3.3.0~jammy/tools/zipdir.cpp --- zipios-2.3.2.0~jammy/tools/zipdir.cpp 2022-09-28 22:35:45.000000000 +0000 +++ zipios-2.3.3.0~jammy/tools/zipdir.cpp 2023-08-09 04:11:58.000000000 +0000 @@ -31,11 +31,9 @@ #include #include -//#include #include #include #include -//#include // static variables Binary files /tmp/tmplcl3h86m/dJWzQ77e01/zipios-2.3.2.0~jammy/tools/.zipdir.cpp.swp and /tmp/tmplcl3h86m/dPTan40CSj/zipios-2.3.3.0~jammy/tools/.zipdir.cpp.swp differ