[normaliz] 06/06: Imported Debian patch 3.4.1+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Wed Nov 15 06:27:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository normaliz.
commit 516fed17eea4ad46983c8c32035761aac3f5e247
Author: Jerome Benoit <calculus at rezozer.net>
Date: Wed Nov 15 10:16:01 2017 +0400
Imported Debian patch 3.4.1+ds-1
---
debian/adhoc/Makefile | 4 +-
debian/changelog | 6 +-
debian/clean | 5 --
debian/control | 18 ++--
...mmon.install => libnormaliz-dev-common.install} | 0
...rmaliz0-dev.install => libnormaliz-dev.install} | 0
debian/libnormaliz0.lintian-overrides | 2 -
.../{libnormaliz0.install => libnormaliz3.install} | 0
debian/libnormaliz3.lintian-overrides | 5 ++
debian/normaliz-doc.doc-base | 7 +-
debian/normaliz-doc.docs | 2 +-
debian/patches/debianization-documentation.patch | 41 ---------
debian/patches/debianization.patch | 97 +++-------------------
debian/patches/series | 1 -
debian/rules | 31 +++----
debian/source/lintian-overrides | 2 +-
16 files changed, 47 insertions(+), 174 deletions(-)
diff --git a/debian/adhoc/Makefile b/debian/adhoc/Makefile
index a5b68df..779435b 100644
--- a/debian/adhoc/Makefile
+++ b/debian/adhoc/Makefile
@@ -6,14 +6,14 @@ HELP2MAN = help2man
H2MFLAGS = \
--manual="Normaliz Project" \
- --source="Normaliz (Debian $(DEB_PKG_VERSION))" \
+ --source="Normaliz (Debian $(DEB_VERSION))" \
--no-info
default:
manpages: normaliz.1
-normaliz.1: $(TOP_BUILDDIR)/normaliz
+normaliz.1: $(TOP_BUILDDIR)/source/normaliz
$(HELP2MAN) \
-s 1 \
$(H2MFLAGS) \
diff --git a/debian/changelog b/debian/changelog
index de322cc..7b45a7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-normaliz (3.4.1+ds-0) UNRELEASED; urgency=medium
+normaliz (3.4.1+ds-1) unstable; urgency=medium
- * New upstream minor version.
+ * New upstream minor version (Closes: #877210).
* Debianization:
- debian/copyright, refresh;
- debian/control:
@@ -15,7 +15,7 @@ normaliz (3.4.1+ds-0) UNRELEASED; urgency=medium
- debhelper, bump to 10;
- doc composition, neutralize.
- -- Jerome Benoit <calculus at rezozer.net> Wed, 15 Nov 2017 04:59:09 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Wed, 15 Nov 2017 06:15:30 +0000
normaliz (3.1.1+ds-1) unstable; urgency=medium
diff --git a/debian/clean b/debian/clean
index 0bc0825..529149c 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,8 +1,3 @@
source/libnormaliz/version.h
-doc/Normaliz.log
-doc/Normaliz.out
-doc/Normaliz.toc
-doc/Normaliz.aux
-doc/Normaliz.pdf
normaliz.1
test/test-mm/*.mod
diff --git a/debian/control b/debian/control
index 4e75837..2b4d6a4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,9 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 10), autoconf-archive,
help2man,
libgmp-dev, libboost-dev
-##Build-Depends-Indep:
-## texlive-latex-base, texlive-latex-recommended, texlive-pictures,
-## texlive-fonts-recommended, texlive-fonts-extra
Standards-Version: 4.1.1
Homepage: https://www.normaliz.uni-osnabrueck.de/
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/normaliz.git
@@ -25,7 +22,7 @@ Description: math computing tools for affine monoids, rational polytopes and con
.
This dummy package provides the standard installation.
-Package: libnormaliz0
+Package: libnormaliz3
Provides: libnormaliz
Section: libs
Architecture: any
@@ -39,13 +36,12 @@ Description: math computing tools for affine monoids, rational polytopes and con
.
This package provides the shared libraries required to run programs compiled
against the Normaliz library. To compile your own programs you also need to
- install the libnormaliz0-dev package.
+ install the libnormaliz-dev package.
-Package: libnormaliz0-dev
-Provides: libnormaliz-dev
+Package: libnormaliz-dev
Section: libdevel
Architecture: any
-Depends: libnormaliz0 (= ${binary:Version}), libnormaliz0-dev-common (= ${source:Version}), ${misc:Depends}
+Depends: libnormaliz3 (= ${binary:Version}), libnormaliz-dev-common (= ${source:Version}), ${misc:Depends}
Conflicts: libnormaliz-dev
Suggests: normaliz-bin (= ${binary:Version})
Multi-Arch: same
@@ -56,7 +52,7 @@ Description: math computing tools for affine monoids, rational polytopes and con
This package contains static libraries and symbolic links that developers
using the Normaliz library will need.
-Package: libnormaliz0-dev-common
+Package: libnormaliz-dev-common
Section: libdevel
Architecture: all
Depends: ${misc:Depends}
@@ -70,7 +66,7 @@ Description: math computing tools for affine monoids, rational polytopes and con
Package: normaliz-bin
Architecture: any
-Depends: libnormaliz0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libnormaliz3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: normaliz-doc (= ${binary:Version})
Multi-Arch: foreign
Description: math computing tools for affine monoids, rational polytopes and cones - bin
diff --git a/debian/libnormaliz0-dev-common.install b/debian/libnormaliz-dev-common.install
similarity index 100%
rename from debian/libnormaliz0-dev-common.install
rename to debian/libnormaliz-dev-common.install
diff --git a/debian/libnormaliz0-dev.install b/debian/libnormaliz-dev.install
similarity index 100%
rename from debian/libnormaliz0-dev.install
rename to debian/libnormaliz-dev.install
diff --git a/debian/libnormaliz0.lintian-overrides b/debian/libnormaliz0.lintian-overrides
deleted file mode 100644
index 9ef090e..0000000
--- a/debian/libnormaliz0.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# the upstream source contains C++ code, and has no clearly defined and versionned ABI
-libnormaliz0: no-symbols-control-file
diff --git a/debian/libnormaliz0.install b/debian/libnormaliz3.install
similarity index 100%
rename from debian/libnormaliz0.install
rename to debian/libnormaliz3.install
diff --git a/debian/libnormaliz3.lintian-overrides b/debian/libnormaliz3.lintian-overrides
new file mode 100644
index 0000000..02ab722
--- /dev/null
+++ b/debian/libnormaliz3.lintian-overrides
@@ -0,0 +1,5 @@
+# package effectively built with the default Debian compiler flags defined by dpkg-buildflags
+libnormaliz3: hardening-no-fortify-functions
+
+# the upstream source contains C++ code, and has no clearly defined and versionned ABI
+libnormaliz3: no-symbols-control-file
diff --git a/debian/normaliz-doc.doc-base b/debian/normaliz-doc.doc-base
index 5a175ed..4d5df96 100644
--- a/debian/normaliz-doc.doc-base
+++ b/debian/normaliz-doc.doc-base
@@ -1,16 +1,17 @@
Document: normaliz
-Title: Normaliz 2.12
+Title: Normaliz
Author: the normaliz team <normaliz at uos.de>
Winfried Bruns
- Bogdan Ichim
Tim Römer
+ Richard Sieg
Christof Söger
+ Bogdan Ichim
Abstract:
Normaliz is a tool for computing the Hilbert bases and enumerative data of
rational cones, and more generally, sets of lattice points in rational polyhedra.
The mathematical background and the terminology of this manual are explained in
Appendix. For a thorough treatment of the involved mathematics and algorithms the
- reader is refered to a (short) bibliography.
+ reader is referred to a (short) bibliography.
Section: Science/Mathematics
Format: PDF
diff --git a/debian/normaliz-doc.docs b/debian/normaliz-doc.docs
index 11065b3..aec2d81 100644
--- a/debian/normaliz-doc.docs
+++ b/debian/normaliz-doc.docs
@@ -1 +1 @@
-debian/tmp/usr/share/doc/normaliz/Normaliz.pdf
+doc/Normaliz.pdf
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
deleted file mode 100644
index 08a81e0..0000000
--- a/debian/patches/debianization-documentation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: debianization -- documentation
- Address Debian Policy requirements for documentation;
- and silence the composition machinery.
- This is a Debian centric patch.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-09-02
-
---- /dev/null
-+++ b/doc/Makefile
-@@ -0,0 +1,30 @@
-+docdir ?= /usr/share/doc/normaliz
-+
-+PDFLATEX = pdflatex
-+
-+PDFLATEX_FLAGS = \
-+ -no-shell-escape \
-+ -interaction=batchmode
-+
-+LISTOF_DOCUMENT = Normaliz #NmzIntegrate
-+
-+default: doc
-+
-+doc: pdf
-+
-+pdf: $(addsuffix .pdf,$(LISTOF_DOCUMENT))
-+
-+install: pdf
-+ install -d $(DESTDIR)$(docdir)
-+ cp -p -t $(DESTDIR)$(docdir) $(addsuffix .pdf,$(LISTOF_DOCUMENT))
-+
-+clean:
-+ -rm -f $(foreach _suffix, .aux .toc .out .log ,$(addsuffix $(_suffix),$(LISTOF_DOCUMENT)))
-+
-+maintainer-clean: clean
-+ -rm -f $(addsuffix .pdf,$(LISTOF_DOCUMENT))
-+
-+%.pdf : %.tex
-+ $(PDFLATEX) $(PDFLATEX_FLAGS) -draftmode $<
-+ $(PDFLATEX) $(PDFLATEX_FLAGS) -draftmode $<
-+ $(PDFLATEX) $(PDFLATEX_FLAGS) $<
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 647b8f7..ba72a6b 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,88 +4,17 @@ Description: debianization
This is a Debian centric patch.
Origin: debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2015-05-02
+Last-Update: 2017-11-03
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -47,28 +47,28 @@
- ##### Always full RPATH #####
-
- # use, i.e. don't skip the full RPATH for the build tree
--SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-+##SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-
- # when building, don't use the install RPATH already
- # (but later on when installing)
--SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-+##SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
--SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+##SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
- # add the automatically determined parts of the RPATH
- # which point to directories outside the build tree to the install RPATH
--SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+##SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-
- # the RPATH to be used when installing, but only if it's not a system directory
--LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
--IF("${isSystemDir}" STREQUAL "-1")
-- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
--ENDIF("${isSystemDir}" STREQUAL "-1")
-+##LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-+##IF("${isSystemDir}" STREQUAL "-1")
-+## SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+##ENDIF("${isSystemDir}" STREQUAL "-1")
-
- ##############################
-
--SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") #needed on mac
-+##SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") #needed on mac
-
-
- # compiler flags
-@@ -266,17 +266,17 @@
- )
- ENDIF(UNIX)
-
--ADD_CUSTOM_TARGET (check)
--IF (UNIX)
-- ADD_CUSTOM_COMMAND(
-- COMMENT "run tests"
-- COMMAND make --directory=../test/ NORMALIZ=${CMAKE_CURRENT_BINARY_DIR}/normaliz
-- TARGET check
-- DEPENDS normaliz
-- )
--ELSE(UNIX)
-- ADD_CUSTOM_COMMAND(
-- COMMENT "check only implemented in unix"
-- TARGET check
-- )
--ENDIF(UNIX)
-+##ADD_CUSTOM_TARGET (check)
-+##IF (UNIX)
-+## ADD_CUSTOM_COMMAND(
-+## COMMENT "run tests"
-+## COMMAND make --directory=../test/ NORMALIZ=${CMAKE_CURRENT_BINARY_DIR}/normaliz
-+## TARGET check
-+## DEPENDS normaliz
-+## )
-+##ELSE(UNIX)
-+## ADD_CUSTOM_COMMAND(
-+## COMMENT "check only implemented in unix"
-+## TARGET check
-+## )
-+##ENDIF(UNIX)
---- a/source/libnormaliz/CMakeLists.txt
-+++ b/source/libnormaliz/CMakeLists.txt
-@@ -11,7 +11,7 @@
- #ENDIF()
- INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
-
--SET (NMZ_BUILD_BOTH "NO" CACHE BOOL "build shared AND static libnormaliz")
-+SET (NMZ_BUILD_BOTH "YES" CACHE BOOL "build shared AND static libnormaliz")
-
- IF (NMZ_BUILD_BOTH OR NOT NMZ_BUILD_STATIC)
- # create the shared library
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,9 +19,6 @@
+ test/Makefile Qtest/Makefile])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CXX
+-AX_CXX_COMPILE_STDCXX(11, , optional)
+-AS_IF([test x$HAVE_CXX11 = x0],
+- [ AX_CXX_COMPILE_STDCXX(0x, , mandatory) ])
+
+ AC_PROG_LIBTOOL
+ AC_LANG(C++)
diff --git a/debian/patches/series b/debian/patches/series
index acb4d6a..bda6985 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
debianization.patch
-debianization-documentation.patch
diff --git a/debian/rules b/debian/rules
index 028c916..b9954d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,20 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export DEB_PKG_VERSION = $(shell dpkg-parsechangelog -S Version)
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export TOP_SRCDIR=$(CURDIR)
-CMAKE ?= /usr/bin/cmake
-
## At the time of coding, GOMP emits random `Bus error' during test on mipsel
## architecture machines --- see bugreport #806769 for further information.
## -- Jerome Benoit <calculus at rezozer.net> Tue, 01 Dec 2015
ifeq (mipsel-linux-gnu,$(DEB_HOST_MULTIARCH))
-DEB_PKG_NMZ_OPENMP=NO
+DEB_PKG_NMZ_OPENMP=no
else
-DEB_PKG_NMZ_OPENMP=YES
+DEB_PKG_NMZ_OPENMP=yes
endif
default:
@@ -26,30 +24,23 @@ default:
dh $@ --builddirectory=_build
override_dh_auto_configure:
- dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DNMZ_OPENMP:BOOL=$(DEB_PKG_NMZ_OPENMP)
+ dh_auto_configure -- --enable-openmp=$(DEB_PKG_NMZ_OPENMP)
+
+override_dh_auto_build-indep:
-##override_dh_auto_build-indep:
-## $(MAKE) -C doc pdf
+override_dh_auto_build-arch:
+ dh_auto_build -a
-override_dh_auto_test-arch:
- $(MAKE) -C test NORMALIZ=$(CURDIR)/_build/normaliz
+override_dh_auto_test-indep:
override_dh_prep-arch:
$(MAKE) -f debian/adhoc/Makefile manpages
override_dh_auto_install-indep:
- cd _build && DESTDIR=$(CURDIR)/debian/tmp $(CMAKE) -DCOMPONENT=headers -P cmake_install.cmake
- $(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C _build/source install-data-am DESTDIR=$(CURDIR)/debian/tmp
override_dh_compress-indep:
dh_compress -X.pdf -Xexamples
-override_dh_auto_clean-indep:
- [ ! -f doc/Makefile ] || $(MAKE) -C doc maintainer-clean
-
-override_dh_clean-arch:
- $(MAKE) -C test distclean
- dh_clean -a
-
get-orig-source:
uscan --no-conf --download-current-version --verbose
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index a56f5b4..2c1ea3f 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,3 @@
-# Upstream source tarball is not (yet) signed: request to the upstream team
+# upstream source tarball is not (yet) signed: request to the upstream team
# was sent -- Jerome Benoit <calculus at rrezozer.net>
debian-watch-may-check-gpg-signature
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/normaliz.git
More information about the debian-science-commits
mailing list