[primesieve] 04/04: Imported Debian patch 6.2+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Nov 11 06:12:50 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 f6a19a52d86ba05e20fb58c5dfdde531f7409b82
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Nov 11 09:55:28 2017 +0400
Imported Debian patch 6.2+ds-1
---
debian/adhoc/examples/c/Makefile | 2 +-
debian/adhoc/examples/cpp/Makefile | 2 +-
debian/changelog | 23 ++++-
debian/clean | 2 +-
debian/compat | 2 +-
debian/control | 22 +++--
debian/copyright | 2 +-
...v-common.docs => libprimesieve-dev-common.docs} | 0
...on.install => libprimesieve-dev-common.install} | 0
...ieve7-dev.install => libprimesieve-dev.install} | 0
.../{libprimesieve7.docs => libprimesieve8.docs} | 0
...bprimesieve7.install => libprimesieve8.install} | 0
...-overrides => libprimesieve8.lintian-overrides} | 0
...zation-neutralize-resource_demanding_test.patch | 19 ----
debian/patches/debianization.patch | 32 -------
debian/patches/series | 5 +-
.../upstream-autotoolization-manpages.patch | 104 ---------------------
...stream-cmake-install-COMPONENT-libheaders.patch | 30 ++++++
.../patches/upstream-cmake-install-multiarch.patch | 38 ++++++++
debian/rules | 23 +++--
debian/tests/make-check | 2 +-
21 files changed, 123 insertions(+), 185 deletions(-)
diff --git a/debian/adhoc/examples/c/Makefile b/debian/adhoc/examples/c/Makefile
index b7ffd50..67b24c0 100644
--- a/debian/adhoc/examples/c/Makefile
+++ b/debian/adhoc/examples/c/Makefile
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Science Team
-# copyright: 2015-2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2015-2017 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 3 or later
#
diff --git a/debian/adhoc/examples/cpp/Makefile b/debian/adhoc/examples/cpp/Makefile
index 6eb5d22..01ca6e6 100644
--- a/debian/adhoc/examples/cpp/Makefile
+++ b/debian/adhoc/examples/cpp/Makefile
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Science Team
-# copyright: 2015-2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2015-2017 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 3 or later
#
diff --git a/debian/changelog b/debian/changelog
index a02670f..510795b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,27 @@
-primesieve (6.2+ds-0) UNRELEASED; urgency=medium
+primesieve (6.2+ds-1) unstable; urgency=medium
* New upstream major release.
* Debianization:
+ - debian/watch, correct;
- debian/copyright, update;
- - debian/rules, refresh;
- - debian/watch, correct.
+ - debian/control:
+ - debhelper, bump to 10;
+ - Standards Version, bump to 4.1.1 (no change);
+ - upgrade SO version to version 8;
+ - debian/rules:
+ - migrate from autotools to cmake machinery (see below);
+ - debhelper, bump to 10;
+ - refresh;
+ - debian/patches/*:
+ - d/p/upstream-autotoolization-manpages.patch, discard;
+ - d/p/debianization*.patch, discard;
+ - d/p/upstream-cmake-install-*.patch, introduce and submit;
+ - debian/libprimesieve7.*, bump to version 8;
+ - debian/libprimesieve7-dev*.*, bump to versionless;
+ - migration from autotools to cmake machinery;
+ - refresh.
- -- Jerome Benoit <calculus at rezozer.net> Fri, 10 Nov 2017 12:43:31 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 11 Nov 2017 05:56:10 +0000
primesieve (5.7.2+ds-2) unstable; urgency=medium
diff --git a/debian/clean b/debian/clean
index 50da101..2001b7c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,3 @@
README.implementation
-primesieve.1
+doc/primesieve.1
doc/Doxyfile
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index f196abf..19d5cc2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,13 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Section: math
Priority: optional
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libtool, help2man
+Build-Depends:
+ debhelper (>= 10),
+ cmake, help2man
Build-Depends-Indep:
doxygen, doxygen-latex, graphviz,
rdfind, symlinks
-Standards-Version: 3.9.8
+Standards-Version: 4.1.1
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/primesieve.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/primesieve.git
Homepage: http://primesieve.org/
@@ -24,7 +26,7 @@ Description: fast prime number generator C/C++ library
.
This dummy package provides the standard installation.
-Package: libprimesieve7
+Package: libprimesieve8
Architecture: any
Multi-Arch: same
Section: libs
@@ -42,12 +44,12 @@ Description: fast prime number generator C/C++ library -- lib
.
This package provides the shared library.
-Package: libprimesieve7-dev
+Package: libprimesieve-dev
Architecture: any
Multi-Arch: same
Section: libdevel
Depends:
- libprimesieve7 (= ${binary:Version}), libprimesieve7-dev-common (= ${source:Version}),
+ libprimesieve8 (= ${binary:Version}), libprimesieve-dev-common (= ${source:Version}),
${misc:Depends}
Suggests: primesieve-doc (= ${source:Version}), pkg-config
Conflicts: libprimesieve-dev
@@ -62,14 +64,14 @@ Description: fast prime number generator C/C++ library -- libdev
This package provides the static library and symbolic links needed
for development.
-Package: libprimesieve7-dev-common
+Package: libprimesieve-dev-common
Architecture: all
Multi-Arch: foreign
-Replaces: libprimesieve6-dev-common
-Breaks: libprimesieve6-dev-common
+Replaces: libprimesieve7-dev-common
+Breaks: libprimesieve7-dev-common
Section: libdevel
Depends: ${misc:Depends}
-Recommends: libprimesieve7-dev (= ${binary:Version})
+Recommends: libprimesieve-dev (= ${binary:Version})
Provides: libprimesieve-dev-common
Description: fast prime number generator C/C++ library -- headers
primesieve is a free software program and C/C++ library that generates
@@ -100,7 +102,7 @@ Multi-Arch: foreign
Section: doc
Depends: libjs-jquery, ${misc:Depends}
Suggests: pdf-viewer, www-browser
-Enhances: primesieve-bin (= ${binary:Version}), libprimesieve7-dev (= ${binary:Version})
+Enhances: primesieve-bin (= ${binary:Version}), libprimesieve-dev (= ${binary:Version})
Description: fast prime number generator C/C++ library -- doc
primesieve is a free software program and C/C++ library that generates
primes using a highly optimized sieve of Eratosthenes implementation.
diff --git a/debian/copyright b/debian/copyright
index 8f922d2..8c17c7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright:
2010-2017 Kim Walisch <kim.walisch at gmail.com>
License: BSD-2-clause
-Files: src/apps/gui/*
+Files: src/gui/*
Copyright:
2012-2017 Kim Walisch <kim.walisch at gmail.com>
License: GPL-3+
diff --git a/debian/libprimesieve7-dev-common.docs b/debian/libprimesieve-dev-common.docs
similarity index 100%
rename from debian/libprimesieve7-dev-common.docs
rename to debian/libprimesieve-dev-common.docs
diff --git a/debian/libprimesieve7-dev-common.install b/debian/libprimesieve-dev-common.install
similarity index 100%
rename from debian/libprimesieve7-dev-common.install
rename to debian/libprimesieve-dev-common.install
diff --git a/debian/libprimesieve7-dev.install b/debian/libprimesieve-dev.install
similarity index 100%
rename from debian/libprimesieve7-dev.install
rename to debian/libprimesieve-dev.install
diff --git a/debian/libprimesieve7.docs b/debian/libprimesieve8.docs
similarity index 100%
rename from debian/libprimesieve7.docs
rename to debian/libprimesieve8.docs
diff --git a/debian/libprimesieve7.install b/debian/libprimesieve8.install
similarity index 100%
rename from debian/libprimesieve7.install
rename to debian/libprimesieve8.install
diff --git a/debian/libprimesieve7.lintian-overrides b/debian/libprimesieve8.lintian-overrides
similarity index 100%
rename from debian/libprimesieve7.lintian-overrides
rename to debian/libprimesieve8.lintian-overrides
diff --git a/debian/patches/debianization-neutralize-resource_demanding_test.patch b/debian/patches/debianization-neutralize-resource_demanding_test.patch
deleted file mode 100644
index 7217d02..0000000
--- a/debian/patches/debianization-neutralize-resource_demanding_test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: debianization: neutralize resource demanding test
- Neutralize the test that challenges resources and led to
- FTBFS Bug #860664. Note that the tests are split in the next
- major upstream version in order to avoid this very issue.
-Origin: vendor, Debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-04-22
-
---- a/src/primesieve/primesieve_test.cpp
-+++ b/src/primesieve/primesieve_test.cpp
-@@ -170,7 +170,7 @@
- cout << left;
- testPix();
- testBigPrimes();
-- testRandomIntervals();
-+// testRandomIntervals();
- }
- catch (exception& e)
- {
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
deleted file mode 100644
index 1557ff0..0000000
--- a/debian/patches/debianization.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: debianization
- Meant to maintain a minimal debian/rules, to fix warnings,
- to address Debian specific stuff in general.
-Origin: vendor, Debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,8 +4,10 @@
- AC_PREREQ([2.62])
- AC_LANG([C++])
- AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([subdir-objects foreign -Wall -Werror])
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
-+AM_MAINTAINER_MODE([enable])
- AC_PROG_CC
- AC_PROG_CXX
- AC_OPENMP
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -166,7 +166,7 @@
-
- H2MFLAGS = \
- --manual="primesieve" \
-- --source="primesieve $(PACKAGE_VERSION)" \
-+ --source="primesieve (Debian $(DEB_PKG_VERSION))" \
- --locale=C.UTF-8 \
- --libtool \
- --no-info
diff --git a/debian/patches/series b/debian/patches/series
index 79ed414..3e10dc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-upstream-autotoolization-manpages.patch
-debianization.patch
-debianization-neutralize-resource_demanding_test.patch
+upstream-cmake-install-COMPONENT-libheaders.patch
+upstream-cmake-install-multiarch.patch
diff --git a/debian/patches/upstream-autotoolization-manpages.patch b/debian/patches/upstream-autotoolization-manpages.patch
deleted file mode 100644
index 299f905..0000000
--- a/debian/patches/upstream-autotoolization-manpages.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: autotoolization: manpages
- Attempt to render the autotools machinery to generate the manpage
- more conform to what is expected by packagers; meant to be submitted
- to the upstream maintainer.
-Origin: vendor, Debian
-Forwarded: https://github.com/kimwalisch/primesieve/pull/24
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,9 +19,12 @@
-
- # doxygen is used to generate C/C++ API documentation
- AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
--
- AM_CONDITIONAL([HAVE_DOXYGEN], [test x$DOXYGEN = xdoxygen])
-
-+# help2man is used to generate manpages (maintainer mode)
-+AC_CHECK_PROG([HELP2MAN], [help2man], [help2man])
-+AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN = xhelp2man])
-+
- # Check if graphviz is installed
- AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO])
-
-@@ -29,12 +32,6 @@
- [AS_HELP_STRING([--with-help2man], [Use help2man to generate man pages])],
- WITH_HELP2MAN="yes")
-
--AS_IF([test "x$WITH_HELP2MAN" = "xyes"], [
-- AC_CHECK_PROG([HELP2MAN], [help2man], [help2man])
-- test -z "$HELP2MAN" && AC_MSG_ERROR([help2man not found])
--])
--
--AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN = xhelp2man])
-
- AC_ARG_ENABLE(examples,
- [AS_HELP_STRING([--enable-examples], [Compile the examples programs])],
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@
-
- lib_LTLIBRARIES = libprimesieve.la
- libprimesieve_la_CXXFLAGS = $(OPENMP_CXXFLAGS)
--libprimesieve_la_LDFLAGS = -version-info @primesieve_lib_version@
-+libprimesieve_la_LDFLAGS = -version-info $(primesieve_lib_version)
-
- if FORCE_SHARED_LIBRARY
- libprimesieve_la_LDFLAGS += -no-undefined
-@@ -45,7 +45,7 @@
- doc/Doxyfile
-
- man_MANS = \
-- doc/primesieve.1
-+ primesieve.1
-
- libprimesieve_la_SOURCES = \
- src/primesieve/EratBig.cpp \
-@@ -161,16 +161,25 @@
- cd doc && $(DOXYGEN)
- endif
-
-+if MAINTAINER_MODE
- if HAVE_HELP2MAN
--help2man: doc/primesieve.1
-
--doc/primesieve.1: primesieve
-- $(HELP2MAN) --manual="primesieve" \
-- --source="primesieve @PACKAGE_VERSION@" \
-- -n "efficient prime number generator" \
-- -s 1 --no-info \
-- -o doc/primesieve.1 primesieve
-+H2MFLAGS = \
-+ --manual="primesieve" \
-+ --source="primesieve $(PACKAGE_VERSION)" \
-+ --locale=C.UTF-8 \
-+ --libtool \
-+ --no-info
-+
-+primesieve.1: primesieve
-+ $(HELP2MAN) \
-+ -s 1 \
-+ $(H2MFLAGS) \
-+ -n "efficient prime number generator" \
-+ -o $@ \
-+ ./$<
-+
-+endif
- endif
-
--man: $(HELP2MAN)
--doc: man $(DOXYGEN)
-+doc: $(DOXYGEN)
---- a/doc/README.md
-+++ b/doc/README.md
-@@ -7,7 +7,7 @@
- directory.
-
- ```bash
--$ ./configure --with-help2man
-+$ ./configure --enable-maintainer-mode
- $ make man
- $ make doxygen
- ```
diff --git a/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch b/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch
new file mode 100644
index 0000000..181221c
--- /dev/null
+++ b/debian/patches/upstream-cmake-install-COMPONENT-libheaders.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..425f91a
--- /dev/null
+++ b/debian/patches/upstream-cmake-install-multiarch.patch
@@ -0,0 +1,38 @@
+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/rules b/debian/rules
index af2d78d..53e78e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -S Version)
-
## inspired from mpfr material
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -23,10 +21,14 @@ default:
@uscan --no-conf --dehs --report || true
%:
- dh $@ --with autoreconf --builddirectory=_build --parallel
+ dh $@ --builddirectory=_build
override_dh_auto_configure:
- dh_auto_configure -- --enable-maintainer-mode
+ dh_auto_configure -- \
+ -DCMAKE_LIBRARY_MULTIARCH="$(DEB_TARGET_MULTIARCH)" \
+ -DBUILD_TESTS=ON \
+ -DBUILD_EXAMPLES=ON \
+ -DBUILD_DOC=ON
override_dh_auto_build-indep: README.implementation
$(MAKE) -f debian/adhoc/Makefile doc
@@ -37,13 +39,18 @@ override_dh_auto_test-indep:
override_dh_prep-arch: README.implementation
override_dh_auto_install-indep:
- $(MAKE) -C _build install-data-am DESTDIR=$(CURDIR)/debian/tmp
+ DESTDIR=$(CURDIR)/debian/tmp $(CMAKE) \
+ -DCMAKE_INSTALL_COMPONENT=libprimesieve-headers \
+ -P _build/cmake_install.cmake
override_dh_installdocs:
- dh_installdocs -pprimesieve-bin --link-doc=libprimesieve7
- dh_installdocs -plibprimesieve7-dev --link-doc=libprimesieve7-dev-common
+ dh_installdocs -pprimesieve-bin --link-doc=libprimesieve8
+ dh_installdocs -plibprimesieve-dev --doc-main-package=libprimesieve-dev-common
dh_installdocs --remaining-packages
+override_dh_installexamples-indep:
+ dh_installexamples -XCMakeLists.txt -XREADME.md
+
override_dh_compress-indep:
dh_compress -X.pdf -Xexamples
@@ -52,3 +59,5 @@ get-orig-source:
README.implementation:
cp -p src/primesieve/README README.implementation
+
+CMAKE ?= cmake
diff --git a/debian/tests/make-check b/debian/tests/make-check
index a893cd8..0fa847a 100755
--- a/debian/tests/make-check
+++ b/debian/tests/make-check
@@ -1,5 +1,5 @@
#!/bin/sh
-# autopkgtest check based on upstream check ($ make check)
+# autopkgtest check based on upstream check
set -ue
cd $ADTTMP
--
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