[mpfi] 01/01: Imported Debian patch 1.5.1+ds-3

Jerome Benoit calculus-guest at moszumanska.debian.org
Tue May 10 11:32:42 UTC 2016


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

calculus-guest pushed a commit to branch master
in repository mpfi.

commit 133eb6c1ef938b2c282a4a5a551e98394b53e750
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue May 10 12:11:43 2016 +0100

    Imported Debian patch 1.5.1+ds-3
---
 debian/adhoc/examples/Makefile                     | 39 ++++++++++++
 debian/adhoc/examples/mpfi_example_pi.c            | 44 +++++++++++++
 debian/adhoc/examples/mpfi_version.c               | 39 ++++++++++++
 debian/changelog                                   | 18 ++++++
 debian/control                                     | 72 ++++++----------------
 debian/copyright                                   |  2 +-
 ...v-common.install => libmpfi-dev-common.install} |  0
 debian/libmpfi-dev-common.lintian-overrides        |  4 ++
 .../{libmpfi0-dev.install => libmpfi-dev.install}  |  0
 debian/libmpfi-dev.lintian-overrides               |  4 ++
 debian/libmpfi-doc.examples                        |  1 +
 debian/rules                                       | 11 ++--
 debian/tests/build-examples                        | 11 ++++
 debian/tests/control                               |  2 +
 14 files changed, 190 insertions(+), 57 deletions(-)

