[primesieve] 03/03: Imported Debian patch 6.3+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Nov 24 14:44:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository primesieve.
commit 9d2332b14bfe112e951d75baab908ecc78c0801e
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Nov 24 17:51:56 2017 +0400
Imported Debian patch 6.3+ds-1
---
debian/changelog | 10 ++++++
debian/patches/series | 3 +-
...stream-cmake-install-COMPONENT-libheaders.patch | 30 -----------------
.../patches/upstream-cmake-install-multiarch.patch | 38 ----------------------
.../upstream-fix-cmake_machinery-libatomic.patch | 22 +++++++++++++
debian/rules | 1 -
6 files changed, 33 insertions(+), 71 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 510795b..662105b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+primesieve (6.3+ds-1) unstable; urgency=medium
+
+ * New upstream minor release (Closes: #881453, #881678).
+ * Debianization:
+ - debian/rules, simplify;
+ - debian/patches/*:
+ - d/p/upstream-fix-cmake_machinery-libatomic.patch, introduce.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 24 Nov 2017 13:51:00 +0000
+
primesieve (6.2+ds-1) unstable; urgency=medium
* New upstream major release.
diff --git a/debian/patches/series b/debian/patches/series
index 3e10dc6..1e6e277 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream-cmake-install-COMPONENT-libheaders.patch
-upstream-cmake-install-multiarch.patch
+upstream-fix-cmake_machinery-libatomic.patch
diff --git a/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch b/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch
deleted file mode 100644
index 181221c..0000000
--- a/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: upstream: cmake machinery: libheaders COMPONENT
- Add COMPONENT key to headers installation in order to allow
- architecture independent installation; meant to simplify
- distribution maintenance.
-Origin: vendor, Debian
-Forwarded: https://github.com/kimwalisch/primesieve/pull/43
-Comment: enhancement
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-11-11
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,7 +105,8 @@
- # Install headers ####################################################
-
- install(FILES include/primesieve.h
-- include/primesieve.hpp
-+ include/primesieve.hpp
-+ COMPONENT libprimesieve-headers
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-
- install(FILES include/primesieve/PrimeSieve.hpp
-@@ -114,6 +115,7 @@
- include/primesieve/iterator.hpp
- include/primesieve/primesieve_error.hpp
- include/primesieve/pmath.hpp
-+ COMPONENT libprimesieve-headers
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/primesieve)
-
- # Regenerate man page ################################################
diff --git a/debian/patches/upstream-cmake-install-multiarch.patch b/debian/patches/upstream-cmake-install-multiarch.patch
deleted file mode 100644
index 425f91a..0000000
--- a/debian/patches/upstream-cmake-install-multiarch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: upstream: cmake machinery: library multiarch support
- Attempt to add library multiarch support; meant to simplify
- distribution maintenance.
-Origin: vendor, Debian
-Forwarded: https://github.com/kimwalisch/primesieve/pull/44
-Comment: enhancement
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-11-11
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,7 @@
- endif()
-
- install(TARGETS libprimesieve
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_MULTIARCH})
-
- # static_libprimesieve ###############################################
-
-@@ -90,7 +90,7 @@
- $<INSTALL_INTERFACE:include>)
-
- install(TARGETS static_libprimesieve
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_MULTIARCH})
- endif()
-
- # primesieve binary ##################################################
-@@ -162,7 +162,7 @@
- configure_file(primesieve.pc.in primesieve.pc @ONLY)
-
- install(FILES ${CMAKE_BINARY_DIR}/primesieve.pc
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_MULTIARCH}/pkgconfig)
-
- # Add subdirectories #################################################
-
diff --git a/debian/patches/upstream-fix-cmake_machinery-libatomic.patch b/debian/patches/upstream-fix-cmake_machinery-libatomic.patch
new file mode 100644
index 0000000..3919476
--- /dev/null
+++ b/debian/patches/upstream-fix-cmake_machinery-libatomic.patch
@@ -0,0 +1,22 @@
+Description: fix: cmake machinery: libatomic support
+ Correct the check process for C++ atomic support as suggested by
+ the upstream maintainer [1].
+ [1] https://github.com/kimwalisch/primesieve/issues/45
+Origin: vendor, Debian
+Forwarded: not-needed
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2017-11-24
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,8 +66,9 @@
+
+ check_cxx_source_compiles("
+ #include <atomic>
++ #include <stdint.h>
+ int main() {
+- std::atomic<int> x;
++ std::atomic<int64_t> x;
+ x = 1;
+ x--;
+ return x;
diff --git a/debian/rules b/debian/rules
index 53e78e2..c68fd37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,6 @@ default:
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_MULTIARCH="$(DEB_TARGET_MULTIARCH)" \
-DBUILD_TESTS=ON \
-DBUILD_EXAMPLES=ON \
-DBUILD_DOC=ON
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/primesieve.git
More information about the debian-science-commits
mailing list