[normaliz] 03/03: Imported Debian patch 3.0.0+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sun Oct 11 05:47:07 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 8eef9703d4a5013eaced709696dac4ad6a8a412d
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sun Oct 11 07:08:08 2015 +0200
Imported Debian patch 3.0.0+ds-1
---
debian/changelog | 16 ++-
debian/clean | 1 +
debian/libnormaliz0.lintian-overrides | 5 -
debian/normaliz-doc.examples | 2 +-
debian/patches/debianization-examples.patch | 28 ----
debian/patches/series | 2 -
...m-source-libnormailz-system_wide_includes.patch | 154 ---------------------
debian/rules | 1 -
8 files changed, 16 insertions(+), 193 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8f69c5..c9457f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
normaliz (3.0.0+ds-1) unstable; urgency=medium
- * New upstream version.
+ * New upstream version:
+ - thanks for the upstream maintainer team for rendering further the
+ upstream source more suitable for distribution packaging;
+ - and for integrating the last upstream debian patches.
* Upload to unstable.
+ * Debianization:
+ - debian/copyright:
+ - Files-Excluded field, refresh;
+ - debian/watch:
+ - update;
+ - debian/rules:
+ - refresh;
+ - debian/patches/*:
+ - refresh.
- -- Jerome Benoit <calculus at rezozer.net> Sun, 11 Oct 2015 03:59:29 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sun, 11 Oct 2015 05:27:10 +0000
normaliz (2.99.4+ds-1) experimental; urgency=medium
diff --git a/debian/clean b/debian/clean
index 20366a8..0bc0825 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,3 +5,4 @@ doc/Normaliz.toc
doc/Normaliz.aux
doc/Normaliz.pdf
normaliz.1
+test/test-mm/*.mod
diff --git a/debian/libnormaliz0.lintian-overrides b/debian/libnormaliz0.lintian-overrides
index 6b4f9f1..9ef090e 100644
--- a/debian/libnormaliz0.lintian-overrides
+++ b/debian/libnormaliz0.lintian-overrides
@@ -1,7 +1,2 @@
# the upstream source contains C++ code, and has no clearly defined and versionned ABI
libnormaliz0: no-symbols-control-file
-
-# the upstream source seems to contain some experimental code of its own with
-# a wild exit(0) : request to comment this part was sent to the upstream team
-# -- Jerome Benoit <calculus at rezozer.net>
-libnormaliz0: shlib-calls-exit
diff --git a/debian/normaliz-doc.examples b/debian/normaliz-doc.examples
index c6dba2f..0bbe99e 100644
--- a/debian/normaliz-doc.examples
+++ b/debian/normaliz-doc.examples
@@ -1 +1 @@
-debian/tmp/usr/share/doc/normaliz/examples/*
+example/*
diff --git a/debian/patches/debianization-examples.patch b/debian/patches/debianization-examples.patch
deleted file mode 100644
index 73fafcb..0000000
--- a/debian/patches/debianization-examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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,18 @@
-+docdir ?= /usr/share/doc/normaliz
-+docexamplesdir = $(docdir)/examples
-+
-+LISTOF_DISTRIBUTED_DATUM = $(wildcard *)
-+
-+LISTOF_DUPLICATE_DATUM = \
-+ PluralityVsCutoffSemi.in.new \
-+ 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 PluralityVsCutoffSemi.in PluralityVsCutoffSemi.in.new
diff --git a/debian/patches/series b/debian/patches/series
index f4bdfc1..acb4d6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-upstream-source-libnormailz-system_wide_includes.patch
debianization.patch
debianization-documentation.patch
-debianization-examples.patch
diff --git a/debian/patches/upstream-source-libnormailz-system_wide_includes.patch b/debian/patches/upstream-source-libnormailz-system_wide_includes.patch
deleted file mode 100644
index 4e272bc..0000000
--- a/debian/patches/upstream-source-libnormailz-system_wide_includes.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-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-09-02
-
---- 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/libnormaliz.h"
--#include "libnormaliz/cone_property.h"
--#include "libnormaliz/sublattice_representation.h"
--#include "libnormaliz/matrix.h"
--#include "libnormaliz/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/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -147,6 +147,8 @@
- ENDIF (NMZ_SCIP)
-
-
-+INCLUDE_DIRECTORIES(.)
-+
- # find gmp
- FIND_PACKAGE(GMP REQUIRED)
- INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
---- a/source/libnormaliz/general.h
-+++ b/source/libnormaliz/general.h
-@@ -49,8 +49,8 @@
-
- } /* end namespace libnormaliz */
-
--#include "libnormaliz/libnormaliz.h"
--#include "libnormaliz/normaliz_exception.h"
--#include "libnormaliz/cone_property.h"
-+#include <libnormaliz/libnormaliz.h>
-+#include <libnormaliz/normaliz_exception.h>
-+#include <libnormaliz/cone_property.h>
-
- #endif /* GENERAL_H_ */
---- a/source/libnormaliz/integer.h
-+++ b/source/libnormaliz/integer.h
-@@ -24,7 +24,7 @@
- #ifndef INTEGER_H_
- #define INTEGER_H_
-
--#include "libnormaliz/general.h"
-+#include <libnormaliz/general.h>
-
- #include <list>
- #include <vector>
---- a/source/libnormaliz/matrix.h
-+++ b/source/libnormaliz/matrix.h
-@@ -32,9 +32,9 @@
- #include <iostream>
- #include <string>
-
--#include "libnormaliz/libnormaliz.h"
--#include "libnormaliz/integer.h"
--#include "libnormaliz/convert.h"
-+#include <libnormaliz/libnormaliz.h>
-+#include <libnormaliz/integer.h>
-+#include <libnormaliz/convert.h>
-
- //---------------------------------------------------------------------------
-
---- a/source/libnormaliz/normaliz_exception.h
-+++ b/source/libnormaliz/normaliz_exception.h
-@@ -25,8 +25,8 @@
- #define NORMALIZ_EXEPTION_H_
-
- #include <exception>
--#include "libnormaliz/libnormaliz.h"
--#include "libnormaliz/cone_property.h"
-+#include <libnormaliz/libnormaliz.h>
-+#include <libnormaliz/cone_property.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/libnormaliz.h"
--#include "libnormaliz/matrix.h"
-+#include <libnormaliz/libnormaliz.h>
-+#include <libnormaliz/matrix.h>
-
- //---------------------------------------------------------------------------
-
---- a/source/libnormaliz/vector_operations.h
-+++ b/source/libnormaliz/vector_operations.h
-@@ -29,9 +29,9 @@
- #include <ostream>
- #include <list>
-
--#include "libnormaliz/libnormaliz.h"
--#include "libnormaliz/integer.h"
--#include "libnormaliz/convert.h"
-+#include <libnormaliz/libnormaliz.h>
-+#include <libnormaliz/integer.h>
-+#include <libnormaliz/convert.h>
-
- namespace libnormaliz {
- using std::vector;
---- a/source/libnormaliz/HilbertSeries.h
-+++ b/source/libnormaliz/HilbertSeries.h
-@@ -50,7 +50,7 @@
- #include <ostream>
- #include <string>
-
--#include "libnormaliz/general.h"
-+#include <libnormaliz/general.h>
-
- //---------------------------------------------------------------------------
-
---- a/source/libnormaliz/convert.h
-+++ b/source/libnormaliz/convert.h
-@@ -29,8 +29,8 @@
- //---------------------------------------------------------------------------
-
- //#include <ostream>
--#include "libnormaliz/normaliz_exception.h"
--#include "libnormaliz/integer.h"
-+#include <libnormaliz/normaliz_exception.h>
-+#include <libnormaliz/integer.h>
-
- namespace libnormaliz {
- //using std::ostream;
---- a/source/libnormaliz/libnormaliz.h
-+++ b/source/libnormaliz/libnormaliz.h
-@@ -27,7 +27,7 @@
- #include <iostream>
- #include <string>
-
--#include "libnormaliz/version.h"
-+#include <libnormaliz/version.h>
-
- namespace libnormaliz {
-
diff --git a/debian/rules b/debian/rules
index a71b7ab..4f0d827 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ override_dh_prep-arch:
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 example install DESTDIR=$(CURDIR)/debian/tmp
override_dh_compress-indep:
dh_compress -X.pdf -Xexamples
--
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