diff --git a/debian/adhoc/examples/Makefile b/debian/adhoc/examples/Makefile
new file mode 100644
index 0000000..07247f7
--- /dev/null
+++ b/debian/adhoc/examples/Makefile
@@ -0,0 +1,39 @@
+# /usr/share/doc/libmpfi-doc/examples/Makefile
+#
+# Ad hoc Makefile for building and playing with the sample sources
+# distributed within the debian package libmpfi-doc.
+#
+# Recommended usage:
+#  create a dedicated folder somewhere in your HOME directory;
+#  link all the files in /usr/share/doc/libmpfi-doc/examples in the dedicated folder;
+#  launch this Makefile in the dedicated folder:
+#  $ make ;
+#  for a basic cleanup, consider the clean target:
+#  $ make clean ;
+#  for an entire cleanup, the maintainer-clean target:
+#  $ make maintainer-clean ;
+#  for other targets, just read the Makefile.
+#
+# written for Debian by Jerome Benoit <calculus at rezozer.net>
+# on behalf of the Debian Science Team
+# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# distributed under the terms and conditions of GPL version 2 or later
+#
+
+PROGRAMS = $(patsubst %.c,%,$(wildcard *.c))
+
+default: all
+
+LDLIBS = -lmpfi -lmpfr -lgmp -lm
+
+all: build
+
+build: $(PROGRAMS)
+
+check: build
+	@$(foreach eg, $(PROGRAMS), echo "*** $(eg) ***" ; ./$(eg) ; )
+
+clean:
+	$(RM) $(PROGRAMS)
+
+maintainer-clean: clean
diff --git a/debian/adhoc/examples/mpfi_example_pi.c b/debian/adhoc/examples/mpfi_example_pi.c
new file mode 100644
index 0000000..fa9833b
--- /dev/null
+++ b/debian/adhoc/examples/mpfi_example_pi.c
@@ -0,0 +1,44 @@
+/* /usr/share/doc/libmpfi-doc/examples/mpfi_version.c */
+
+/*
+ * Ad hoc source sample for illustrating the use of the library mpfi
+ *
+ * Build and launch:
+ *	$ gcc -o mpfi_version mpfi_version.c -lmpfi -lmpfr -lgmp -lm
+ *	$ ./mpfi_version
+ *
+ * Written for Debian by Jerome Benoit <calculus at rezozer.net> on behalf of the Debian Science Team
+ * Copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+ * Distributed under the terms and conditions of GPL version 2 or later
+ */
+
+#include <stdio.h>
+
+#include <mpfi.h>
+#include <mpfi_io.h>
+
+#define ADHOC_DEFAULT_PRECISION 512
+
+int main(void) {
+	mpfi_t one;
+	mpfi_t four_atan_one;
+
+	mpfr_set_default_prec(ADHOC_DEFAULT_PRECISION);
+
+	mpfi_init(one);
+	mpfi_init(four_atan_one);
+
+	mpfi_set_ui(one,1UL);
+
+	mpfi_atan(four_atan_one,one);
+	mpfi_mul_ui(four_atan_one,four_atan_one,4UL);
+
+	fprintf(stdout,"4 atan(1): ");
+	mpfi_out_str(stdout,10,0,four_atan_one);
+	fprintf(stdout,"\n");
+
+
+	mpfi_clear(four_atan_one);
+	mpfi_clear(one);
+
+	return 0; }
diff --git a/debian/adhoc/examples/mpfi_version.c b/debian/adhoc/examples/mpfi_version.c
new file mode 100644
index 0000000..dae1a46
--- /dev/null
+++ b/debian/adhoc/examples/mpfi_version.c
@@ -0,0 +1,39 @@
+/* /usr/share/doc/libmpfi-doc/examples/mpfi_version.c */
+
+/*
+ * Ad hoc source sample for illustrating the use of the library mpfi
+ *
+ * Build and launch:
+ *	$ gcc -o mpfi_version mpfi_version.c -lmpfi -lmpfr -lgmp -lm
+ *	$ ./mpfi_version
+ *
+ * Written for Debian by Jerome Benoit <calculus at rezozer.net> on behalf of the Debian Science Team
+ * Copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+ * Distributed under the terms and conditions of GPL version 2 or later
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <mpfi.h>
+
+int main(void) {
+	const char *adhoc_mpfi_lib_version=mpfi_get_version();
+	int status=0;
+
+	if (strcmp(MPFI_VERSION_STRING,adhoc_mpfi_lib_version)) {
+		fprintf(stderr,
+				"header and library version mismatch: " MPFI_VERSION_STRING " vs %s\n",
+			adhoc_mpfi_lib_version
+			);
+		status=1;
+		}
+#if 1
+	else {
+		fprintf(stdout,
+				"header and library version match: " MPFI_VERSION_STRING "\n"
+			);
+		}
+#endif
+
+	return (status); }
diff --git a/debian/changelog b/debian/changelog
index 7d9fa35..6cac208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+mpfi (1.5.1+ds-3) unstable; urgency=medium
+
+  * Debianization:
+    - debian/copyright, refresh;
+    - debian/control:
+      - Standards Version, bump to 3.9.8 (no change);
+      - Vcs-*, secure;
+      - debug symbol package, drop off in favour of automatic generation;
+      - SONNAME/SOINDEX being removed from libdev package names, initiate;
+    - debian/rules:
+      - dpkg-buildflags, add hardening=+all;
+      - debug symbol package, drop off (see above);
+      - symlink policy for documentation directories, set;
+    - debian/adhoc/examples, introduce;
+    - debian/tests/*, introduce.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 09 May 2016 23:22:08 +0000
+
 mpfi (1.5.1+ds-2) unstable; urgency=medium
 
   * RC bug fix release (Closes: #790509), stabilize libdev transition.
diff --git a/debian/control b/debian/control
index 78bdb93..24bbb9d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,14 @@ Build-Depends:
  libmpfr-dev (>= 3.1), libgmp-dev (>= 2:6.0)
 Build-Depends-Indep:
  texinfo, texlive-latex-base
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://mpfi.gforge.inria.fr/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/mpfi.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/mpfi.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/mpfi.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/mpfi.git
 
 Package: libmpfi0
 Provides: libmpfi
-Replaces: libmpfi (<= 1.5.1-3)
+Replaces: libmpfi (<< 1.5.1+ds-1)
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -45,16 +45,15 @@ Description: multiple precision floating-point interval computation library -- l
  .
  This package provides the dynamic library.
 
-Package: libmpfi0-dev
-Provides: libmpfi-dev
+Package: libmpfi-dev
 Section: libdevel
 Architecture: any
-Replaces: libmpfi-dev (<= 1.5.1-3)
-Breaks: libmpfi-dev (<= 1.5.1-3)
+Replaces: libmpfi0-dev (<< 1.5.1+ds-3)
+Conflicts: libmpfi0-dev (<< 1.5.1+ds-3), libmpfi-dev (<< 1.5.1+ds-3)
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
- libmpfi0 (= ${binary:Version}), libmpfi0-dev-common (= ${source:Version}),
+ libmpfi0 (= ${binary:Version}), libmpfi-dev-common (= ${source:Version}),
  libmpfr-dev, libgmp-dev, ${misc:Depends}
-#Conflicts: libmpfi-dev
 Multi-Arch: same
 Description: multiple precision floating-point interval computation library -- libdev
  This package provides a C library of functions for interval arithmetic
@@ -78,15 +77,15 @@ Description: multiple precision floating-point interval computation library -- l
  This package provides the static library and symbolic links needed for
  development.
 
-Package: libmpfi0-dev-common
-Provides: libmpfi-dev-common
+Package: libmpfi-dev-common
 Section: libdevel
 Architecture: all
-Replaces: libmpfi-dev (<= 1.5.1-3)
-Breaks: libmpfi-dev (<= 1.5.1-3)
+Replaces: libmpfi-dev (<< 1.5.1+ds-1), libmpfi0-dev-common (<< 1.5.1+ds-3)
+Breaks: libmpfi-dev (<< 1.5.1+ds-1)
+Conflicts: libmpfi0-dev-common (<< 1.5.1+ds-3)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
-Recommends: libmpfi0-dev (=${binary:Version})
-Conflicts: libmpfi-dev-common
+Recommends: libmpfi-dev (=${binary:Version})
 Multi-Arch: foreign
 Description: multiple precision floating-point interval computation library -- headers
  This package provides a C library of functions for interval arithmetic
@@ -109,44 +108,13 @@ Description: multiple precision floating-point interval computation library -- h
  .
  This package provides the headers needed by developers.
 
-Package: libmpfi0-dbg
-Provides: libmpfi-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libmpfi0 (=${binary:Version}), ${misc:Depends}
-Conflicts: libmpfi-dbg
-Multi-Arch: same
-Description: multiple precision floating-point interval computation library -- debug
- This package provides a C library of functions for interval arithmetic
- computations with arbitrary precision.
- .
- The basic principle of interval arithmetic consists in enclosing every number
- by an interval containing it and being representable by machine numbers: for
- instance it can be stored as its lower and upper endpoints and these bounds
- are machine numbers, or as a centre and a radius which are machine numbers.
- .
- The arithmetic operations are extended for interval operands in such a way
- that the exact result of the operation belongs to the computed interval.
- .
- The purpose of an arbitrary precision interval arithmetic is on the one hand
- to get guaranteed results, thanks to interval computation, and on the other
- hand to obtain accurate results, thanks to multiple precision arithmetic. The
- MPFI library is built upon MPFR in order to benefit from the correct roundings
- provided by MPFR. Further advantages of using MPFR are its portability and
- compliance with the IEEE 754 standard for floating-point arithmetic.
- .
- This package provides the debugging symbols for the library.
-
 Package: libmpfi-doc
 Section: doc
 Architecture: all
-Replaces: libmpfi-dev (<= 1.5.1-3)
-Breaks: libmpfi-dev (<= 1.5.1-3)
+Replaces: libmpfi-dev (<< 1.5.1+ds-1)
+Breaks: libmpfi-dev (<< 1.5.1+ds-1)
 Depends: ${misc:Depends}
-Suggests:
- libmpfi0 (=${binary:Version}), libmpfi0-dev (=${binary:Version}),
- pdf-viewer
+Suggests: libmpfi-dev (=${binary:Version}), pdf-viewer
 Multi-Arch: foreign
 Description: multiple precision floating-point interval computation library -- doc
  This package provides a C library of functions for interval arithmetic
@@ -169,11 +137,11 @@ Description: multiple precision floating-point interval computation library -- d
  .
  This package provides the user manual.
 
-Package: libmpfi-dev
+Package: libmpfi0-dev
 Section: oldlibs
 Priority: extra
 Architecture: all
-Depends: libmpfi0-dev (>= ${source:Version}), ${misc:Depends}
+Depends: libmpfi-dev (>= ${source:Version}), libmpfi-dev (<< ${source:Version}.1~), ${misc:Depends}
 Multi-Arch: foreign
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index cfcfe4c..e3ff9fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,7 +41,7 @@ License: LGPL-2+
 
 Files: debian/*
 Copyright:
- 2015 Jerome Benoit <calculus at rezozer.net>
+ 2015-2016 Jerome Benoit <calculus at rezozer.net>
  2005-2014 Laurent Fousse <lfousse at debian.org>
 License: GPL-2+
 Comment:
diff --git a/debian/libmpfi0-dev-common.install b/debian/libmpfi-dev-common.install
similarity index 100%
rename from debian/libmpfi0-dev-common.install
rename to debian/libmpfi-dev-common.install
diff --git a/debian/libmpfi-dev-common.lintian-overrides b/debian/libmpfi-dev-common.lintian-overrides
new file mode 100644
index 0000000..f80bac9
--- /dev/null
+++ b/debian/libmpfi-dev-common.lintian-overrides
@@ -0,0 +1,4 @@
+# piuparts(1) tests lead to use Conflicts rather than Breaks: the involved
+# Replaces/Conflicts scheme might be temporary as it might be removed once
+# the clumsy libmpfi0-dev material is no more in `testing'.
+conflicts-with-version
diff --git a/debian/libmpfi0-dev.install b/debian/libmpfi-dev.install
similarity index 100%
rename from debian/libmpfi0-dev.install
rename to debian/libmpfi-dev.install
diff --git a/debian/libmpfi-dev.lintian-overrides b/debian/libmpfi-dev.lintian-overrides
new file mode 100644
index 0000000..f80bac9
--- /dev/null
+++ b/debian/libmpfi-dev.lintian-overrides
@@ -0,0 +1,4 @@
+# piuparts(1) tests lead to use Conflicts rather than Breaks: the involved
+# Replaces/Conflicts scheme might be temporary as it might be removed once
+# the clumsy libmpfi0-dev material is no more in `testing'.
+conflicts-with-version
diff --git a/debian/libmpfi-doc.examples b/debian/libmpfi-doc.examples
new file mode 100644
index 0000000..8c0890a
--- /dev/null
+++ b/debian/libmpfi-doc.examples
@@ -0,0 +1 @@
+debian/adhoc/examples/*
diff --git a/debian/rules b/debian/rules
index 497c4ad..834b04b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 export ACLOCAL_PATH=/usr/share/gnulib/m4
 
 ## inspired from mpfr material
@@ -33,11 +35,12 @@ override_dh_auto_install-indep:
 	$(MAKE) -C _build/src install-data-am DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C _build install-info install-pdf DESTDIR=$(CURDIR)/debian/tmp
 
-override_dh_compress-indep:
-	dh_compress -X.pdf
+override_dh_installdocs:
+	dh_installdocs -plibmpfi-dev --link-doc=libmpfi-dev-common
+	dh_installdocs --remaining-packages
 
-override_dh_strip:
-	dh_strip --dbg-package=libmpfi0-dbg
+override_dh_compress-indep:
+	dh_compress -X.pdf -Xexamples
 
 get-orig-source:
 	uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/tests/build-examples b/debian/tests/build-examples
new file mode 100755
index 0000000..b002478
--- /dev/null
+++ b/debian/tests/build-examples
@@ -0,0 +1,11 @@
+#!/bin/sh
+# autopkgtest check: build and launch program examples
+set -ue
+cd $ADTTMP
+
+cp -prd /usr/share/doc/libmpfi-doc/examples .
+cd examples
+
+make check
+
+exit 0
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..4c65ab2
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: build-examples
+Depends: libmpfi-doc, libmpfi-dev, build-essential

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpfi.git



More information about the debian-science-commits mailing list