[primesieve] 01/01: Imported Debian patch 6.3+ds-2
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Jan 6 13:13:40 UTC 2018
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository primesieve.
commit 9047206ad4609c4d22868d91f26f7c287ca2c342
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Jan 6 16:50:56 2018 +0400
Imported Debian patch 6.3+ds-2
---
debian/adhoc/examples/c/Makefile | 6 +++---
debian/adhoc/examples/cpp/Makefile | 6 +++---
debian/changelog | 18 ++++++++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 6 +++---
debian/primesieve-doc.doc-base | 6 +++---
debian/tests/build-examples | 2 +-
debian/tests/control | 5 ++++-
debian/tests/make-check | 8 -------
debian/tests/make-check-bin | 38 +++++++++++++++++++++++++++++++++
debian/tests/make-check-dev | 43 ++++++++++++++++++++++++++++++++++++++
12 files changed, 119 insertions(+), 25 deletions(-)
diff --git a/debian/adhoc/examples/c/Makefile b/debian/adhoc/examples/c/Makefile
index 67b24c0..3f01e2b 100644
--- a/debian/adhoc/examples/c/Makefile
+++ b/debian/adhoc/examples/c/Makefile
@@ -1,11 +1,11 @@
-# /usr/share/doc/primesieve-doc/examples/c/Makefile
+# /usr/share/doc/primesieve/examples/c/Makefile
#
# Ad hoc Makefile for building and playing with the sample sources
# distributed within the debian package primesieve-doc.
#
# Recommended usage:
# create a dedicated folder somewhere in your HOME directory;
-# link all the files in /usr/share/doc/primesieve-doc/examples/c in the dedicated folder;
+# link all the files in /usr/share/doc/primesieve/examples/c in the dedicated folder;
# launch this Makefile in the dedicated folder:
# $ make ;
# for a basic cleanup, consider the clean target:
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Science Team
-# copyright: 2015-2017 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2015-2018 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 01ca6e6..947e598 100644
--- a/debian/adhoc/examples/cpp/Makefile
+++ b/debian/adhoc/examples/cpp/Makefile
@@ -1,11 +1,11 @@
-# /usr/share/doc/primesieve-doc/examples/cpp/Makefile
+# /usr/share/doc/primesieve/examples/cpp/Makefile
#
# Ad hoc Makefile for building and playing with the sample sources
# distributed within the debian package primesieve-doc.
#
# Recommended usage:
# create a dedicated folder somewhere in your HOME directory;
-# link all the files in /usr/share/doc/primesieve-doc/examples/cpp in the dedicated folder;
+# link all the files in /usr/share/doc/primesieve/examples/cpp in the dedicated folder;
# launch this Makefile in the dedicated folder:
# $ make ;
# for a basic cleanup, consider the clean target:
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Science Team
-# copyright: 2015-2017 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2015-2018 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 662105b..509c325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+primesieve (6.3+ds-2) unstable; urgency=medium
+
+ * Debianization:
+ - debian/tests/*:
+ - d/t/make-check[-bin], revisit (Closes: #884349),
+ thanks to upstream maintainer;
+ - d/t/make-check-dev, introduce;
+ - debian/copyright, refresh;
+ - debian/control:
+ - debhelper, bump to 11: (revisit d/primesieve-doc.docs);
+ - d/primesieve-doc.docs, revisit;
+ - d/t/build-examples, revisit;
+ - d/adhoc/examples/c*/Makefile, revisit;
+ - Standards Version, bump to 4.1.3 (no change);
+ - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 06 Jan 2018 12:50:07 +0000
+
primesieve (6.3+ds-1) unstable; urgency=medium
* New upstream minor release (Closes: #881453, #881678).
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 19d5cc2..c52d83a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Uploaders: Jerome Benoit <calculus at rezozer.net>
Section: math
Priority: optional
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
cmake, help2man
Build-Depends-Indep:
doxygen, doxygen-latex, graphviz,
rdfind, symlinks
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
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/
diff --git a/debian/copyright b/debian/copyright
index 8c17c7d..ee00715 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,17 +11,17 @@ Files-Excluded:
Files: *
Copyright:
- 2010-2017 Kim Walisch <kim.walisch at gmail.com>
+ 2010-2018 Kim Walisch <kim.walisch at gmail.com>
License: BSD-2-clause
Files: src/gui/*
Copyright:
- 2012-2017 Kim Walisch <kim.walisch at gmail.com>
+ 2012-2018 Kim Walisch <kim.walisch at gmail.com>
License: GPL-3+
Files: debian/*
Copyright:
- 2015-2017 Jerome Benoit <calculus at rezozer.net>
+ 2015-2018 Jerome Benoit <calculus at rezozer.net>
License: GPL-3+
License: BSD-2-clause
diff --git a/debian/primesieve-doc.doc-base b/debian/primesieve-doc.doc-base
index 3b3ff4d..63edfe9 100644
--- a/debian/primesieve-doc.doc-base
+++ b/debian/primesieve-doc.doc-base
@@ -16,8 +16,8 @@ Abstract:
Section: Science/Mathematics
Format: HTML
-Index: /usr/share/doc/primesieve-doc/html/index.html
-Files: /usr/share/doc/primesieve-doc/html/*.html
+Index: /usr/share/doc/primesieve/html/index.html
+Files: /usr/share/doc/primesieve/html/*.html
Format: PDF
-Files: /usr/share/doc/primesieve-doc/primesieve_refman.pdf
+Files: /usr/share/doc/primesieve/primesieve_refman.pdf
diff --git a/debian/tests/build-examples b/debian/tests/build-examples
index c15776e..a2468e8 100755
--- a/debian/tests/build-examples
+++ b/debian/tests/build-examples
@@ -3,7 +3,7 @@
set -ue
cd $ADTTMP
-cp -prd /usr/share/doc/primesieve-doc/examples .
+cp -prd /usr/share/doc/primesieve/examples .
cd examples
make -C c check
diff --git a/debian/tests/control b/debian/tests/control
index 2a0b35d..2c13ed5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,8 @@
-Tests: make-check
+Tests: make-check-bin
Depends: primesieve-bin
+Tests: make-check-dev
+Depends: libprimesieve-dev, build-essential, pkg-config
+
Tests: build-examples
Depends: primesieve-doc, libprimesieve-dev, build-essential, pkg-config
diff --git a/debian/tests/make-check b/debian/tests/make-check
deleted file mode 100755
index 0fa847a..0000000
--- a/debian/tests/make-check
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# autopkgtest check based on upstream check
-set -ue
-cd $ADTTMP
-
-primesieve --test
-
-exit 0
diff --git a/debian/tests/make-check-bin b/debian/tests/make-check-bin
new file mode 100755
index 0000000..cb311e0
--- /dev/null
+++ b/debian/tests/make-check-bin
@@ -0,0 +1,38 @@
+#!/bin/sh
+# autopkgtest check
+set -ue
+cd $ADTTMP
+
+status=0
+
+# Test 1
+res=$(primesieve 10^10 -q | sed 's/Primes: //g')
+echo "Primes <= 10^10: $res"
+
+if [ "$res" -ne "455052511" ]; then
+ echo "Error: Primes test: correct result is 455052511" 1>&2
+ status=1
+fi
+
+# Test 2
+res=$(primesieve 10^10 -c2 -q | sed 's/Twin primes: //g')
+echo "Twin primes <= 10^10: $res"
+
+if [ "$res" -ne "27412679" ]; then
+ echo "Error: Twin primes test: correct result is 27412679" 1>&2
+ status=1
+fi
+
+# Test 3
+res=$(primesieve 10^9 -n -q | sed 's/Nth prime: //g')
+echo "10^9th prime: $res"
+
+if [ "$res" -ne "22801763489" ]; then
+ echo "Error: Nthe prime test: correct result is 22801763489" 1>&2
+ status=1
+fi
+
+echo ""
+echo "All tests passed successfully!"
+
+exit $status
diff --git a/debian/tests/make-check-dev b/debian/tests/make-check-dev
new file mode 100755
index 0000000..cac9ff3
--- /dev/null
+++ b/debian/tests/make-check-dev
@@ -0,0 +1,43 @@
+#!/bin/sh
+# autopkgtest check based on upstream cmake test ($ make test)
+set -ue
+
+mkdir -p $ADTTMP/tests
+mkdir -p $ADTTMP/include/primesieve
+
+cp -vpd -t $ADTTMP/include/primesieve include/primesieve/PrimeSieve.hpp
+cp -vpd -t $ADTTMP/include/primesieve include/primesieve/ParallelPrimeSieve.hpp
+
+cp -vpd -t $ADTTMP/tests test/*.c
+cp -vpd -t $ADTTMP/tests test/*.cpp
+
+cd $ADTTMP
+
+cat > $ADTTMP/tests/GNUmakefile << EOF
+#!/usr/bin/make -f
+
+PROGRAMS = \
+ \$(patsubst %.c,%,\$(wildcard *.c)) \
+ \$(filter-out atomic cpu_info, \$(patsubst %.cpp,%,\$(wildcard *.cpp)) )
+
+default: all
+
+CFLAGS = \$(shell pkg-config primesieve --cflags)
+CXXFLAGS = -I../include \$(shell pkg-config primesieve --cflags)
+LDLIBS = \$(shell pkg-config primesieve --libs) -pthread
+
+all: build
+
+build: \$(PROGRAMS)
+
+check: build
+ \$(foreach tst, \$(PROGRAMS), echo "+-+-+-+ \$(tst) +-+-+-+" ; ./\$(tst) ; )
+
+clean:
+ \$(RM) \$(PROGRAMS)
+
+EOF
+
+make -C $ADTTMP/tests check
+
+exit 0
--
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