[4ti2] 03/03: refresh d/patches/debianization-documentation*.patch

Jerome Benoit calculus-guest at moszumanska.debian.org
Wed Jan 28 14:46:56 UTC 2015


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

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

commit 67d6136cb676432c482e47216c67c15b7c897274
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Wed Jan 28 14:58:31 2015 +0100

    refresh d/patches/debianization-documentation*.patch
---
 debian/changelog                                   |   2 +-
 .../debianization-documentation-prefix.patch       | 164 +++++++++++++++++++++
 debian/patches/debianization-documentation.patch   |  42 +++++-
 debian/patches/series                              |   1 +
 debian/scripts/debianization-doc-prefix.sed        |  16 ++
 5 files changed, 221 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f022cdc..b53acf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,4 +35,4 @@
     - tutorial and WWW samples, provide.
   * Fixes have been submitted to the upstream maintainers.
 
- -- Jerome Benoit <calculus at rezozer.net>  Wed, 28 Jan 2015 12:46:57 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 28 Jan 2015 14:16:35 +0000
diff --git a/debian/patches/debianization-documentation-prefix.patch b/debian/patches/debianization-documentation-prefix.patch
new file mode 100644
index 0000000..0d00793
--- /dev/null
+++ b/debian/patches/debianization-documentation-prefix.patch
@@ -0,0 +1,164 @@
+Description: debianization: documentation -- prefix
+ Address Debian Policy requirements for documentation.
+ Consistency requirement: prepend in the documentation
+ 4ti2- to the names of the 4ti2 tools with respect
+ to the Debian package approach for preventing from
+ possible collisions.
+ This is a Debian centric patch.
+Origin: debian
+Forwarded: not-needed
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-01-28
+
+--- a/doc/4ti2_manual_advanced.tex
++++ b/doc/4ti2_manual_advanced.tex
+@@ -93,11 +93,11 @@
+ \end{center}
+ and then call
+ \begin{center}
+-{\tt ./qsolve PROJECT}
++{\tt 4ti2-qsolve PROJECT}
+ \end{center}
+ and
+ \begin{center}
+-{\tt ./zsolve PROJECT}
++{\tt 4ti2-zsolve PROJECT}
+ \end{center}
+ In the continuous case, this creates the files \File{PROJECT.qhom}
+ and \File{PROJECT.qfree}, and in the integer case this creates the
+--- a/doc/4ti2_manual_beginner.tex
++++ b/doc/4ti2_manual_beginner.tex
+@@ -199,7 +199,7 @@
+ \end{center}
+ and then call
+ \begin{center}
+-{\tt ./qsolve system}
++{\tt 4ti2-qsolve system}
+ \end{center}
+ This call creates three files
+ \begin{center}
+@@ -259,7 +259,7 @@
+ \end{center}
+ Then, however, we call
+ \begin{center}
+-{\tt ./zsolve system}
++{\tt 4ti2-zsolve system}
+ \end{center}
+ This call creates three files
+ \begin{center}
+@@ -370,7 +370,7 @@
+ \end{center}
+ Now we call
+ \begin{center}
+-{\tt ./rays magic3x3}
++{\tt 4ti2-rays magic3x3}
+ \end{center}
+ which creates the single file
+ \begin{center}
+@@ -417,7 +417,7 @@
+ \end{center}
+ for this computation. However, to compute the Hilbert basis, we call
+ \begin{center}
+-{\tt ./hilbert magic3x3}
++{\tt 4ti2-hilbert magic3x3}
+ \end{center}
+ which creates the single output file
+ \begin{center}
+@@ -501,7 +501,7 @@
+ \end{center}
+ and call
+ \begin{myverbatim}
+-./graver ppi3
++4ti2-graver ppi3
+ \end{myverbatim}
+ This call will create an output file \File{ppi3.gra} that looks
+ like:
+@@ -541,14 +541,14 @@
+ identities is implemented in the function \File{ppi} of
+ \FourTiTwo{}. Try running
+ \begin{myverbatim}
+-./ppi 17
++4ti2-ppi 17
+ \end{myverbatim}
+ which creates two files \File{ppi17.mat} (so we do not really have
+ to create this file ourselves) and the file \File{ppi17.gra}
+ containing the desired identities. Compare this running time with
+ the time taken by
+ \begin{myverbatim}
+-./graver ppi17
++4ti2-graver ppi17
+ \end{myverbatim}
+ Do you notice the speed-up?
+ 
+@@ -577,7 +577,7 @@
+ \end{center}
+ as above and call
+ \begin{myverbatim}
+-./circuits ppi3
++4ti2-circuits ppi3
+ \end{myverbatim}
+ This call will create an output file \File{ppi3.cir} that looks
+ like:
+@@ -643,7 +643,7 @@
+ \File{4coins.rel}, since already by default all relations are
+ assumed to be equations. Now we simply call
+ \begin{center}
+-{\tt ./minimize 4coins}
++{\tt 4ti2-minimize 4coins}
+ \end{center}
+ which creates the single output file
+ \begin{center}
+@@ -668,7 +668,7 @@
+ {\bf Remark.} We could also specify a list of right-hand sides in
+ \File{4coins.rhs}. The call
+ \begin{center}
+-{\tt ./minimize 4coins}
++{\tt 4ti2-minimize 4coins}
+ \end{center}
+ then creates a file \File{4coins.min} containing minima to the
+ corresponding integer programs. \eoproof
+@@ -696,7 +696,7 @@
+ is, $c^\intercal v < c^\intercal u$ implies $x^v\prec x^u$. This
+ toric Gr\"obner basis is computed by
+ \begin{center}
+-{\tt ./groebner 4coins}
++{\tt 4ti2-groebner 4coins}
+ \end{center}
+ and gives the output file
+ \begin{center}
+@@ -726,7 +726,7 @@
+ \end{center}
+ and call
+ \begin{center}
+-{\tt ./normalform 4coins}
++{\tt 4ti2-normalform 4coins}
+ \end{center}
+ to produce the file
+ \begin{center}
+@@ -746,7 +746,7 @@
+ {\bf Remark.} We could also specify a list of feasible solutions in
+ \File{4coins.zfeas}. Then the call
+ \begin{center}
+-{\tt ./normalform 4coins}
++{\tt 4ti2-normalform 4coins}
+ \end{center}
+ creates a file \File{4coins.nf} containing the minima to the
+ corresponding integer programs. (If $z_0$ is a feasible solution,
+@@ -838,7 +838,7 @@
+ \end{center}
+ Let us compute the Markov basis via the call
+ \begin{center}
+-{\tt ./markov 4x4}
++{\tt 4ti2-markov 4x4}
+ \end{center}
+ which creates a single output file \File{4x4.mar} containing the
+ $36$ Markov basis elements. Up to symmetry (swapping rows or
+@@ -884,7 +884,7 @@
+ \end{center}
+ and call
+ \begin{center}
+-{\tt ./genmodel 3x6}
++{\tt 4ti2-genmodel 3x6}
+ \end{center}
+ to produce the desired matrix file \File{3x6.mat}.
+ 
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
index 52a41c8..6e237f4 100644
--- a/debian/patches/debianization-documentation.patch
+++ b/debian/patches/debianization-documentation.patch
@@ -6,12 +6,12 @@ Description: debianization: documentation
 Origin: debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-11-25
+Last-Update: 2014-01-28
 
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
 @@ -1,7 +1,28 @@
-+export TEXINPUTS = $(abs_top_srcdir)/doc:
++export TEXINPUTS = $(abs_top_srcdir)/doc:$(abs_top_srcdir):
 +export BIBINPUTS = $(abs_top_srcdir)/debian/adhoc/doc
 +export BSTINPUTS = $(BIBINPUTS)
 +
@@ -41,7 +41,43 @@ Last-Update: 2014-11-25
  	4ti2_manual.aux				\
 --- a/doc/4ti2_manual.tex
 +++ b/doc/4ti2_manual.tex
-@@ -147,7 +147,7 @@
+@@ -106,12 +106,12 @@
+ 
+ \thispagestyle{empty}
+ 
+-\title{User's Guide for \FourTiTwo{} version 1.6}
++\title{User's Guide for \FourTiTwo{} version 1.6 (Debian)}
+ 
+ \author{A software package\\ for algebraic,
+ geometric and combinatorial problems on linear spaces}
+-\date{September 2, 2013}
+-%\date{\today}
++%\date{September 2, 2013}
++\date{\today}
+ 
+ \maketitle
+ 
+@@ -130,24 +130,24 @@
+ \chapter{README: Instructions on configuring and building 4ti2}
+ 
+ {\small
+-\verbatiminput{../README}
++\verbatiminput{README}
+ }
+ 
+ \chapter{NEWS: Changes to 4ti2 since version 1.2}
+ 
+ {\small
+-\verbatiminput{../NEWS}
++\verbatiminput{NEWS}
+ }
+ 
+ \clearpage
+ \addcontentsline{toc}{chapter}{The 4ti2 team}
+ \chapter*{AUTHORS: The 4ti2 team}
+ 
+-\verbatiminput{../AUTHORS}
++\verbatiminput{AUTHORS}
  
  \clearpage
  \addcontentsline{toc}{chapter}{Bibliography}
diff --git a/debian/patches/series b/debian/patches/series
index a66bac0..06ee40e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ upstream-autotoolization-private_shared_scheme.patch
 debianization.patch
 debianization-prefix.patch
 debianization-documentation.patch
+debianization-documentation-prefix.patch
diff --git a/debian/scripts/debianization-doc-prefix.sed b/debian/scripts/debianization-doc-prefix.sed
new file mode 100644
index 0000000..7aab724
--- /dev/null
+++ b/debian/scripts/debianization-doc-prefix.sed
@@ -0,0 +1,16 @@
+s at ./circuits at 4ti2-circuits@g
+s at ./genmodel at 4ti2-genmodel@g
+s at ./gensymm at 4ti2-gensymm@g
+s at ./graver at 4ti2-graver@g
+s at ./groebner at 4ti2-groebner@g
+s at ./hilbert at 4ti2-hilbert@g
+s at ./markov at 4ti2-markov@g
+s at ./minimize at 4ti2-minimize@g
+s at ./normalform at 4ti2-normalform@g
+s at ./output at 4ti2-output@g
+s at ./ppi at 4ti2-ppi@g
+s at ./qsolve at 4ti2-qsolve@g
+s at ./rays at 4ti2-rays@g
+s at ./walk at 4ti2-walk@g
+s at ./zbasis at 4ti2-zbasis@g
+s at ./zsolve at 4ti2-zsolve@g

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



More information about the debian-science-commits mailing list