[med-svn] [Git][med-team/libcereal][master] 6 commits: routine-update: New upstream version
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Jul 21 05:24:54 BST 2022
Andreas Tille pushed to branch master at Debian Med / libcereal
Commits:
9254d463 by Andreas Tille at 2022-05-03T10:48:42+02:00
routine-update: New upstream version
- - - - -
651f0d70 by Andreas Tille at 2022-05-03T10:48:43+02:00
New upstream version 1.3.2+dfsg
- - - - -
feb3048d by Andreas Tille at 2022-05-03T10:48:46+02:00
Update upstream source from tag 'upstream/1.3.2+dfsg'
Update to upstream version '1.3.2+dfsg'
with Debian dir 07c4b226006e5f4f9b187a3e002369cd369aa910
- - - - -
50246cd4 by Andreas Tille at 2022-05-03T10:52:25+02:00
Refresh patches
- - - - -
357aa5dd by Andreas Tille at 2022-05-03T11:17:01+02:00
Add BUILD_SANDBOX to autopkgtest
- - - - -
8045f0c5 by Andreas Tille at 2022-05-03T11:21:48+02:00
Upload to unstable
- - - - -
8 changed files:
- CMakeLists.txt
- debian/changelog
- − debian/patches/add-only-tests-target
- − debian/patches/reproducible-doxygen
- debian/patches/series
- debian/tests/run-unit-test
- doc/doxygen.in
- include/cereal/version.hpp
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6...3.15)
-project(cereal LANGUAGES CXX VERSION 1.3.1)
+project(cereal LANGUAGES CXX VERSION 1.3.2)
if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(CEREAL_MASTER_PROJECT ON)
@@ -11,7 +11,9 @@ if(APPLE)
option(SKIP_PORTABILITY_TEST "Skip portability (32 bit) tests" ON)
endif()
-option(SKIP_PERFORMANCE_COMPARISON "Skip building performance comparison (requires boost)" OFF)
+option(BUILD_DOC "Build documentation" ON)
+option(BUILD_SANDBOX "Build sandbox examples" ON)
+option(SKIP_PERFORMANCE_COMPARISON "Skip building performance sandbox comparison (requires boost)" OFF)
# TODO: should not be needed! CK
if(NOT CMAKE_VERSION VERSION_LESS 3.0) # installing cereal requires INTERFACE lib
@@ -116,6 +118,12 @@ if(BUILD_TESTS)
add_subdirectory(unittests)
endif()
-add_subdirectory(sandbox)
-add_subdirectory(doc)
+if(BUILD_SANDBOX)
+ add_subdirectory(sandbox)
+endif()
+
+
+if(BUILD_DOC)
+ add_subdirectory(doc)
+endif()
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libcereal (1.3.2+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Add BUILD_SANDBOX to autopkgtest
+
+ -- Andreas Tille <tille at debian.org> Tue, 03 May 2022 11:17:25 +0200
+
libcereal (1.3.1+dfsg-1) unstable; urgency=medium
* New upstream version
=====================================
debian/patches/add-only-tests-target deleted
=====================================
@@ -1,27 +0,0 @@
-From: Michael R. Crusoe <crusoe at debian.org>
-Subject: build just the tests, as an option for Debian autopkgtests later
-Forwarded: https://github.com/USCiLab/cereal/pull/739
-
-With assistance from @kdmurray91; thanks!
-
---- libcereal.orig/CMakeLists.txt
-+++ libcereal/CMakeLists.txt
-@@ -13,6 +13,8 @@
-
- option(SKIP_PERFORMANCE_COMPARISON "Skip building performance comparison (requires boost)" OFF)
-
-+option(ONLY_TESTS "Don't build docs, or sandbox" OFF)
-+
- # TODO: should not be needed! CK
- if(NOT CMAKE_VERSION VERSION_LESS 3.0) # installing cereal requires INTERFACE lib
- option(JUST_INSTALL_CEREAL "Don't do anything besides installing the library" OFF)
-@@ -116,6 +118,8 @@
- add_subdirectory(unittests)
- endif()
-
--add_subdirectory(sandbox)
-+if(NOT ONLY_TEST)
-+ add_subdirectory(sandbox)
-+endif(NOT ONLY_TEST)
-
- add_subdirectory(doc)
=====================================
debian/patches/reproducible-doxygen deleted
=====================================
@@ -1,23 +0,0 @@
-From: Michael R. Crusoe <crusoe at debian.org>
-Subject: Make doxygen docs reproducible
-Forwarded: https://github.com/USCiLab/cereal/pull/740
---- libcereal.orig/doc/doxygen.in
-+++ libcereal/doc/doxygen.in
-@@ -119,7 +119,7 @@
- # path before files name in the file list and in the header files. If set
- # to NO the shortest path that makes the file name unique will be used.
-
--FULL_PATH_NAMES = YES
-+FULL_PATH_NAMES = NO
-
- # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
- # can be used to strip a user-defined part of the path. Stripping is
-@@ -130,7 +130,7 @@
- # relative paths, which will be relative from the directory where doxygen is
- # started.
-
--STRIP_FROM_PATH =
-+STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@
-
- # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
- # the path mentioned in the documentation of a class, which tells
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,2 @@
-reproducible-doxygen
drop-google-analytics
-add-only-tests-target
use_debian_packaged_rapidjson.patch
=====================================
debian/tests/run-unit-test
=====================================
@@ -11,5 +11,5 @@ cd $AUTOPKGTEST_TMP
cp -rs /usr/share/doc/${pkg}/tests/* .
for file in `find . -name "*.gz"`; do gunzip < ${file} > ${file%%.gz}; done
-cmake -DONLY_TEST=on -DSKIP_PORTABILITY_TEST=on .
+cmake -DONLY_TEST=on -DSKIP_PORTABILITY_TEST=on -DBUILD_SANDBOX=True .
make
=====================================
doc/doxygen.in
=====================================
@@ -119,7 +119,7 @@ INLINE_INHERITED_MEMB = NO
# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
-FULL_PATH_NAMES = YES
+FULL_PATH_NAMES = NO
# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
# can be used to strip a user-defined part of the path. Stripping is
@@ -130,7 +130,7 @@ FULL_PATH_NAMES = YES
# relative paths, which will be relative from the directory where doxygen is
# started.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
=====================================
include/cereal/version.hpp
=====================================
@@ -42,7 +42,7 @@
//! The minor version
#define CEREAL_VERSION_MINOR 3
//! The patch version
-#define CEREAL_VERSION_PATCH 0
+#define CEREAL_VERSION_PATCH 2
//! The full version as a single number
#define CEREAL_VERSION (CEREAL_VERSION_MAJOR * 10000 \
View it on GitLab: https://salsa.debian.org/med-team/libcereal/-/compare/7d3220b723ccaf32c92158f960f2fab12cb45555...8045f0c5b851ebc9bf7e96647683fd610ae678b6
--
View it on GitLab: https://salsa.debian.org/med-team/libcereal/-/compare/7d3220b723ccaf32c92158f960f2fab12cb45555...8045f0c5b851ebc9bf7e96647683fd610ae678b6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220721/9f6f4122/attachment-0001.htm>
More information about the debian-med-commit
mailing list