[Pkg-octave-commit] [octave-interval] 01/01: doc/manual.texinfo: Improved patch with dquilt and a more reliable solution

[Oliver Heimlich]

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

oheim-guest pushed a commit to branch master
in repository octave-interval.

commit 1f6a967d024fa87f5a62553b06d18722189be3c9
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Fri Oct 2 23:09:00 2015 +0200

    doc/manual.texinfo: Improved patch with dquilt and a more reliable solution
---
 debian/patches/texinfo-bug46083.patch | 49 +++++++++++------------------------
 doc/manual.texinfo                    | 18 +++++++------
 2 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/debian/patches/texinfo-bug46083.patch b/debian/patches/texinfo-bug46083.patch
index 3cc0fea..bf44f7b 100644
--- a/debian/patches/texinfo-bug46083.patch
+++ b/debian/patches/texinfo-bug46083.patch
@@ -3,44 +3,25 @@ Description: Compatibility with latest TexInfo version
 DeclareUnicodeCharacter commands are mandatory in legacy TexInfo versions, but break compilation with recent TexInfo versions.  This patch fixes the build for the latter.
 
 Bug: https://savannah.gnu.org/bugs/index.php?46083
-Forwarded: not-needed
+Forwarded: no
 Author: Oliver Heimlich <oheim at posteo.de>
-Last-Update: 2015-09-30
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- octave-interval-1.1.0.orig/doc/manual.texinfo
-+++ octave-interval-1.1.0/doc/manual.texinfo
-@@ -3,13 +3,14 @@
+Last-Update: 2015-10-02
+--- a/doc/manual.texinfo
++++ b/doc/manual.texinfo
+@@ -3,6 +3,8 @@
  @settitle GNU Octave Interval Package Manual
  @documentencoding UTF-8
  @tex
--\DeclareUnicodeCharacter{00A0}{\ }
--\DeclareUnicodeCharacter{00A7}{\S}
--\DeclareUnicodeCharacter{00B2}{${}^2$}
--\DeclareUnicodeCharacter{00B7}{$\cdot$}
--\DeclareUnicodeCharacter{00BD}{1/2}
--\DeclareUnicodeCharacter{00D7}{$\times$}
--\DeclareUnicodeCharacter{00F7}{$\div$}
-+% The following 7 characters have been defined in the latest TexInfo
-+%\DeclareUnicodeCharacter{00A0}{\ }
-+%\DeclareUnicodeCharacter{00A7}{\S}
-+%\DeclareUnicodeCharacter{00B2}{${}^2$}
-+%\DeclareUnicodeCharacter{00B7}{$\cdot$}
-+%\DeclareUnicodeCharacter{00BD}{1/2}
-+%\DeclareUnicodeCharacter{00D7}{$\times$}
-+%\DeclareUnicodeCharacter{00F7}{$\div$}
++ at ifcommandnotdefined U
++% The following definitions are mandatory in TexInfo < 6 only
+ \DeclareUnicodeCharacter{00A0}{\ }
+ \DeclareUnicodeCharacter{00A7}{\S}
+ \DeclareUnicodeCharacter{00B2}{${}^2$}
+@@ -10,6 +12,7 @@
+ \DeclareUnicodeCharacter{00BD}{1/2}
+ \DeclareUnicodeCharacter{00D7}{$\times$}
+ \DeclareUnicodeCharacter{00F7}{$\div$}
++ at end ifcommandnotdefined
  \DeclareUnicodeCharacter{03C0}{$\pi$}
  \DeclareUnicodeCharacter{202F}{\thinspace}
  \DeclareUnicodeCharacter{2200}{$\forall$}
diff --git a/doc/manual.texinfo b/doc/manual.texinfo
index b5da4c2..8158069 100644
--- a/doc/manual.texinfo
+++ b/doc/manual.texinfo
@@ -3,14 +3,16 @@
 @settitle GNU Octave Interval Package Manual
 @documentencoding UTF-8
 @tex
-% The following 7 characters have been defined in the latest TexInfo
-%\DeclareUnicodeCharacter{00A0}{\ }
-%\DeclareUnicodeCharacter{00A7}{\S}
-%\DeclareUnicodeCharacter{00B2}{${}^2$}
-%\DeclareUnicodeCharacter{00B7}{$\cdot$}
-%\DeclareUnicodeCharacter{00BD}{1/2}
-%\DeclareUnicodeCharacter{00D7}{$\times$}
-%\DeclareUnicodeCharacter{00F7}{$\div$}
+ at ifcommandnotdefined U
+% The following definitions are mandatory in TexInfo < 6 only
+\DeclareUnicodeCharacter{00A0}{\ }
+\DeclareUnicodeCharacter{00A7}{\S}
+\DeclareUnicodeCharacter{00B2}{${}^2$}
+\DeclareUnicodeCharacter{00B7}{$\cdot$}
+\DeclareUnicodeCharacter{00BD}{1/2}
+\DeclareUnicodeCharacter{00D7}{$\times$}
+\DeclareUnicodeCharacter{00F7}{$\div$}
+ at end ifcommandnotdefined
 \DeclareUnicodeCharacter{03C0}{$\pi$}
 \DeclareUnicodeCharacter{202F}{\thinspace}
 \DeclareUnicodeCharacter{2200}{$\forall$}

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-interval.git