[mpir] 02/09: Update to use dh and dh_autoreconf.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Mar 13 11:41:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository mpir.
commit 1efdc13c0da97837fee7d4cf0741867a938f7b82
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Wed Mar 11 21:40:47 2015 -0500
Update to use dh and dh_autoreconf.
In order for the package to build, we need several patches (no_lzma.patch,
fix_self_reference.patch, and fix_t-scan_segfault.patch).
---
debian/control | 10 +-
debian/libmpir-dev.install | 13 ++-
debian/libmpir-gmp-compat-dev.links | 5 +
debian/libmpir11.install | 1 +
debian/libmpirxx4.install | 1 +
debian/patches/fix_self_reference.patch | 17 ++++
debian/patches/fix_t-scan_segfault.patch | 15 +++
debian/patches/no_lzma.patch | 17 ++++
debian/patches/series | 3 +
debian/rules | 167 +------------------------------
10 files changed, 74 insertions(+), 175 deletions(-)
diff --git a/debian/control b/debian/control
index a3a8eeb..04d8f69 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Felix Salfelder <felix at salfelder.org>
Homepage:
DM-Upload-Allowed: no
-Build-Depends: dpkg-dev (>= 1.15.7~), debhelper (>= 9),
- yasm
+Build-Depends: dpkg-dev (>= 1.15.7~), debhelper (>= 9), yasm, dh-autoreconf,
+ dh-exec
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/mpir.git
Vcs-Git: git://git.debian.org/git/debian-science/packages/mpir.git
Standards-Version: 3.9.4
-Package: libmpir
+Package: libmpir11
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: multiarch-support
@@ -20,7 +20,7 @@ Description: MPIR is an open source multiprecision integer (bignum) library
.
This package contains the shared library.
-Package: libmpirxx
+Package: libmpirxx4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: multiarch-support
@@ -32,7 +32,7 @@ Description: MPIR is an open source multiprecision integer (bignum) library
Package: libmpir-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libmpir (= ${binary:Version}), libmpirxx (= ${binary:Version})
+Depends: ${misc:Depends}, libmpir11 (= ${binary:Version}), libmpirxx4 (= ${binary:Version})
Description: MPIR is an open source multiprecision integer (bignum) library
forked from the GMP (GNU Multi Precision) project.
.
diff --git a/debian/libmpir-dev.install b/debian/libmpir-dev.install
index 9ce5b1d..2a70480 100644
--- a/debian/libmpir-dev.install
+++ b/debian/libmpir-dev.install
@@ -1,7 +1,6 @@
-
-usr/include/*.h
-# usr/include/libyasm/*.h
-
-usr/lib/*/*.a
-usr/lib/*/*.la
-
+usr/include/mpir.h
+usr/include/mpirxx.h
+usr/lib/*/libmpir.a
+usr/lib/*/libmpir.so
+usr/lib/*/libmpirxx.a
+usr/lib/*/libmpirxx.so
diff --git a/debian/libmpir-gmp-compat-dev.links b/debian/libmpir-gmp-compat-dev.links
new file mode 100755
index 0000000..d7b38bd
--- /dev/null
+++ b/debian/libmpir-gmp-compat-dev.links
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libmpir.so usr/lib/${DEB_HOST_MULTIARCH}/libgmp.so
+usr/lib/${DEB_HOST_MULTIARCH}/libmpirxx.so usr/lib/${DEB_HOST_MULTIARCH}/libgmpxx.so
+usr/include/mpir.h usr/include/gmp.h
+usr/include/mpirxx.h usr/include/gmpxx.h
diff --git a/debian/libmpir11.install b/debian/libmpir11.install
new file mode 100644
index 0000000..fd04384
--- /dev/null
+++ b/debian/libmpir11.install
@@ -0,0 +1 @@
+usr/lib/*/libmpir.so.*
diff --git a/debian/libmpirxx4.install b/debian/libmpirxx4.install
new file mode 100644
index 0000000..c78af9b
--- /dev/null
+++ b/debian/libmpirxx4.install
@@ -0,0 +1 @@
+usr/lib/*/libmpirxx.so.*
diff --git a/debian/patches/fix_self_reference.patch b/debian/patches/fix_self_reference.patch
new file mode 100644
index 0000000..f28dff4
--- /dev/null
+++ b/debian/patches/fix_self_reference.patch
@@ -0,0 +1,17 @@
+Description: Fix "Recursive variable 'MKDIR_P' references itself" error.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2015-03-08
+
+--- a/configure.in
++++ b/configure.in
+@@ -207,10 +207,6 @@
+ esac],
+ [enable_fat=no])
+
+-# Work around an autoconf bug
+-MKDIR_P=@mkdir_p@
+-AC_SUBST(MKDIR_P)
+-
+ # Table of compilers, options, and mpn paths. This code has various related
+ # purposes
+ #
diff --git a/debian/patches/fix_t-scan_segfault.patch b/debian/patches/fix_t-scan_segfault.patch
new file mode 100644
index 0000000..2a4eefb
--- /dev/null
+++ b/debian/patches/fix_t-scan_segfault.patch
@@ -0,0 +1,15 @@
+Description: Fix segfault when running tests/mpz/t-scan.
+Origin: https://groups.google.com/forum/#!topic/mpir-devel/oLk3gMULxu0/discussion
+Last-Update: 2015-03-08
+
+--- a/tests/mpz/t-scan.c
++++ b/tests/mpz/t-scan.c
+@@ -84,7 +84,7 @@
+
+ for (isize = 0; isize <= size; isize++)
+ {
+- for (oindex = 0; oindex <= numberof (offset); oindex++)
++ for (oindex = 0; oindex < numberof (offset); oindex++)
+ {
+ o = offset[oindex];
+ if ((int) isize*GMP_NUMB_BITS < -o)
diff --git a/debian/patches/no_lzma.patch b/debian/patches/no_lzma.patch
new file mode 100644
index 0000000..cde9baa
--- /dev/null
+++ b/debian/patches/no_lzma.patch
@@ -0,0 +1,17 @@
+Description: Remove dist-lzma from AM_INIT_AUTOMAKE.
+ Avoids "support for lzma-compressed distribution archives has been removed"
+ error.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2015-03-08
+
+--- a/configure.in
++++ b/configure.in
+@@ -69,7 +69,7 @@
+ dnl Note that there's a copy of these options in the top-level Makefile.am,
+ dnl so update there too if changing anything.
+ dnl
+-AM_INIT_AUTOMAKE([1.11 gnu no-dependencies parallel-tests dist-bzip2 no-dist-gzip dist-lzma])
++AM_INIT_AUTOMAKE([1.11 gnu no-dependencies parallel-tests dist-bzip2 no-dist-gzip])
+ AM_CONFIG_HEADER(config.h:config.in)
+ AM_MAINTAINER_MODE
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cd90e64
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+no_lzma.patch
+fix_self_reference.patch
+fix_t-scan_segfault.patch
diff --git a/debian/rules b/debian/rules
index 025675d..a99bc8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,166 +1,7 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for packages that are architecture dependent.
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+%:
+ dh $@ --with autoreconf
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-CFLAGS += -Wall
-CXXFLAGS += -Wall
-
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
-
-build-arch: build
-build-indep: build
-build: build-stamp
-build-stamp: configure-stamp
-
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- - [ -f Makefile ] && $(MAKE) distclean
-
- dh_clean
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/<packagename>
- #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
- $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp'
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-#
-
-configure: configure-stamp
-
-configure-stamp:
- dh_testdir
- CPPFLAGS="$(CPPFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)" \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)" \
- ./configure --prefix=/usr \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
- --build=$(DEB_HOST_MULTIARCH) \
- --mandir=/usr/share/man \
- --docdir=/usr/share/doc \
- --enable-shared \
- --enable-static \
- --enable-cxx=yes
- touch configure-stamp
-
-
-A=$(DEB_HOST_MULTIARCH)
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_install -plibmpir usr/lib/$A/libmpir.so.*
- dh_install -plibmpirxx usr/lib/$A/libmpirxx.so.*
- dh_install -plibmpir-dev usr/lib/$A/lib*.so
-# dh_install -plibmpir-dev usr/lib/lib*.a
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installcatalogs
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_installwm
-# dh_installudev
-# dh_lintian
-# dh_bugfiles
-# dh_undocumented
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
- dh_testdir
- dh_testroot
-
- # better use --enable-compat?
- -mkdir -p debian/libmpir-gmp-compat-dev/usr/lib/$A
- ln -sf libmpir.so debian/libmpir-gmp-compat-dev/usr/lib/$A/libgmp.so
- ln -sf libmpirxx.so debian/libmpir-gmp-compat-dev/usr/lib/$A/libgmpxx.so
- -mkdir debian/libmpir-gmp-compat-dev/usr/include
- ln -sf mpir.h debian/libmpir-gmp-compat-dev/usr/include/gmp.h
- ln -sf mpirxx.h debian/libmpir-gmp-compat-dev/usr/include/gmpxx.h
-
- dh_installchangelogs
- dh_installdocs
- dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installcatalogs
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
-# dh_installwm
-# dh_installudev
-# dh_lintian
-# dh_bugfiles
-# dh_undocumented
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install \
- build-arch build-indep
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-cxx=yes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpir.git
More information about the debian-science-commits
mailing list