[gap-sonata] 01/01: Corrected Imported Zeroth Debian patch 2.8+ds-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Sun Dec 11 01:38:09 UTC 2016 

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

calculus-guest pushed a commit to branch master
in repository gap-sonata.

commit ac27aa01bcbd3956c3903a17b69b0c17187ea4c8
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sun Dec 11 01:34:44 2016 +0000

    Corrected Imported Zeroth Debian patch  2.8+ds-1
---
 debian/changelog                                   |  2 +-
 debian/gap-sonata.doc-base.ref                     |  1 -
 debian/gap-sonata.doc-base.tut                     |  1 -
 debian/gap-sonata.install                          |  8 +---
 debian/patches/debianization.patch                 | 23 +++++------
 debian/patches/series                              |  1 +
 .../upstream-fix-documentation-composition.patch   | 46 ++++++++++++++++++++++
 7 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58649b2..f529acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ gap-sonata (2.8+ds-1) unstable; urgency=medium
 
   * Initial release (Closes: #847547).
 
- -- Jerome Benoit <calculus at rezozer.net>  Sat, 10 Dec 2016 05:00:24 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Sun, 11 Dec 2016 01:24:23 +0000
diff --git a/debian/gap-sonata.doc-base.ref b/debian/gap-sonata.doc-base.ref
index 3b2daf5..5195f3a 100644
--- a/debian/gap-sonata.doc-base.ref
+++ b/debian/gap-sonata.doc-base.ref
@@ -7,7 +7,6 @@ Author: the SONATA Team:
   Peter Mayr
   Christof Nöbauer
 Abstract:
- WIP
  This reference manual describes in details the SONATA GAP package.
  This package provides methods for the construction and analysis of
  finite nearrings; SONATA stands for `systems of nearrings and their
diff --git a/debian/gap-sonata.doc-base.tut b/debian/gap-sonata.doc-base.tut
index d153e3f..1cf5c0e 100644
--- a/debian/gap-sonata.doc-base.tut
+++ b/debian/gap-sonata.doc-base.tut
@@ -7,7 +7,6 @@ Author: the SONATA Team:
   Peter Mayr
   Christof Nöbauer
 Abstract:
- WIP
  This tutorial manual introduces us to the SONATA GAP package. This package
  provides methods for the construction and analysis of finite nearrings;
  SONATA stands for `systems of nearrings and their applications'.
diff --git a/debian/gap-sonata.install b/debian/gap-sonata.install
index 6277328..29d77ba 100644
--- a/debian/gap-sonata.install
+++ b/debian/gap-sonata.install
@@ -1,9 +1,3 @@
-PackageInfo.g init.g read.g usr/share/gap/pkg/sonata
-lib usr/share/gap/pkg/sonata
-grp usr/share/gap/pkg/sonata
-nr  usr/share/gap/pkg/sonata
-nri usr/share/gap/pkg/sonata
-tst usr/share/gap/pkg/sonata
-htm usr/share/gap/pkg/sonata
+PackageInfo.g init.g read.g lib grp nr nri tst htm       usr/share/gap/pkg/sonata
 doc/ref/manual.lab doc/ref/manual.six doc/ref/manual.pdf usr/share/gap/pkg/sonata/doc/ref
 doc/tut/manual.lab doc/tut/manual.six doc/tut/manual.pdf usr/share/gap/pkg/sonata/doc/tut
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 1729bdc..1b15c86 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,7 +4,7 @@ Description: debianization
 Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-12-09
+Last-Update: 2016-12-11
 
 --- a/doc/ref/manual.tex
 +++ b/doc/ref/manual.tex
@@ -24,7 +24,7 @@ Last-Update: 2016-12-09
    \TitlePage{
 --- a/doc/make_doc
 +++ b/doc/make_doc
-@@ -4,32 +4,42 @@
+@@ -4,31 +4,41 @@
  #W  make_doc        make SONATA Package documentation     Alexander Hulpke
  ##
  
@@ -43,17 +43,17 @@ Last-Update: 2016-12-09
  # CAVEAT: For version 2.4 manualindex did not produce a proper file manual.mst
  # for the reference-manual, hence no index. Copying manual.mst for the
  # tutorial-manual into the directory ref/ did the trick.
--(cd ref;tex manual;bibtex manual\
--tex manual; ../../doc/manualindex manual\
--tex manual;pdftex manual;pdftex manual)
+-(cd ref;tex manual; bibtex manual; \
+-tex manual; ../../doc/manualindex manual; \
+-tex manual; pdftex manual; pdftex manual)
 +(cd ref; $PDFTEX manual; $BIBTEX manual;\
 +$PDFTEX manual; $GAPMANUALINDEX manual;\
 +$PDFTEX manual; $PDFTEX manual; $PDFTEX manual;)
  
  echo "TeXing documentation:tut"
--(cd tut;tex manual;bibtex manual\
--tex manual; ../../doc/manualindex manual\
--tex manual;pdftex manual;pdftex manual)
+-(cd tut;tex manual; bibtex manual; \
+-tex manual; ../../doc/manualindex manual; \
+-tex manual; pdftex manual; pdftex manual)
 +(cd tut; $PDFTEX manual; $BIBTEX manual;\
 +$PDFTEX manual; $GAPMANUALINDEX manual;\
 +$PDFTEX manual; $PDFTEX manual; $PDFTEX manual;)
@@ -64,16 +64,13 @@ Last-Update: 2016-12-09
  mkdir -p ../htm/tut
  echo "Creating HTML documentation:ref"
 -(cd ref;../convert.pl -t -c -n SONATA . ../../htm/ref)
--(cd ../htm/ref;for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp)
 +(cd ref; $GAPCONVERT -t -c -n SONATA . ../../htm/ref)
-+(cd ../htm/ref; for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp;)
+ (cd ../htm/ref;for d in *.htm; do sed -i -e 's|<cite>\([^ .,]\+\)</cite>|<cite>[\1]</cite>|g' $d ; done;)
  
  #(cd ref;/home/staff/juergen/SSOONNAATTAA/gap/etc/convert.pl -t -c -n SONATA . ../../htm/ref)
  echo "Creating HTML documentation:tut"
 -(cd tut;../convert.pl -t -c -n SONATA-tutorial . ../../htm/tut)
--(cd ../htm/tut;for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp)
 +(cd tut; $GAPCONVERT -t -c -n SONATA-tutorial . ../../htm/tut)
-+(cd ../htm/tut; for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp;)
+ (cd ../htm/tut;for d in *.htm; do sed -i -e 's|<cite>\([^ .,]\+\)</cite>|<cite>[\1]</cite>|g' $d ; done;)
  #(cd tut;/home/staff/juergen/SSOONNAATTAA/gap/etc/convert.pl -t -c -n SONATA-tutorial . ../../htm/tut)
  #########################################################################
- ##
diff --git a/debian/patches/series b/debian/patches/series
index 9b5890f..a15e645 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream-fix-documentation-composition.patch
 debianization.patch
 debianization-tests.patch
diff --git a/debian/patches/upstream-fix-documentation-composition.patch b/debian/patches/upstream-fix-documentation-composition.patch
new file mode 100644
index 0000000..4591bc8
--- /dev/null
+++ b/debian/patches/upstream-fix-documentation-composition.patch
@@ -0,0 +1,46 @@
+Description: fix: document composition
+ Correct oddities in the upstream doc/make_doc script;
+ meant to be submitted to the upstream team.
+Origin: vendor, Debian
+Forwarded: by-email
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-12-11
+
+--- a/doc/make_doc
++++ b/doc/make_doc
+@@ -9,14 +9,14 @@
+ # CAVEAT: For version 2.4 manualindex did not produce a proper file manual.mst
+ # for the reference-manual, hence no index. Copying manual.mst for the
+ # tutorial-manual into the directory ref/ did the trick.
+-(cd ref;tex manual;bibtex manual\
+-tex manual; ../../doc/manualindex manual\
+-tex manual;pdftex manual;pdftex manual)
++(cd ref;tex manual; bibtex manual; \
++tex manual; ../../doc/manualindex manual; \
++tex manual; pdftex manual; pdftex manual)
+ 
+ echo "TeXing documentation:tut"
+-(cd tut;tex manual;bibtex manual\
+-tex manual; ../../doc/manualindex manual\
+-tex manual;pdftex manual;pdftex manual)
++(cd tut;tex manual; bibtex manual; \
++tex manual; ../../doc/manualindex manual; \
++tex manual; pdftex manual; pdftex manual)
+ 
+ # The HTML version of the manual
+ mkdir -p ../htm
+@@ -24,12 +24,12 @@
+ mkdir -p ../htm/tut
+ echo "Creating HTML documentation:ref"
+ (cd ref;../convert.pl -t -c -n SONATA . ../../htm/ref)
+-(cd ../htm/ref;for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp)
++(cd ../htm/ref;for d in *.htm; do sed -i -e 's|<cite>\([^ .,]\+\)</cite>|<cite>[\1]</cite>|g' $d ; done;)
+ 
+ #(cd ref;/home/staff/juergen/SSOONNAATTAA/gap/etc/convert.pl -t -c -n SONATA . ../../htm/ref)
+ echo "Creating HTML documentation:tut"
+ (cd tut;../convert.pl -t -c -n SONATA-tutorial . ../../htm/tut)
+-(cd ../htm/tut;for d in *.htm; do sed 's/cite\([^ .,]\+\)/[\1]/g' < $d > tmp; cp tmp $d; done; rm -f tmp)
++(cd ../htm/tut;for d in *.htm; do sed -i -e 's|<cite>\([^ .,]\+\)</cite>|<cite>[\1]</cite>|g' $d ; done;)
+ #(cd tut;/home/staff/juergen/SSOONNAATTAA/gap/etc/convert.pl -t -c -n SONATA-tutorial . ../../htm/tut)
+ #########################################################################
+ ##

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

More information about the debian-science-commits mailing list