[mpria] 02/02: Imported Debian patch 0.7.3-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Mon Feb 1 16:30:27 UTC 2016


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

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

commit df86ea1a9536ef88a81bf98f6cd3a4bb68207413
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Mon Feb 1 17:16:40 2016 +0100

    Imported Debian patch 0.7.3-1
---
 debian/changelog                                   |  23 ++-------
 debian/control                                     |  55 +++++++++------------
 debian/copyright                                   |  10 ++--
 debian/libmpria-dev-common.docs                    |   3 ++
 debian/libmpria-dev-common.install                 |   2 +
 ...{libmpria0-dev.install => libmpria-dev.install} |   2 -
 debian/libmpria-doc.doc-base                       |   2 +-
 debian/libmpria0-dev.docs                          |   1 -
 debian/libmpria0-dev.links                         |   2 -
 debian/libmpria0.symbols                           |   1 +
 debian/patches/debianization-htmlxref_cnf.patch    |   3 +-
 debian/patches/debianization.patch                 |  15 ------
 debian/patches/series                              |   1 -
 debian/rules                                       |  22 +++++++--
 debian/source/include-binaries                     |   2 +-
 .../signing-key.pgp}                               | Bin
 16 files changed, 61 insertions(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 010fa43..cff6211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,5 @@
-mpria (0.7.1-1) experimental; urgency=low
+mpria (0.7.3-1) experimental; urgency=medium
 
-  * Initial release. (Closes: #737696)
-  * Debianization:
-    - debian/copyright in DEP-5 format;
-    - debian/control:
-      - debhelper build-dep to >= 9;
-      - Standards Version 3.9.5;
-      - Vcs-* headers.
-    - debian/source, format 3.0 (quilt);
-    - debian/patches/ patches in DEP-3 format;
-    - debian/watch:
-      - effective set up with upstream signature verification.
-    - debian/rules:
-      - autoreconf-iguration;
-      - full and minal dh integration;
-      - get-orig-source uscan based target which downloads the currently
-        packaged upstream tarball;
-      - default target which basically queries package status with uscan
-        -- output in DEHS format.
+  * Initial release (Closes: #737696).
 
- -- Jerome Benoit <calculus at rezozer.net>  Wed, 05 Feb 2014 14:03:44 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 01 Feb 2016 16:13:52 +0000
diff --git a/debian/control b/debian/control
index 285b3ec..18d93ed 100644
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,18 @@ Section: math
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
-Build-Depends:
- debhelper (>= 9), dh-autoreconf,
- autotools-dev, autoconf-archive, libtool,
- libgmp-dev
+Build-Depends: debhelper (>= 9), libgmp-dev
 Build-Depends-Indep: texinfo, texlive-base, texlive-latex-base
-Standards-Version: 3.9.5
-Homepage: http://www.gnu.org/software/mpria/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/mpria.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/mpria.git
+Standards-Version: 3.9.6
+Homepage: https://www.gnu.org/software/mpria/
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/mpria.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/mpria.git
 
 Package: libmpria0
-Provides: libmpria
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libmpria
-Suggests: libmpria-doc
 Multi-Arch: same
 Description: multi-precision rational interval arithmetic library -- library
  GNU MPRIA is a mathematical C library for rational interval arithmetic
@@ -43,15 +37,14 @@ Description: multi-precision rational interval arithmetic library -- library
  .
  This package provides the shared libraries required to run programs
  compiled against the GNU MPRIA library. To compile your own programs
- you also need to install the libmpria0-dev package.
+ you also need to install the libmpria-dev package.
 
-Package: libmpria0-dev
-Provides: libmpria-dev
+Package: libmpria-dev
 Section: libdevel
 Architecture: any
-Depends: libmpria0 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libmpria-dev
-Suggests: libmpria-doc, pkg-config
+Depends:
+ libmpria0 (= ${binary:Version}), libmpria-dev-common (= ${source:Version}),
+ libgmp-dev, ${misc:Depends}
 Multi-Arch: same
 Description: multi-precision rational interval arithmetic library -- development
  GNU MPRIA is a mathematical C library for rational interval arithmetic
@@ -72,19 +65,17 @@ Description: multi-precision rational interval arithmetic library -- development
  The GNU MPRIA library is built upon the GNU MP library for operating
  on rational numbers.
  .
- This package provides the header file, static library and symbolic links
- that developers using the GNU MPRIA library will need; it also contains
- autotools material.
+ This package provides the static library and symbolic links needed for
+ development.
 
-Package: libmpria0-dbg
-Provides: libmpria-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libmpria0 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libmpria-dbg
-Multi-Arch: same
-Description: multi-precision rational interval arithmetic library -- debug symbols
+Package: libmpria-dev-common
+Section: libdevel
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libmpria-dev (=${binary:Version})
+Suggests: autotools-dev, libmpria-doc (= ${source:Version})
+Multi-Arch: foreign
+Description: multi-precision rational interval arithmetic library -- header
  GNU MPRIA is a mathematical C library for rational interval arithmetic
  computations with arbitrary precision.
  .
@@ -103,15 +94,15 @@ Description: multi-precision rational interval arithmetic library -- debug symbo
  The GNU MPRIA library is built upon the GNU MP library for operating
  on rational numbers.
  .
- This package provides the debugging symbols for the library from
- the libmpria0 package.
+ This package provides the header file needed for development; it also
+ contains autotools material.
 
 Package: libmpria-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}, install-info
 Suggests:
- libmpria0 (= ${binary:Version}), libmpria0-dev (= ${binary:Version}),
+ libmpria0 (= ${binary:Version}), libmpria-dev (= ${binary:Version}),
  info-browser, pdf-viewer, www-browser,
  glibc-doc-reference, gmp-doc
 Multi-Arch: foreign
diff --git a/debian/copyright b/debian/copyright
index 5f85570..0d32980 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,17 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: mpria
 Upstream-Contact: Jerome Benoit <jgmbenoit at rezozer.net>
 Source: https://www.gnu.org/software/mpria/
+X-Upstream-Vcs-Git: http://git.savannah.gnu.org/r/mpria.git
+X-Upstream-Vcs-Browser: http://git.savannah.gnu.org/cgit/mpria.git/
 
 Files: *
 Copyright:
- 2009-2014 Jerome Benoit <jgmbenoit at rezozer.net>
+ 2009-2016 Jerome Benoit <jgmbenoit at rezozer.net>
 License: GPL-3+
 
 Files: doc/mpria.texi doc/mpria.info
 Copyright:
- 2014 Jerome Benoit <jgmbenoit at rezozer.net>
+ 2014-2016 Jerome Benoit <jgmbenoit at rezozer.net>
 License: GFDL-1.3+
 
 Files: doc/gpl.texi
@@ -25,7 +27,7 @@ License: no-modification
 
 Files: debian/*
 Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2016 Jerome Benoit <calculus at rezozer.net>
 License: GPL-3+
 
 License: GPL-3+
@@ -49,7 +51,7 @@ License: GFDL-1.3+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
  any later version published by the Free Software Foundation; with no
- Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+ Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
  A copy of the license is included in GNU Free Documentation License.
  .
  The GNU Free Documentation License Version 1.3 may be found on Debian
diff --git a/debian/libmpria-dev-common.docs b/debian/libmpria-dev-common.docs
new file mode 100644
index 0000000..265b64a
--- /dev/null
+++ b/debian/libmpria-dev-common.docs
@@ -0,0 +1,3 @@
+README
+README-alpha
+README-dev
diff --git a/debian/libmpria-dev-common.install b/debian/libmpria-dev-common.install
new file mode 100644
index 0000000..66480d6
--- /dev/null
+++ b/debian/libmpria-dev-common.install
@@ -0,0 +1,2 @@
+usr/include/*
+usr/share/aclocal/*
diff --git a/debian/libmpria0-dev.install b/debian/libmpria-dev.install
similarity index 55%
rename from debian/libmpria0-dev.install
rename to debian/libmpria-dev.install
index e6fa53a..425f2ca 100644
--- a/debian/libmpria0-dev.install
+++ b/debian/libmpria-dev.install
@@ -1,4 +1,2 @@
 usr/lib/*/libmpria.so
 usr/lib/*/libmpria.a
-usr/include/*
-usr/share/aclocal/*
diff --git a/debian/libmpria-doc.doc-base b/debian/libmpria-doc.doc-base
index 6f6c4c0..9a91a19 100644
--- a/debian/libmpria-doc.doc-base
+++ b/debian/libmpria-doc.doc-base
@@ -4,7 +4,7 @@ Abstract: This manual documents how to use the GNU MPRIA Library
 Section: Programming/C
 
 Format: PDF
-Files: /usr/share/doc/libmpria-doc/mpria.pdf.gz
+Files: /usr/share/doc/libmpria-doc/mpria.pdf
 
 Format: HTML
 Index: /usr/share/doc/libmpria-doc/mpria.html/index.html
diff --git a/debian/libmpria0-dev.docs b/debian/libmpria0-dev.docs
deleted file mode 100644
index 91d1ca3..0000000
--- a/debian/libmpria0-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-README-dev
diff --git a/debian/libmpria0-dev.links b/debian/libmpria0-dev.links
deleted file mode 100644
index f4c1464..0000000
--- a/debian/libmpria0-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libmpria0/README usr/share/doc/libmpria0-dev/README
-usr/share/doc/libmpria0/README-alpha usr/share/doc/libmpria0-dev/README-alpha
diff --git a/debian/libmpria0.symbols b/debian/libmpria0.symbols
index 27a1c7f..a5898f1 100644
--- a/debian/libmpria0.symbols
+++ b/debian/libmpria0.symbols
@@ -58,6 +58,7 @@ libmpria.so.0 libmpria0 #MINVER#
  mpri_sub at LIBMPRIA_0.7 0.7.1
  mpri_sub_q at LIBMPRIA_0.7 0.7.1
  mpri_swap at LIBMPRIA_0.7 0.7.1
+ mpri_urandomm at LIBMPRIA_0.7 0.7.2
  mpria_libversion_check_numbers at LIBMPRIA_0.7 0.7.1
  mpria_libversion_get_number at LIBMPRIA_0.7 0.7.1
  mpria_libversion_get_numbers at LIBMPRIA_0.7 0.7.1
diff --git a/debian/patches/debianization-htmlxref_cnf.patch b/debian/patches/debianization-htmlxref_cnf.patch
index 766f329..ebc1b07 100644
--- a/debian/patches/debianization-htmlxref_cnf.patch
+++ b/debian/patches/debianization-htmlxref_cnf.patch
@@ -1,6 +1,7 @@
 Description: reference file for local Texinfo manuals
+ Concerning gmp-doc/html/ xref support, see #737724.
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-02-05
+Last-Update: 2016-01-31
 
 --- /dev/null
 +++ b/doc/htmlxref.cnf
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
deleted file mode 100644
index f166473..0000000
--- a/debian/patches/debianization.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: debianization
-	Meant to maintain a minimal debian/rules, to fix warnings,
-	to address Debian specific stuff in general.
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-02-05
-
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -21,4 +21,6 @@
- info_TEXINFOS = mpria.texi
- mpria_TEXINFOS = gpl.texi fdl.texi
- 
-+all-local: pdf html
-+
- ## eos
diff --git a/debian/patches/series b/debian/patches/series
index 6396db2..f755148 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-debianization.patch
 debianization-htmlxref_cnf.patch
diff --git a/debian/rules b/debian/rules
index 9e25152..5eaa418 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,26 @@ default:
 	@uscan --no-conf --dehs --report || true
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --parallel
 
-override_dh_strip:
-	dh_strip --dbg-package=libmpria0-dbg
+override_dh_auto_build-indep:
+	$(MAKE) -C doc pdf html
+
+override_dh_auto_build-arch:
+	dh_auto_build -a
+
+override_dh_auto_test-indep:
+
+override_dh_auto_install-indep:
+	$(MAKE) -C src install-data-am DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install-data-am DESTDIR=$(CURDIR)/debian/tmp
+
+override_dh_installdocs:
+	dh_installdocs -plibmpria-dev --link-doc=libmpria-dev-common
+	dh_installdocs --remaining-packages
+
+override_dh_compress-indep:
+	dh_compress -X.pdf -Xexamples
 
 get-orig-source:
 	uscan --no-conf --download-current-version --verbose
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 95a390b..a610508 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-debian/upstream-signing-key.pgp
+debian/upstream/signing-key.pgp
diff --git a/debian/upstream-signing-key.pgp b/debian/upstream/signing-key.pgp
similarity index 100%
rename from debian/upstream-signing-key.pgp
rename to debian/upstream/signing-key.pgp

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



More information about the debian-science-commits mailing list