[normaliz] 02/02: Imported (zeroth) Debian patch 2.12.2+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sun May 3 01:33:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository normaliz.
commit 474a3a8aed61955492b79cd69ce3e8665c1fcead
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sun May 3 03:08:02 2015 +0200
Imported (zeroth) Debian patch 2.12.2+ds-1
---
debian/adhoc/Makefile | 25 ++++
debian/changelog | 5 +
debian/clean | 6 +
debian/compat | 1 +
debian/control | 108 ++++++++++++++++
debian/copyright | 35 +++++
debian/libnormaliz0-dev-common.install | 16 +++
debian/libnormaliz0-dev.install | 3 +
debian/libnormaliz0.install | 1 +
debian/libnormaliz0.lintian-overrides | 2 +
debian/man/normaliz.h2m | 10 ++
debian/normaliz-bin.install | 1 +
debian/normaliz-bin.manpages | 1 +
debian/normaliz-doc.doc-base | 17 +++
debian/normaliz-doc.docs | 1 +
debian/normaliz-doc.examples | 1 +
debian/patches/debianization-documentation.patch | 43 +++++++
debian/patches/debianization-examples.patch | 30 +++++
debian/patches/debianization.patch | 91 +++++++++++++
debian/patches/series | 8 ++
debian/patches/upstream-source-CPP2help2man.patch | 37 ++++++
.../patches/upstream-source-copyright_update.patch | 18 +++
...m-source-libnormailz-system_wide_includes.patch | 142 +++++++++++++++++++++
debian/patches/upstream-source-typo.patch | 19 +++
.../patches/upstream-source-version_numbers.patch | 58 +++++++++
debian/repack | 131 +++++++++++++++++++
debian/rules | 38 ++++++
debian/source/format | 1 +
debian/source/lintian-overrides | 3 +
debian/watch | 4 +
30 files changed, 856 insertions(+)
diff --git a/debian/adhoc/Makefile b/debian/adhoc/Makefile
new file mode 100644
index 0000000..0086d39
--- /dev/null
+++ b/debian/adhoc/Makefile
@@ -0,0 +1,25 @@
+TOP_BUILDDIR ?= _build
+
+normaliz_DESCRIPTION = "tool for computations in affine monoids, vector configurations, lattice polytopes, and rational cones."
+
+HELP2MAN = help2man
+
+H2MFLAGS = \
+ --version-option='-\#' \
+ --help-option='-?' \
+ --manual="Normaliz Project" \
+ --source="Normaliz (Debian $(DEB_PKG_VERSION))" \
+ --no-info
+
+default:
+
+manpages: normaliz.1
+
+normaliz.1: $(TOP_BUILDDIR)/normaliz
+ $(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
new file mode 100644
index 0000000..2fcb46b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+normaliz (2.12.2+ds-1) unstable; urgency=medium
+
+ * Initial release. (Closes: #776019)
+
+ -- Jerome Benoit <calculus at rezozer.net> Sun, 03 May 2015 00:56:24 +0000
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f03ccad
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+doc/Normaliz.log
+doc/Normaliz.out
+doc/Normaliz.toc
+doc/Normaliz.aux
+doc/Normaliz.pdf
+normaliz.1
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..038e4a6
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,108 @@
+Source: normaliz
+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),
+ cmake, help2man,
+ libgmp-dev, libboost-dev
+Build-Depends-Indep:
+ texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended, texlive-fonts-extra
+Standards-Version: 3.9.6
+Homepage: http://www.math.uos.de/normaliz/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/normaliz.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/normaliz.git
+
+Package: normaliz
+Architecture: any
+Depends: normaliz-bin, ${misc:Depends}
+Suggests: singular
+Description: math computing tools for affine monoids, rational polytopes and cones
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This dummy package provides the standard installation.
+
+Package: libnormaliz0
+Provides: libnormaliz
+Section: libs
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libnormaliz
+Multi-Arch: same
+Description: math computing tools for affine monoids, rational polytopes and cones - libs
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ 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.
+
+Package: libnormaliz0-dev
+Provides: libnormaliz-dev
+Section: libdevel
+Architecture: any
+Depends: libnormaliz0 (= ${binary:Version}), libnormaliz0-dev-common (= ${source:Version}), ${misc:Depends}
+Conflicts: libnormaliz-dev
+Suggests: normaliz-bin (= ${binary:Version})
+Multi-Arch: same
+Description: math computing tools for affine monoids, rational polytopes and cones - libdev
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This package contains static libraries and symbolic links that developers
+ using the Normaliz library will need.
+
+Package: libnormaliz0-dev-common
+Section: libdevel
+Architecture: all
+Depends: ${misc:Depends}
+Multi-Arch: foreign
+Description: math computing tools for affine monoids, rational polytopes and cones - headers
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This package contains the header files that developers using the Normaliz
+ library will need.
+
+Package: normaliz-bin
+Architecture: any
+Depends: libnormaliz0 (= ${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
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This package provides the command line utility normaliz.
+
+Package: libnormaliz0-dbg
+Provides: libnormaliz-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libnormaliz0 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libnormaliz-dbg
+Suggests: pkg-config
+Multi-Arch: same
+Description: math computing tools for affine monoids, rational polytopes and cones - debug
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This package provides the debugging symbols for the libraries from
+ the libnormaliz0-dev package.
+
+Package: normaliz-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: normaliz (=${binary:Version}), pdf-viewer
+Multi-Arch: foreign
+Description: math computing tools for affine monoids, rational polytopes and cones - doc
+ Normaliz is a mathematical tool for computations in affine monoids, vector
+ configurations, lattice polytopes, and rational cones.
+ .
+ This package provides the user guide for the normaliz tool suite;
+ it also contains examples.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9384e3e
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: normaliz
+Upstream-Contact: normaliz team <normaliz at uos.de>
+Source: http://www.math.uos.de/normaliz/
+
+Files: *
+Copyright:
+ 1997-2015 the normaliz team <normaliz at uos.de>
+ Winfried Bruns
+ Bogdan Ichim
+ Tim Romer
+ Christof Soeger
+License: GPL-3+
+
+Files: debian/*
+Copyright:
+ 2015 Jerome Benoit <calculus at rezozer.net>
+License: GPL-3+
+
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libnormaliz0-dev-common.install b/debian/libnormaliz0-dev-common.install
new file mode 100644
index 0000000..9bc3190
--- /dev/null
+++ b/debian/libnormaliz0-dev-common.install
@@ -0,0 +1,16 @@
+## architecture INDEPendent packaging scheme
+## equivalent to ARCHitecture dependent scheme
+## usr/include/libnormaliz/*
+##
+source/libnormaliz/cone.h usr/include/libnormaliz/
+source/libnormaliz/cone_property.h usr/include/libnormaliz/
+source/libnormaliz/general.h usr/include/libnormaliz/
+source/libnormaliz/HilbertSeries.h usr/include/libnormaliz/
+source/libnormaliz/integer.h usr/include/libnormaliz/
+source/libnormaliz/libnormaliz.h usr/include/libnormaliz/
+source/libnormaliz/map_operations.h usr/include/libnormaliz/
+source/libnormaliz/matrix.h usr/include/libnormaliz/
+source/libnormaliz/my_omp.h usr/include/libnormaliz/
+source/libnormaliz/normaliz_exception.h usr/include/libnormaliz/
+source/libnormaliz/sublattice_representation.h usr/include/libnormaliz/
+source/libnormaliz/vector_operations.h usr/include/libnormaliz/
diff --git a/debian/libnormaliz0-dev.install b/debian/libnormaliz0-dev.install
new file mode 100644
index 0000000..627c855
--- /dev/null
+++ b/debian/libnormaliz0-dev.install
@@ -0,0 +1,3 @@
+usr/lib/*/libnormaliz.so
+usr/lib/*/libnormaliz.a
+#usr/lib/*/pkgconfig/*
diff --git a/debian/libnormaliz0.install b/debian/libnormaliz0.install
new file mode 100644
index 0000000..511f435
--- /dev/null
+++ b/debian/libnormaliz0.install
@@ -0,0 +1 @@
+usr/lib/*/libnormaliz.so.*
diff --git a/debian/libnormaliz0.lintian-overrides b/debian/libnormaliz0.lintian-overrides
new file mode 100644
index 0000000..9ef090e
--- /dev/null
+++ b/debian/libnormaliz0.lintian-overrides
@@ -0,0 +1,2 @@
+# the upstream source contains C++ code, and has no clearly defined and versionned ABI
+libnormaliz0: no-symbols-control-file
diff --git a/debian/man/normaliz.h2m b/debian/man/normaliz.h2m
new file mode 100644
index 0000000..184a15b
--- /dev/null
+++ b/debian/man/normaliz.h2m
@@ -0,0 +1,10 @@
+help2man include file for normaliz man page
+
+[COPYRIGHT]
+Copyright (C) 2007\-2015 Winfried Bruns, Bogdan Ichim, Christof Soeger
+
+[AUTHORS]
+Winfried Bruns,
+Bogdan Ichim,
+Tim Romer,
+Christof Soeger
diff --git a/debian/normaliz-bin.install b/debian/normaliz-bin.install
new file mode 100644
index 0000000..2508ac6
--- /dev/null
+++ b/debian/normaliz-bin.install
@@ -0,0 +1 @@
+/usr/bin/normaliz
diff --git a/debian/normaliz-bin.manpages b/debian/normaliz-bin.manpages
new file mode 100644
index 0000000..9df56b1
--- /dev/null
+++ b/debian/normaliz-bin.manpages
@@ -0,0 +1 @@
+normaliz.1
diff --git a/debian/normaliz-doc.doc-base b/debian/normaliz-doc.doc-base
new file mode 100644
index 0000000..5a175ed
--- /dev/null
+++ b/debian/normaliz-doc.doc-base
@@ -0,0 +1,17 @@
+Document: normaliz
+Title: Normaliz 2.12
+Author: the normaliz team <normaliz at uos.de>
+ Winfried Bruns
+ Bogdan Ichim
+ Tim Römer
+ Christof Söger
+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.
+Section: Science/Mathematics
+
+Format: PDF
+Files: /usr/share/doc/normaliz-doc/Normaliz.pdf
diff --git a/debian/normaliz-doc.docs b/debian/normaliz-doc.docs
new file mode 100644
index 0000000..11065b3
--- /dev/null
+++ b/debian/normaliz-doc.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/normaliz/Normaliz.pdf
diff --git a/debian/normaliz-doc.examples b/debian/normaliz-doc.examples
new file mode 100644
index 0000000..c6dba2f
--- /dev/null
+++ b/debian/normaliz-doc.examples
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/normaliz/examples/*
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
new file mode 100644
index 0000000..7aa7ed0
--- /dev/null
+++ b/debian/patches/debianization-documentation.patch
@@ -0,0 +1,43 @@
+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-05-02
+
+--- /dev/null
++++ b/doc/Makefile
+@@ -0,0 +1,32 @@
++export TEXINPUTS = $(TOP_SRCDIR)/source/jNormaliz/doc:
++
++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-examples.patch b/debian/patches/debianization-examples.patch
new file mode 100644
index 0000000..ec35c94
--- /dev/null
+++ b/debian/patches/debianization-examples.patch
@@ -0,0 +1,30 @@
+Description: debianization -- examples
+ Address Debian Policy requirements for examples.
+ This is a Debian centric patch.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- /dev/null
++++ b/example/Makefile
+@@ -0,0 +1,20 @@
++docdir ?= /usr/share/doc/normaliz
++docexamplesdir = $(docdir)/examples
++
++LISTOF_DISTRIBUTED_DATUM = $(wildcard *)
++
++LISTOF_DUPLICATE_DATUM = \
++ 3x3magiceven.ext \
++ j462.j46.intOut \
++ rationalES.intOut \
++ j462.pnm
++
++LISTOF_DATUM = $(filter-out $(LISTOF_DUPLICATE_DATUM),$(LISTOF_DISTRIBUTED_DATUM))
++
++default:
++
++install:
++ install -d $(DESTDIR)$(docexamplesdir)
++ cp -p -t $(DESTDIR)$(docexamplesdir) $(LISTOF_DATUM)
++ cd $(DESTDIR)$(docexamplesdir) && ln -sf j46.pnm j462.pnm
++ cd $(DESTDIR)$(docexamplesdir) && ln -sf rational.intOut rationalES.intOut
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
new file mode 100644
index 0000000..92400bd
--- /dev/null
+++ b/debian/patches/debianization.patch
@@ -0,0 +1,91 @@
+Description: debianization
+ Meant to maintain a minimal debian/rules, to fix warnings,
+ to address Debian specific stuff in general.
+ This is a Debian centric patch.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-02
+
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -48,28 +48,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
+@@ -186,17 +186,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
+@@ -12,7 +12,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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..843a808
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+upstream-source-typo.patch
+upstream-source-copyright_update.patch
+upstream-source-libnormailz-system_wide_includes.patch
+upstream-source-version_numbers.patch
+upstream-source-CPP2help2man.patch
+debianization.patch
+debianization-documentation.patch
+debianization-examples.patch
diff --git a/debian/patches/upstream-source-CPP2help2man.patch b/debian/patches/upstream-source-CPP2help2man.patch
new file mode 100644
index 0000000..8fb56db
--- /dev/null
+++ b/debian/patches/upstream-source-CPP2help2man.patch
@@ -0,0 +1,37 @@
+Description: format usages and helps
+ Attempt to format the help message of the normaliz front-end program
+ wrt UN*X customs in view to employ help2man to generate a manpage;
+ meant to be submitted to the upstream maintainer team.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- a/source/Normaliz.cpp
++++ b/source/Normaliz.cpp
+@@ -53,9 +53,10 @@
+ cout << " \\|"<<endl;
+ }
+ void printHelp(char* command) {
+- cout << "usage: "<<command<<" [-sSvVnNpPhH1dBface?] [-x=<T>] [PROJECT]"<<endl;
++ cout << "Usage: "<<command<<" [-sSvVnNpPhH1dBface?#] [-x=<T>] [PROJECT]"<<endl;
+ cout << " runs normaliz on PROJECT.in"<<endl;
+- cout << "options:"<<endl;
++ cout << "Options:"<<endl;
++ cout << " -#\tprint the version triplet and exit"<<endl;
+ cout << " -?\tprint this help text and exit"<<endl;
+ cout << " -s\tcompute support hyperplanes"<<endl;
+ cout << " -t\tcompute triangulation"<<endl;
+@@ -199,8 +200,12 @@
+ case 'm': //save memory / don't optimize for speed
+ // optimize_speed=false;
+ break;
++ case '#': //print version triplet and exit
++ cout << STRINGIFY(VERSION_TRIPLET) <<endl;
++ exit(1);
++ break;
+ case '?': //print help text and exit
+- printHeader();
++ //printHeader();
+ printHelp(argv[0]);
+ exit(1);
+ break;
diff --git a/debian/patches/upstream-source-copyright_update.patch b/debian/patches/upstream-source-copyright_update.patch
new file mode 100644
index 0000000..12336d5
--- /dev/null
+++ b/debian/patches/upstream-source-copyright_update.patch
@@ -0,0 +1,18 @@
+Description: update emmitted copyright date
+ Update the (sole ?) emmitted copyright date; meant to be submitted
+ to the upstream maintainer team.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- a/source/Normaliz.cpp
++++ b/source/Normaliz.cpp
+@@ -230,7 +230,7 @@
+ printHeader();
+ }
+ if (!filename_set) {
+- cout<<"Copyright (C) 2007-2014 Winfried Bruns, Bogdan Ichim, Christof Soeger"<<endl
++ cout<<"Copyright (C) 2007-2015 Winfried Bruns, Bogdan Ichim, Christof Soeger"<<endl
+ <<"This program comes with ABSOLUTELY NO WARRANTY; This is free software,"<<endl
+ <<"and you are welcome to redistribute it under certain conditions;"<<endl
+ <<"See COPYING for details."
diff --git a/debian/patches/upstream-source-libnormailz-system_wide_includes.patch b/debian/patches/upstream-source-libnormailz-system_wide_includes.patch
new file mode 100644
index 0000000..6470c3e
--- /dev/null
+++ b/debian/patches/upstream-source-libnormailz-system_wide_includes.patch
@@ -0,0 +1,142 @@
+Description: system wide includes
+ Make #include's that include package headers system wide rather
+ than local to avoid name collisions; meant to be submitted to the
+ upstream maintainer team.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- a/source/libnormaliz/cone.h
++++ b/source/libnormaliz/cone.h
+@@ -29,11 +29,11 @@
+ #include <utility> //for pair
+ //#include <boost/dynamic_bitset.hpp>
+
+-#include "libnormaliz.h"
+-#include "cone_property.h"
+-#include "sublattice_representation.h"
+-#include "matrix.h"
+-#include "HilbertSeries.h"
++#include <libnormaliz/libnormaliz.h>
++#include <libnormaliz/cone_property.h>
++#include <libnormaliz/sublattice_representation.h>
++#include <libnormaliz/matrix.h>
++#include <libnormaliz/HilbertSeries.h>
+
+ namespace libnormaliz {
+ using std::vector;
+--- a/source/libnormaliz/cone_property.h
++++ b/source/libnormaliz/cone_property.h
+@@ -26,7 +26,7 @@
+
+ #include <bitset>
+ #include <iostream>
+-#include "libnormaliz.h"
++#include <libnormaliz/libnormaliz.h>
+
+ namespace libnormaliz {
+
+--- a/source/libnormaliz/general.h
++++ b/source/libnormaliz/general.h
+@@ -39,9 +39,9 @@
+ #endif
+
+
+-#include "libnormaliz.h"
+-#include "normaliz_exception.h"
+-#include "cone_property.h"
++#include <libnormaliz/libnormaliz.h>
++#include <libnormaliz/normaliz_exception.h>
++#include <libnormaliz/cone_property.h>
+
+ namespace libnormaliz {
+
+--- a/source/libnormaliz/integer.h
++++ b/source/libnormaliz/integer.h
+@@ -24,7 +24,7 @@
+ #ifndef INTEGER_H_
+ #define INTEGER_H_
+
+-#include "general.h"
++#include <libnormaliz/general.h>
+ #include <list>
+ #include <vector>
+
+--- a/source/libnormaliz/matrix.h
++++ b/source/libnormaliz/matrix.h
+@@ -32,7 +32,7 @@
+ #include <iostream>
+ #include <string>
+
+-#include "libnormaliz.h"
++#include <libnormaliz/libnormaliz.h>
+
+ //---------------------------------------------------------------------------
+
+--- a/source/libnormaliz/normaliz_exception.h
++++ b/source/libnormaliz/normaliz_exception.h
+@@ -25,7 +25,7 @@
+ #define NORMALIZ_EXEPTION_H_
+
+ #include <exception>
+-//#include "libnormaliz.h"
++//#include <libnormaliz/libnormaliz.h>
+
+ namespace libnormaliz {
+
+--- a/source/libnormaliz/sublattice_representation.h
++++ b/source/libnormaliz/sublattice_representation.h
+@@ -35,8 +35,8 @@
+ #define SUBLATTICE_REPRESENTATION_H
+
+ #include <vector>
+-#include "libnormaliz.h"
+-#include "matrix.h"
++#include <libnormaliz/libnormaliz.h>
++#include <libnormaliz/matrix.h>
+
+ //---------------------------------------------------------------------------
+
+--- a/source/libnormaliz/vector_operations.h
++++ b/source/libnormaliz/vector_operations.h
+@@ -29,7 +29,7 @@
+ #include <ostream>
+ #include<list>
+
+-#include "libnormaliz.h"
++#include <libnormaliz/libnormaliz.h>
+
+ namespace libnormaliz {
+ using std::vector;
+--- a/source/libnormaliz/CMakeLists.txt
++++ b/source/libnormaliz/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ SET(headers cone.h cone_property.h general.h HilbertSeries.h integer.h libnormaliz.h map_operations.h matrix.h my_omp.h normaliz_exception.h sublattice_representation.h vector_operations.h)
+
+ # add the necessary include directories
++INCLUDE_DIRECTORIES(..)
+ INCLUDE_DIRECTORIES(.)
+ FIND_PACKAGE(Boost REQUIRED)
+ IF (Boost_FOUND)
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -112,6 +112,8 @@
+ ENDIF ()
+ ENDIF (NMZ_BUILD_STATIC)
+
++INCLUDE_DIRECTORIES(.)
++
+ # find gmp
+ FIND_PACKAGE(GMP REQUIRED)
+ INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
+--- a/source/libnormaliz/HilbertSeries.h
++++ b/source/libnormaliz/HilbertSeries.h
+@@ -49,7 +49,7 @@
+ #include <map>
+ #include <ostream>
+
+-#include "general.h"
++#include <libnormaliz/general.h>
+
+ //---------------------------------------------------------------------------
+
diff --git a/debian/patches/upstream-source-typo.patch b/debian/patches/upstream-source-typo.patch
new file mode 100644
index 0000000..b389c26
--- /dev/null
+++ b/debian/patches/upstream-source-typo.patch
@@ -0,0 +1,19 @@
+Description: source typo
+ Correct spelling error as reported by lintian in some binraries;
+ meant to silence lintian and eventually to be submitted to the
+ upstream maintainer team.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- a/source/libnormaliz/cone.cpp
++++ b/source/libnormaliz/cone.cpp
+@@ -538,7 +538,7 @@
+ Integer dummyDenom;
+ Grading = Positive_Embedded_Generators.solve(Grading,dummyDenom);
+ if (Grading.size() != dim) {
+- errorOutput() << "Grading could not be transfered!"<<endl;
++ errorOutput() << "Grading could not be transferred!"<<endl;
+ is_Computed.set(ConeProperty::Grading, false);
+ }
+ }
diff --git a/debian/patches/upstream-source-version_numbers.patch b/debian/patches/upstream-source-version_numbers.patch
new file mode 100644
index 0000000..bbda1f9
--- /dev/null
+++ b/debian/patches/upstream-source-version_numbers.patch
@@ -0,0 +1,58 @@
+Description: fix VERSION numbers redundancy
+ Pass (authoritative) VERSION numbers set in the top cmake configuration file
+ CMakeLists.txt to C/CPP sources and attempt to adapt the code accordingly;
+ meant to be submitted to the upstream maintainer team.
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-05-03
+
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -17,6 +17,7 @@
+ SET(MAJOR_VERSION 2)
+ SET(MINOR_VERSION 12)
+ SET(PATCH_VERSION 2)
++SET(VERSION_TRIPLET ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
+ SET(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
+ SET(VERSION ${VERSION_STRING})
+
+@@ -73,9 +74,11 @@
+
+ # compiler flags
+ IF (MSVC)
++ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DVERSION_TRIPLET=${VERSION_TRIPLET}")
+ SET (CXX_WARNING_FLAGS "/Wall")
+ SET (CXX_OPTIMIZATION_FLAGS "/O2")
+ ELSE ()
++ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_TRIPLET=${VERSION_TRIPLET}")
+ SET (CXX_WARNING_FLAGS "-Wall -pedantic -Wno-long-long")
+ SET (CXX_OPTIMIZATION_FLAGS "-O3 -funroll-loops")
+ ENDIF ()
+--- a/source/Normaliz.cpp
++++ b/source/Normaliz.cpp
+@@ -22,6 +22,7 @@
+ */
+
+ #include <stdlib.h>
++#include <string>
+ #include <vector>
+ #include <list>
+
+@@ -37,11 +38,15 @@
+ #include "Input.cpp"
+ #include "output.cpp"
+
+-
++#ifndef STRINGIFY
++#define STRINGIFYx(Token) #Token
++#define STRINGIFY(Token) STRINGIFYx(Token)
++#endif
+
+ void printHeader() {
+ cout << " \\.....|"<<endl;
+- cout << " Normaliz 2.12.2 \\....|"<<endl;
++ cout << " Normaliz " << string( STRINGIFY(VERSION_TRIPLET) " " ,11)
++ << " \\....|"<<endl;
+ cout << " \\...|"<<endl;
+ cout << " (C) W. Bruns B. Ichim T. Roemer C. Soeger \\..|"<<endl;
+ cout << " January 2015 \\.|"<<endl;
diff --git a/debian/repack b/debian/repack
new file mode 100755
index 0000000..519ddcc
--- /dev/null
+++ b/debian/repack
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+PACKAGE_NAME=normaliz
+
+set -e
+set -u
+
+usage() {
+ echo "Usage: repack --upstream-version <ver> <downloaded file>"
+ exit 1
+ }
+
+if [ "$#" != "3" ]; then
+ usage
+fi
+if [ "$1" != "--upstream-version" ]; then
+ usage
+fi
+if [ ! -f "$3" ]; then
+ if [ -n "$3" ]; then
+ echo "$3 doesn't exist"
+ fi
+ usage
+fi
+UPSTREAM_VERSION="$2"
+UPSTREAM_TARBALLZZ="$3"
+
+DEBIAN_SUFFIX="+ds"
+####DEBIAN_ENCAPSULATEDFOLDERNAME="${PACKAGE_NAME}-usrc"
+
+DEBIAN_UVERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX}
+DEBIAN_ROOTFOLDERNAME="${PACKAGE_NAME}-${DEBIAN_UVERSION}.orig"
+DEBIAN_TARBALLXZ="$(dirname $UPSTREAM_TARBALLZZ)/${PACKAGE_NAME}_${DEBIAN_UVERSION}.orig.tar.xz"
+
+REPACK_TMPDIR=`mktemp -d ./repackXXXXXX`
+REPACK_TMPDIR=$(readlink -f "$REPACK_TMPDIR")
+trap "/bin/rm -rf \"$REPACK_TMPDIR\"" QUIT INT EXIT
+
+message() {
+ echo
+ echo "-- -- $1"
+ echo
+ }
+
+message "Repackaging $UPSTREAM_TARBALLZZ"
+
+UPSTREAM_ROOTFOLDER="${REPACK_TMPDIR}/unpacked"
+mkdir "${UPSTREAM_ROOTFOLDER}"
+tar -C "${UPSTREAM_ROOTFOLDER}" -xf "${UPSTREAM_TARBALLZZ}" || unzip -d "${UPSTREAM_ROOTFOLDER}" "${UPSTREAM_TARBALLZZ}"
+if [ `ls -1 "${UPSTREAM_ROOTFOLDER}" | wc -l` -eq 1 ]; then
+ UPSTREAM_ROOTFOLDER="${UPSTREAM_ROOTFOLDER}/`ls -1 "${UPSTREAM_ROOTFOLDER}"`"
+fi
+
+DEBIAN_ROOTFOLDER="${REPACK_TMPDIR}/${DEBIAN_ROOTFOLDERNAME}"
+## repack
+####set -f
+REPACK_WORKING_FOLDER=$(pwd)
+cd "${UPSTREAM_ROOTFOLDER}"
+
+####. "${REPACK_WORKING_FOLDER}/debian/repack.local"
+## wipe out built material
+rm --verbose --recursive --force -- source/jNormaliz/build
+rm --verbose --force -- source/jNormaliz/build.xml
+## wipe out Java source balls
+rm --verbose --recursive --force -- source/jNormaliz/lib/commons-exec-1.0.1
+rm --verbose --force -- source/jNormaliz/lib/swing-app-framework/appframework-1.0.3-doc.zip
+rm --verbose --force -- source/jNormaliz/lib/junit/junit-3.8.2-api.zip
+rm --verbose --force -- source/jNormaliz/lib/junit_4/junit-4.5-api.zip
+## wipe out Java ARchive files
+find . -name '*.jar' | xargs --no-run-if-empty rm --verbose --force
+## clean up Java external library material
+rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/CopyLibs
+rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/junit
+rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/junit_4
+rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib/swing-app-framework
+rm --verbose --force -- source/jNormaliz/lib/nblibraries.properties
+rmdir --verbose --ignore-fail-on-non-empty -- source/jNormaliz/lib
+rmdir --verbose --ignore-fail-on-non-empty -- lib
+## wipe out published papers
+rm --verbose --force -- "doc/Algorithms for affine monoids and rational cones.pdf"
+rm --verbose --force -- "doc/Challenging computations of Hilbert bases of cones associated with algebraic statistics.pdf"
+rm --verbose --force -- "doc/Computing the integral closure of an affine semigroup.pdf"
+rm --verbose --force -- "doc/The power of pyramid decomposition in Normaliz.pdf"
+## wipe out regenerated documentation
+rm --verbose --force -- source/jNormaliz/doc/jNormaliz_1.6.pdf
+rm --verbose --force -- doc/Normaliz.pdf
+rm --verbose --force -- doc/NmzIntegrate.pdf
+rm --verbose --force -- doc/jNormaliz_1.6.pdf
+## wipe out duplicate material
+rm --verbose --force -- doc/jNormaliz.jpg
+## wipe out
+#rm --verbose --force -- build-aux/test-driver
+#rmdir --verbose --ignore-fail-on-non-empty -- build-aux
+##
+## remove executable bit for source files
+#chmod --changes a-x m4/flint-check.m4
+## discard autoconf-archive material
+#rm --verbose --force -- m4/ax_append_compile_flags.m4
+#:
+
+cd ${REPACK_WORKING_FOLDER}
+set +f
+## end
+####if [ -n "${DEBIAN_ENCAPSULATEDFOLDERNAME}" ]; then
+#### mkdir "${DEBIAN_ROOTFOLDER}"
+#### mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}/${DEBIAN_ENCAPSULATEDFOLDERNAME}"
+####else
+ mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}"
+####fi
+
+REPACK_TARBALL="${REPACK_TMPDIR}/repacked.tar"
+REPACK_TARBALLXZ="${REPACK_TARBALL}.xz"
+( cd "${REPACK_TMPDIR}" && \
+ find -L "${DEBIAN_ROOTFOLDERNAME}" -xdev -type f -print | sort | \
+ tar -T- --owner=root --group=root --mode=a+rX --create --file "${REPACK_TARBALL}" \
+ )
+xz -9e < "${REPACK_TARBALL}" > "${REPACK_TARBALLXZ}"
+mv "${REPACK_TARBALLXZ}" "${DEBIAN_TARBALLXZ}"
+
+message "Testing ${DEBIAN_TARBALLXZ}"
+
+xz --verbose --test "${DEBIAN_TARBALLXZ}"
+
+message "Printing information about ${DEBIAN_TARBALLXZ}"
+
+xz --verbose --list "${DEBIAN_TARBALLXZ}"
+
+message "Quitting"
+
+##
+## eos
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..0a3c12b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+
+export DEB_PKG_VERSION = $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export TOP_SRCDIR=$(CURDIR)
+
+default:
+ @uscan --no-conf --dehs --report || true
+
+%:
+ dh $@ --sourcedirectory=source --builddirectory=_build --parallel
+
+override_dh_auto_configure-arch:
+ dh_auto_configure -a -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+
+override_dh_auto_build-indep:
+ $(MAKE) -C doc pdf
+
+override_dh_prep-arch:
+ $(MAKE) -f debian/adhoc/Makefile manpages
+
+override_dh_auto_install-indep:
+ $(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C example install DESTDIR=$(CURDIR)/debian/tmp
+
+override_dh_compress-indep:
+ dh_compress -X.pdf -Xexamples
+
+override_dh_strip:
+ dh_strip --dbg-package=libnormaliz0-dbg
+
+override_dh_auto_clean-indep:
+ [ ! -f doc/Makefile ] || $(MAKE) -C doc maintainer-clean
+
+get-orig-source:
+ uscan --no-conf --download-current-version --verbose
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..a56f5b4
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# 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
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..af1f709
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=dversionmangle=s/\+ds// \
+http://www.home.uni-osnabrueck.de/wbruns/normaliz/Normaliz([\d\.]+)/Normaliz([\d\.]+)\.zip \
+debian sh debian/repack
--
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