[primesieve] 04/04: Imported Debian patch 5.7.2+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Tue Nov 15 03:04:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository primesieve.
commit 601e14fe7d2036b90073020f9c3553ed249ad66d
Author: Jerome Benoit <calculus at rezozer.net>
Date: Tue Nov 15 02:09:07 2016 +0000
Imported Debian patch 5.7.2+ds-1
---
debian/adhoc/Makefile | 20 ----
debian/changelog | 13 ++-
debian/patches/debianization.patch | 15 ++-
debian/patches/series | 2 +-
.../upstream-autotoolization-manpages.patch | 104 +++++++++++++++++++++
debian/patches/upstream-source-CPP2help2man.patch | 39 --------
debian/primesieve-bin.manpages | 2 +-
debian/rules | 1 -
8 files changed, 129 insertions(+), 67 deletions(-)
diff --git a/debian/adhoc/Makefile b/debian/adhoc/Makefile
index cc29268..afd7ddb 100644
--- a/debian/adhoc/Makefile
+++ b/debian/adhoc/Makefile
@@ -1,16 +1,7 @@
TOP_BUILDDIR ?= _build
-primesieve_DESCRIPTION = "an efficient program (and C/C++ library) for generating slices of prime numbers"
-
DOXYGEN = doxygen
-HELP2MAN = help2man
-
-H2MFLAGS = \
- --manual="primesieve" \
- --source="primesieve (Debian $(DEB_PKG_VERSION))" \
- --no-info
-
default:
ABS_DOCDIR=$(abspath $(TOP_BUILDDIR))/DEBIAN/doc
@@ -32,14 +23,3 @@ doc: doc/Doxyfile
doc/Doxyfile: $(TOP_BUILDDIR)/doc/Doxyfile
cp -p $< $@
-
-manpages: primesieve.1
-
-primesieve.1: $(TOP_BUILDDIR)/primesieve
- $(HELP2MAN) \
- -s 1 \
- $(H2MFLAGS) \
- -I debian/man/$(basename $@).h2m \
- -n $(if $($(basename $@)_DESCRIPTION), $($(basename $@)_DESCRIPTION), "manual page for $(basename $@)") \
- -o $@ \
- ./$<
diff --git a/debian/changelog b/debian/changelog
index a96a16a..38f81bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-primesieve (5.7.2+ds-0) UNRELEASED; urgency=medium
+primesieve (5.7.2+ds-1) unstable; urgency=medium
* New upstream release.
* Debianization:
- - debian/copyright, update.
+ - debian/copyright, update;
+ - debian/rules, refresh;
+ - debian/adhoc/Makefile, ad hoc manpage machinery, discard;
+ - debian/patches/*:
+ - d/p/upstream-source-CPP2help2man.patch, discard;
+ - d/p/upstream-autotoolization-manpages.patch, introduce and submit;
+ - d/p/debianization, refresh;
+ - refresh.
- -- Jerome Benoit <calculus at rezozer.net> Mon, 14 Nov 2016 23:37:50 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Tue, 15 Nov 2016 02:08:05 +0000
primesieve (5.7.1+ds-1) unstable; urgency=medium
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 4dd88eb..1557ff0 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -1,9 +1,9 @@
Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-10-26
+Last-Update: 2016-11-15
--- a/configure.ac
+++ b/configure.ac
@@ -19,3 +19,14 @@ Last-Update: 2015-10-26
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 34d7445..d3ee1a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-upstream-source-CPP2help2man.patch
+upstream-autotoolization-manpages.patch
debianization.patch
diff --git a/debian/patches/upstream-autotoolization-manpages.patch b/debian/patches/upstream-autotoolization-manpages.patch
new file mode 100644
index 0000000..299f905
--- /dev/null
+++ b/debian/patches/upstream-autotoolization-manpages.patch
@@ -0,0 +1,104 @@
+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-source-CPP2help2man.patch b/debian/patches/upstream-source-CPP2help2man.patch
deleted file mode 100644
index 385a037..0000000
--- a/debian/patches/upstream-source-CPP2help2man.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: slightly reformat the help and version messages
- Attempt to reformat the help and version messages of the primesieve
- front-end program wrt UN*X customs in view to employ help2man to
- generate a pretty manpage; meant to be submitted to the upstream
- maintainer.
-Origin: debian
-Forwarded: https://github.com/kimwalisch/primesieve/pull/23
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-08-18
-
---- a/src/apps/console/help.cpp
-+++ b/src/apps/console/help.cpp
-@@ -43,12 +43,10 @@
- " -v, --version Print version and license information\n"
- "\n"
- "Examples:\n"
-- "\n"
-- " # Print the primes below 1000000\n"
-- " primesieve 1e6 --print\n"
-- "\n"
-- " # Count the twin primes inside [10^9, 10^9 + 2^32]\n"
-- " primesieve 1e9 --dist=2**32 -c2"
-+ "Print the primes below 1000000\n"
-+ " $ primesieve 1e6 --print\n"
-+ "Count the twin primes inside [10^9, 10^9 + 2^32]\n"
-+ " $ primesieve 1e9 --dist=2**32 -c2"
- );
-
- } // namespace
-@@ -63,7 +61,8 @@
- {
- cout << "primesieve " << primesieve::primesieve_version();
- cout << ", <http://primesieve.org>" << endl;
-- cout << "Copyright (C) 2016 Kim Walisch" << endl;
-+ cout << "Copyright (C) 2010-2016 Kim Walisch" << endl;
-+ cout << endl;
- cout << "BSD 2-Clause License <http://opensource.org/licenses/BSD-2-Clause>" << endl;
-
- exit(1);
diff --git a/debian/primesieve-bin.manpages b/debian/primesieve-bin.manpages
index a6f17b6..7a73a48 100644
--- a/debian/primesieve-bin.manpages
+++ b/debian/primesieve-bin.manpages
@@ -1 +1 @@
-primesieve.1
+debian/tmp/usr/share/man/man1/primesieve.1
diff --git a/debian/rules b/debian/rules
index ecf417b..9bf2cfc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ override_dh_auto_test-indep:
true
override_dh_prep-arch: README.implementation
- $(MAKE) -f debian/adhoc/Makefile manpages
override_dh_auto_install-indep:
$(MAKE) -C _build install-data-am DESTDIR=$(CURDIR)/debian/tmp
--
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