Debdiff of NMU changes attached.

-- 
Neil Roeth

diff -Nru debiandoc-sgml-1.2.31/debian/README.Debian 
debiandoc-sgml-1.2.31/debian/README.Debian
--- debiandoc-sgml-1.2.31/debian/README.Debian  2015-08-12 12:09:36.000000000 
-0400
+++ debiandoc-sgml-1.2.31/debian/README.Debian  2015-12-23 07:56:35.000000000 
-0500
@@ -174,7 +174,7 @@
 minimum example XML source "foo.dbk" with the result of following
 command.
 
-SP_CHARSET_FIXED=YES SP_ENCODING=XML nsgmls -wxml -mdeclaration/xml.soc -gues 
/usr/share/sgml/declaration/xml.dcl foo.dbk
+SP_CHARSET_FIXED=YES SP_ENCODING=XML onsgmls -wxml -mdeclaration/xml.soc -gues 
/usr/share/sgml/declaration/xml.dcl foo.dbk
 
 Multifile XML needs xsltproc command to be invoked with --xinclude option.
 
diff -Nru debiandoc-sgml-1.2.31/debian/changelog 
debiandoc-sgml-1.2.31/debian/changelog
--- debiandoc-sgml-1.2.31/debian/changelog      2015-08-12 12:09:36.000000000 
-0400
+++ debiandoc-sgml-1.2.31/debian/changelog      2016-01-18 15:28:03.000000000 
-0500
@@ -1,3 +1,16 @@
+debiandoc-sgml (1.2.31-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Bug fix: "Please change dependency on obsolete package sp":
+    - Changed obsolete sp to opensp:
+    - d/README.Debian: nsgmls -> onsgmls
+    - d/control: Changed Depends to have opensp instead of sp.
+    - tools/bin/template: Globally replaced nsgmls -> onsgmls
+    - tools/man/debiandoc-sgml.1: Globally replaced nsgmls -> onsgmls
+    - (Closes: #805061)
+    
+ -- Neil Roeth <n...@debian.org>  Mon, 18 Jan 2016 15:27:52 -0500
+
 debiandoc-sgml (1.2.31-1) unstable; urgency=medium
 
   * Support DEBIANDOC_DATE override of the <date> tag output
diff -Nru debiandoc-sgml-1.2.31/debian/control 
debiandoc-sgml-1.2.31/debian/control
--- debiandoc-sgml-1.2.31/debian/control        2015-08-12 12:09:36.000000000 
-0400
+++ debiandoc-sgml-1.2.31/debian/control        2015-12-23 07:50:45.000000000 
-0500
@@ -14,7 +14,7 @@
          libtext-format-perl,
          sgml-data,
          sgmlspl,
-         sp,
+         opensp,
          ${misc:Depends},
          ${perl:Depends}
 Recommends: ghostscript, texinfo, texlive, texlive-latex-extra
diff -Nru debiandoc-sgml-1.2.31/debian/patches/series 
debiandoc-sgml-1.2.31/debian/patches/series
--- debiandoc-sgml-1.2.31/debian/patches/series 1969-12-31 19:00:00.000000000 
-0500
+++ debiandoc-sgml-1.2.31/debian/patches/series 2015-12-23 08:37:51.000000000 
-0500
@@ -0,0 +1 @@
+sp-obsolete.patch
diff -Nru debiandoc-sgml-1.2.31/debian/patches/sp-obsolete.patch 
debiandoc-sgml-1.2.31/debian/patches/sp-obsolete.patch
--- debiandoc-sgml-1.2.31/debian/patches/sp-obsolete.patch      1969-12-31 
19:00:00.000000000 -0500
+++ debiandoc-sgml-1.2.31/debian/patches/sp-obsolete.patch      2015-12-23 
08:37:00.000000000 -0500
@@ -0,0 +1,179 @@
+Description: Replace obsolete sp packages with opensp
+Author: Neil Roeth <n...@debian.org>
+Bug-Debian: http://bugs.debian.org/805061
+Last-Update: 2015-12-23
+
+Index: debiandoc-sgml-1.2.31/tools/bin/template
+===================================================================
+--- debiandoc-sgml-1.2.31.orig/tools/bin/template
++++ debiandoc-sgml-1.2.31/tools/bin/template
+@@ -89,7 +89,7 @@ options: -h               print this hel
+ @@@start-html-dbk-text-wiki-textov-active@@@
+        -m               put comments in output
+ @@@end-html-dbk-text-wiki-textov-active@@@
+-         -n <options>     nsgmls options to be passed on
++         -n <options>     onsgmls options to be passed on
+ @@@start-html-dbk-active@@@
+          -t <topname>     topname to be used
+          -1               generate one page
+@@ -253,7 +253,7 @@ xhtml=''
+ para=''
+ @@@end-active@@@
+ locale=''
+-nsgmls=''
++onsgmls=''
+ @@@start-latexps-active@@@
+ paperopt=''
+ @@@end-latexps-active@@@
+@@ -365,11 +365,11 @@ do
+            ;;
+ @@@end-html-dbk-text-wiki-textov-active@@@
+ @@@start-info-latexdvi-latexps-latexpdf-active@@@
+-      n  ) nsgmls="-${opt} ${OPTARG} ${nsgmls}"
++      n  ) onsgmls="-${opt} ${OPTARG} ${onsgmls}"
+            ;;
+ @@@end-info-latexdvi-latexps-latexpdf-active@@@
+ @@@start-html-dbk-texinfo-latex-text-wiki-textov-active@@@
+-      n  ) nsgmls="${nsgmls} ${OPTARG}"
++      n  ) onsgmls="${onsgmls} ${OPTARG}"
+            ;;
+ @@@end-html-dbk-texinfo-latex-text-wiki-textov-active@@@
+ @@@start-html-dbk-active@@@
+@@ -423,7 +423,7 @@ fi
+ ## get input file name
+ case "${1}"
+ in
+-    -   ) nsgmlsi="-"
++    -   ) onsgmlsi="-"
+         if ${keep}
+         then
+             usage_error "-k not possible with input from stdin"
+@@ -433,9 +433,9 @@ in
+             usage_error "stdin not allowed with debiandoc2html"
+         fi
+         ;;
+-    -?* ) nsgmlsi="./${1}"
++    -?* ) onsgmlsi="./${1}"
+         ;;
+-    *   ) nsgmlsi="${1}"
++    *   ) onsgmlsi="${1}"
+         ;;
+ esac
+ 
+@@ -445,7 +445,7 @@ if [ -n "${basename}" ]
+ then
+     bsn="$(echo ${basename} | cut -d' ' -f2- | cut -d'/' -f-1)"
+ else
+-    if [ "${nsgmlsi}" != "-" ]
++    if [ "${onsgmlsi}" != "-" ]
+     then
+       bsn="$(basename ${1} .sgml)"
+       basename="-b ${bsn}"
+@@ -563,16 +563,16 @@ ext=".${ext}"
+ ## get input file name
+ case "${1}"
+ in
+-    -   ) nsgmlsi="-"
++    -   ) onsgmlsi="-"
+         if ${keep}
+         then
+             usage_error "-k not possible with input from stdin"
+         fi
+         stdout=true
+         ;;
+-    -?* ) nsgmlsi="./${1}"
++    -?* ) onsgmlsi="./${1}"
+         ;;
+-    *   ) nsgmlsi="${1}"
++    *   ) onsgmlsi="${1}"
+         ;;
+ esac
+ 
+@@ -582,7 +582,7 @@ if [ -n "${basename}" ]
+ then
+     bsn="$(echo ${basename} | cut -d' ' -f2- | cut -d'/' -f-1)"
+ else
+-    if [ "${nsgmlsi}" != "-" ]
++    if [ "${onsgmlsi}" != "-" ]
+     then
+       bsn="$(basename ${1} .sgml)"
+       basename="-b ${bsn}"
+@@ -708,7 +708,7 @@ passing_on="${passing_on} ${basename}"
+ passing_on="${passing_on} ${declaration}"
+ passing_on="${passing_on} ${keepopt}"
+ passing_on="${passing_on} ${locale}"
+-passing_on="${passing_on} ${nsgmls}"
++passing_on="${passing_on} ${onsgmls}"
+ @@@end-info-latexdvi-latexps-latexpdf-active@@@
+ @@@start-html-dbk-text-wiki-textov-active@@@
+ passing_on="${passing_on} ${comment}"
+@@ -763,7 +763,7 @@ fi
+ @@@start-html-dbk-text-wiki-textov-latex-texinfo-active@@@
+ ## ----------------------------------------------------------------------
+ ## do the actual work
+-nsgmls -oline ${nsgmls} ${declaration} ${nsgmlsi} >${tf1}
++onsgmls -oline ${onsgmls} ${declaration} ${onsgmlsi} >${tf1}
+ @@@helperdir@@@/saspconvert <${tf1} >${tf2}
+ @@@end-html-dbk-text-wiki-textov-latex-texinfo-active@@@
+ @@@start-latex-texinfo-text-wiki-textov-active@@@
+Index: debiandoc-sgml-1.2.31/tools/man/debiandoc-sgml.1
+===================================================================
+--- debiandoc-sgml-1.2.31.orig/tools/man/debiandoc-sgml.1
++++ debiandoc-sgml-1.2.31/tools/man/debiandoc-sgml.1
+@@ -19,7 +19,7 @@ debiandoc-sgml \- overview of the Debian
+ .I "[-e\ extension]"
+ .I "[-k]"
+ .I "[-l\ locale]"
+-.I "[-n\ nsgmls_options]"
++.I "[-n\ onsgmls_options]"
+ .I "[--]"
+ .I "[source]"
+ 
+@@ -314,7 +314,7 @@ Print the help message on stdout.
+ .BI -k
+ Keep the intermediate files in the directory with the output file(s).
+ This includes files in
+-.BR nsgmls (1)'s
++.BR onsgmls (1)'s
+ output format
+ .IB basename .sasp\fR
+ and
+@@ -359,9 +359,9 @@ output to use the same suffix as HTML. S
+ .B /usr/share/perl5/DebianDoc_SGML/Locale/Alias.pm
+ for exact locale names accepted (left side values).
+ .TP
+-.BI -n \ nsgmls_options
++.BI -n \ onsgmls_options
+ Pass the indicated options directly on to
+-.BR nsgmls (1).
++.BR onsgmls (1).
+ May be used more than once.
+ .TP
+ .BI --
+@@ -443,7 +443,7 @@ access to the system.
+ .\" ----------------------------------------------------------------------
+ .SH "DIAGNOSTICS"
+ Error messages from the validating SGML parser
+-.BR nsgmls (1)
++.BR onsgmls (1)
+ indicate something is wrong with
+ .IR source .
+ Make sure
+@@ -489,7 +489,7 @@ If
+ .BI debiandoc2 foo
+ is about to overwrite an already existing intermediate file, it issues
+ an appropriate warning message (except for files in 
+-.BR nsgmls (1)'s
++.BR onsgmls (1)'s
+ output format).  See the description of the
+ .B -k
+ option for a complete overview of the intermediate files.
+@@ -547,7 +547,7 @@ DebianDoc-SGML documentation in SGML (=
+ text format (currently only the SGML DTD is described)
+ .TP
+ .BR /usr/share/doc/sp/
+-SP suite (which includes the validating SGML parser nsgmls)
++OpenSP suite (which includes the validating SGML parser onsgmls)
+ documentation in HTML format
+ .TP
+ .BR basename (1)
diff -Nru debiandoc-sgml-1.2.31/debian/test.sgml 
debiandoc-sgml-1.2.31/debian/test.sgml
--- debiandoc-sgml-1.2.31/debian/test.sgml      1969-12-31 19:00:00.000000000 
-0500
+++ debiandoc-sgml-1.2.31/debian/test.sgml      2015-12-23 23:50:38.000000000 
-0500
@@ -0,0 +1,49 @@
+<!doctype debiandoc public "-//DebianDoc//DTD DebianDoc//EN">
+
+<debiandoc>
+
+<book id="Debiandoc-example">
+<title>Debiandoc example</title>
+<author>
+ <name>Osamu Aoki</name>
+ <email>os...@debian.org</email>
+</author>
+
+<version>Version 1.00 August 2007</version>
+
+<abstract>
+This provides a simple example of a debiandoc-sgml document. For testing 
conversion result.
+</abstract>
+
+<copyright>
+  <copyrightsummary>
+    Copyright &copy; 2002 by Osamu Aoki <email>os...@debian.org</>
+  </copyrightsummary>
+  <p>
+  <url id="http://www.gnu.org/copyleft/gpl.html";
+        name="This document may used under the terms of the GNU General Public 
License version 2 or higher.">
+</copyright>
+<toc sect1>  <!-- list section to sect1 -->
+
+<chapt><p>
+<sect>Funny characters
+<p>
+TEST CHAPT footnotes.
+<p>
+Following is Latex for
+en_US.UTF-8
+<example>
+</example>
+<p>
+Following is HTML for
+en_US.UTF-8
+<example>
+</example>
+<chapt>XX<p>
+TEST CHAPT comments.
+<chapt>XX<p>
+TEST CHAPT next.
+<chapt>XX<p>
+TEST CHAPT previous.
+</book>
+</debiandoc>

Reply via email to