[med-svn] [libcereal] 02/02: new upstream release, freshen patch, drop incorporated patch

Michael Crusoe misterc-guest at moszumanska.debian.org
Sun Aug 14 09:13:09 UTC 2016


This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to tag debian/1.2.1-1
in repository libcereal.

commit 8e48dccc4eddfb8350953d6660f4db0a186d9076
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sun Aug 14 01:53:31 2016 -0700

    new upstream release, freshen patch, drop incorporated patch
---
 debian/changelog                     |  7 ++++++
 debian/control                       |  4 +--
 debian/patches/add-only-tests-target | 25 ++++++++++--------
 debian/patches/more_compat           | 49 ------------------------------------
 debian/patches/series                |  1 -
 5 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00e9112..cd57d25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcereal (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release with support for g++ 6 (Closes: #834187)
+  * Drop arm compatibility patch as it was incorporated upstream
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sun, 14 Aug 2016 02:11:45 -0700
+
 libcereal (1.1.2-4) unstable; urgency=medium
 
   * Drop multilib builddeb (Closes: #814530) 
diff --git a/debian/control b/debian/control
index 0f24fd9..58c74ed 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: libcereal
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Michael R. Crusoe <crusoe at ucdavis.edu>
+Uploaders: Michael R. Crusoe <michael.crusoe at gmail.com>
 Section: libdevel
 Priority: optional
 Build-Depends: debhelper (>= 9),
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
                libboost-test-dev,
                cmake,
                doxygen
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libcereal.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libcereal.git
 Homepage: http://uscilab.github.io/cereal/
diff --git a/debian/patches/add-only-tests-target b/debian/patches/add-only-tests-target
index 8c0a0c8..4236945 100644
--- a/debian/patches/add-only-tests-target
+++ b/debian/patches/add-only-tests-target
@@ -3,31 +3,36 @@ Description: build just the tests, as an option for autopkgtest later
 With assistance from Kevin D. Murray; thanks!
 --- libcereal.orig/CMakeLists.txt
 +++ libcereal/CMakeLists.txt
-@@ -3,21 +3,26 @@
+@@ -14,6 +14,8 @@
+     set(CEREAL_THREAD_LIBS "")
+ endif()
  
- option(SKIP_PORTABILITY_TEST "Skip portability tests" OFF)
- 
--set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Werror -g -Wextra -Wshadow -pedantic ${CMAKE_CXX_FLAGS}")
 +option(ONLY_TESTS "Don't build docs, or sandbox" OFF)
++
+ if(NOT MSVC)
+     set(CMAKE_CXX_FLAGS "-Wall -Werror -g -Wextra -Wshadow -pedantic ${CMAKE_CXX_FLAGS}")
+     if(CMAKE_VERSION VERSION_LESS 3.1)
+@@ -43,19 +45,22 @@
+     return()
+ endif()
  
 -include_directories(./include)
-+set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Werror -g -Wextra -Wshadow -pedantic ${CMAKE_CXX_FLAGS}")
- 
+-
  find_package(Boost COMPONENTS serialization unit_test_framework)
  
  if(Boost_FOUND)
-   include_directories(${Boost_INCLUDE_DIRS})
+   include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
    enable_testing()
 +  if(NOT ONLY_TEST)
-+    include_directories(./include)
++  	include_directories(./include)
 +  endif(NOT ONLY_TEST)
    add_subdirectory(unittests)
  endif(Boost_FOUND)
  
 -add_subdirectory(sandbox)
 +if(NOT ONLY_TEST)
-+ add_subdirectory(sandbox)
-+ find_package(Doxygen)
++  add_subdirectory(sandbox)
++  find_package(Doxygen)
 +endif(NOT ONLY_TEST)
  
 -find_package(Doxygen)
diff --git a/debian/patches/more_compat b/debian/patches/more_compat
deleted file mode 100644
index 398e3ff..0000000
--- a/debian/patches/more_compat
+++ /dev/null
@@ -1,49 +0,0 @@
-From fc17bd94e6022db986cb325c03407fc4bdf1280d Mon Sep 17 00:00:00 2001
-Author: Kalle Huttunen <kalle.huttunen at ge.com>
-Date: Fri, 22 Jan 2016 10:00:59 +0200
-Description: Fix test compilation on ARM based platform
-Origin: https://github.com/USCiLab/cereal/pull/257
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- libcereal.orig/CMakeLists.txt
-+++ libcereal/CMakeLists.txt
-@@ -10,7 +10,7 @@
- find_package(Boost COMPONENTS serialization unit_test_framework)
- 
- if(Boost_FOUND)
--  include_directories(${Boost_INCLUDE_DIRS})
-+  include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-   enable_testing()
-   if(NOT ONLY_TEST)
-     include_directories(./include)
---- libcereal.orig/include/cereal/archives/xml.hpp
-+++ libcereal/include/cereal/archives/xml.hpp
-@@ -525,6 +525,7 @@
-       //! Loads a type best represented as an unsigned long from the current top node
-       template <class T, traits::EnableIf<std::is_unsigned<T>::value,
-                                           !std::is_same<T, bool>::value,
-+                                          !std::is_same<T, char>::value,
-                                           !std::is_same<T, unsigned char>::value,
-                                           sizeof(T) < sizeof(long long)> = traits::sfinae> inline
-       void loadValue( T & value )
---- libcereal.orig/include/cereal/archives/json.hpp
-+++ libcereal/include/cereal/archives/json.hpp
-@@ -641,14 +641,14 @@
-       //! Serialize a long if it would not be caught otherwise
-       template <class T> inline
-       typename std::enable_if<std::is_same<T, long>::value &&
--                              !std::is_same<T, std::int32_t>::value &&
-+                              sizeof(T) >= sizeof(std::int64_t) &&
-                               !std::is_same<T, std::int64_t>::value, void>::type
-       loadValue( T & t ){ loadLong(t); }
- 
-       //! Serialize an unsigned long if it would not be caught otherwise
-       template <class T> inline
-       typename std::enable_if<std::is_same<T, unsigned long>::value &&
--                              !std::is_same<T, std::uint32_t>::value &&
-+                              sizeof(T) >= sizeof(std::uint64_t) &&
-                               !std::is_same<T, std::uint64_t>::value, void>::type
-       loadValue( T & t ){ loadLong(t); }
-       #endif // _MSC_VER
diff --git a/debian/patches/series b/debian/patches/series
index 3d0d8c4..a51e923 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 drop-google-analytics
 add-only-tests-target
-more_compat

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libcereal.git



More information about the debian-med-commit mailing list