--- sgml2x-1.0.0.orig/Makefile
+++ sgml2x-1.0.0/Makefile
@@ -102,7 +102,7 @@
 	bin/docbook-2-html ${DB2XOPTS} -s nwalsh $<
 
 %.txt: %-html
-	links -dump $</t1.html >$@
+	elinks -no-home -dump $</t1.htm >$@
 
 clean::
 	rm -f *.ps *.pdf *.fot *~
--- sgml2x-1.0.0.orig/bin/rlatex
+++ sgml2x-1.0.0/bin/rlatex
@@ -5,27 +5,25 @@
 LATEXPRG=${LATEXPRG:-latex}
 
 while true; do
-    pid=$$
-    export pid
-    rm -f /tmp/rlok$pid
-    (
-	if ${LATEXPRG} $*
+    RLSOTMP=$(mktemp /tmp/RLSO.XXXXXXXX)
+    RLOKTMP="xxx"
+
+	if ${LATEXPRG} $* | tee $RLSOTMP
 	then
-	    touch /tmp/rlok$pid
+		RLOKTMP=$(mktemp /tmp/rlok.XXXXXXXX)
 	fi
-    ) | tee /tmp/rlso$pid
 
-    if [ ! -f /tmp/rlok$pid ]
-    then
-	rm -f /tmp/rlso$pid
+	if [ $RLOKTMP = "xxx" ]
+	then
 	echo >&2 "$(basename $0): Exiting in error"
 	exit 1
-    fi
+	fi
 
-    if ! grep -E '^(LaTeX Warning: (Label\(s\) may|There were undefined references)|Package longtable Warning: Table widths have changed)' /tmp/rlso$pid >/dev/null
+    if ! grep -E '^(LaTeX Warning: (Label\(s\) may|There were undefined references)|Package longtable Warning: Table widths have changed)' $RLSOTMP >/dev/null
     then
-	rm -f /tmp/rlso$pid
+	rm -f $RLSOTMP
 	exit 0
     fi
     echo "Re-running LaTeX"
+	rm -f $RLSOTMP $RLOKTMP
 done
--- sgml2x-1.0.0.orig/bin/sgml2x
+++ sgml2x-1.0.0/bin/sgml2x
@@ -91,24 +91,24 @@
     -C|--confdirs	use (whitespace-separated) list of confdirs
 			(cumulative)
 			default: "${DEFAULTCONFDIRS}"
-    -r|--remarks	include remarks in document
     -D|--dssslproc <dsssl-processor>
 			select the dsssl processor to use
+    -h|--help           this help message
     -j|--jade <dsssl-processor>
 			[DEPRECATED] synonym for --dssslproc
-    -o|--openjade	[DEPRECATED] use openjade to format (now the default)
-    -O|--jadeopts <jade-options>
-			pass additionnal options to jade (cumulative)
     --jadetexfilter <perl-filter>
 			a perl filter, with enough quotes (use -n to check)
 
     -n|--no-act		print commands instead of running them
+    -o|--openjade	[DEPRECATED] use openjade to format (now the default)
+    -O|--jadeopts <jade-options>
+			pass additionnal options to jade (cumulative)
     -q|--quiet		set verbosity to 0
+    -r|--remarks	include remarks in document
+    -s|--style <style>	select output style (see below for list)
     -v|--verbose	increase verbosity (cumulative)
-    -V|--version	print the version of this program
     --verbosity <level>	set verbosity to <level> (default: "default")
-
-    -s|--style <style>	select output style
+    -V|--version	print the version of this program
 
 	Standard styles:
 EOF
@@ -357,7 +357,8 @@
 	styles=$(
 	    for style in ${styles}
 	    do
-		eval echo \${INHERITS_${SINGLEDOCCLASS}_${backend}_${style}} ${style}
+		eval local inherits=\${INHERITS_${SINGLEDOCCLASS}_${backend}_${style}}
+		[ -z "$inherits" ] || echo ${inherits} ${style}
 	    done | tsort
 	)
 
@@ -547,7 +548,7 @@
     *.xml)
 	SRCFORMAT=xml
 	# XML files must be prefixed with the XML declaration to be parsed 
-	XMLDECL=/usr/lib/sgml/declaration/xml.decl
+	XMLDECL=/usr/share/sgml/declaration/xml.decl
 	[ -r $XMLDECL ] || error "cannot find XML declaration $XMLDECL"
 	NAMEROOT="${SRC%.xml}"
 	PREFIXSRC=$XMLDECL
--- sgml2x-1.0.0.orig/catalog
+++ sgml2x-1.0.0/catalog
@@ -4,4 +4,4 @@
   "stylesheet/dsssl/docbook/misc/doctype.dsl"
 
 PUBLIC "-//GtkViaAlcove//DOCUMENT Gtk-doc HTML Stylesheet//EN"
-  "/usr/share/gtk-doc/gtk-doc.dsl"
+  "/usr/share/gtk-doc/data/gtk-doc.dsl"
--- sgml2x-1.0.0.orig/catalog-installable.in
+++ sgml2x-1.0.0/catalog-installable.in
@@ -9,4 +9,4 @@
 -- Foreign StyleSheets --
 
 PUBLIC "-//GtkViaAlcove//DOCUMENT Gtk-doc HTML Stylesheet//EN"
-  "/usr/share/gtk-doc/gtk-doc.dsl"
+  "/usr/share/gtk-doc/data/gtk-doc.dsl"
--- sgml2x-1.0.0.orig/debian/changelog
+++ sgml2x-1.0.0/debian/changelog
@@ -1,3 +1,133 @@
+sgml2x (1.0.0-11.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Removed dependencies on jade and openjade1.3 which are
+    obsolete. (Closes: #810299).
+
+ -- Neil Roeth <neil@debian.org>  Mon, 25 Jan 2016 20:30:28 -0500
+
+sgml2x (1.0.0-11.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rebuild against debhelper (>= 9.20120528) to fix postinst that
+    unconditionally overwrites files in /etc (see: #477751, closes: #675490).
+    Thanks to Helmut Grohne for the bug report.
+
+ -- Jakub Wilk <jwilk@debian.org>  Sat, 09 Jun 2012 11:47:35 +0200
+
+sgml2x (1.0.0-11.2) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix possible symlink attacks in rlatex by using mktemp to create
+    temporary files in a secure way (Closes: #496368)
+
+ -- Nico Golde <nion@debian.org>  Wed, 27 Aug 2008 14:14:43 +0200
+
+sgml2x (1.0.0-11.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Makefile - Call elinks, not links. (Closes: #461041).
+  * Make clean not ignore errors.
+  * Bump debhelper build-dep and compat to 5.
+  * Update Standards Version to 3.7.3.
+    + Make debhelper build-depends to satisfy clean.
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat, 02 Feb 2008 22:42:17 -0500
+
+sgml2x (1.0.0-11) unstable; urgency=low
+
+  * Added build-dep on docbook-dsssl (Closes: #326052).
+
+ -- Yann Dirson <dirson@debian.org>  Sat, 10 Sep 2005 11:42:23 +0200
+
+sgml2x (1.0.0-10) unstable; urgency=low
+
+  * Added openjade to the builddeps: since sgml2x html docs are built
+    using the package, most deps are also builddeps (Closes: #326052).
+  * Updated FSF address in copyright file (lintian).
+  * Bumped Standards-Version to 3.6.2, no change.
+
+ -- Yann Dirson <dirson@debian.org>  Sat,  3 Sep 2005 11:27:20 +0200
+
+sgml2x (1.0.0-9) unstable; urgency=low
+
+  * Call links with -no-home flag to avoid failure when building in a
+    chroot (Closes: #296976 but I hate this - looks like bad behaviour
+    from elinks).
+
+ -- Yann Dirson <dirson@debian.org>  Mon, 28 Feb 2005 23:11:39 +0100
+
+sgml2x (1.0.0-8) unstable; urgency=medium
+
+  * docbook-dsssl does not use .html support any more, let's look for .htm
+    (Closes: #287199).
+  * Urgency medium to get this RC bug fixed in sarge quickly.
+  * Corrected case for short description (thanks lintian).
+
+ -- Yann Dirson <dirson@debian.org>  Wed,  5 Jan 2005 20:57:54 +0100
+
+sgml2x (1.0.0-7) unstable; urgency=low
+
+  * Fixed path to the XML declaration (Closes: #238938).
+
+ -- Yann Dirson <dirson@debian.org>  Tue, 23 Mar 2004 13:58:13 +0100
+
+sgml2x (1.0.0-6) unstable; urgency=low
+
+  * Added a dependency on openjade for its DSSSL stylesheet, which we need
+    even if we're to use jade or openjade1.3 (Closes: #221025).
+
+ -- Yann Dirson <dirson@debian.org>  Sun, 16 Nov 2003 21:18:14 +0100
+
+sgml2x (1.0.0-5) unstable; urgency=low
+
+  * Use openjade's DTD instead of old jade's one for doctype.dsl, and
+    declare the features required by the scroll (Closes: #186492).
+
+ -- Yann Dirson <dirson@debian.org>  Wed, 29 Oct 2003 21:17:08 +0100
+
+sgml2x (1.0.0-4) unstable; urgency=low
+
+  * Install contents of examples/ directory (Closes: #217820).
+  * Updated sgml2x manpage:
+   - document --jadetexfilter.
+   - have obsolete --openjade refer to --dssslproc instead of
+    also-obsolete --jade.
+   - document -D shorthand for --dssslproc, moved andtry to its
+    alphabetical place.
+   - document --jade as obsolete.
+  * Updated sgml2x --help output:
+   - list flags in alphabetic order.
+   - added --help.
+  * Wrap doctype.dsl output in a scroll flow-object, in an attempt to
+    conform to the standard and be accepted by openjade 1.4devel.  That's
+    still not sufficient, but that's a start and that doesn't hurt -
+    investigation under way.
+
+ -- Yann Dirson <dirson@debian.org>  Tue, 28 Oct 2003 22:09:35 +0100
+
+sgml2x (1.0.0-3) unstable; urgency=medium
+
+  * Fixed bug in input to tsort, which sometimes hit a safeguard
+    introduced in coreutils 5.0.1 (Closes: #206239).  Causes other
+    packages to FTBFS.
+
+ -- Yann Dirson <dirson@debian.org>  Tue,  2 Sep 2003 17:40:12 +0200
+
+sgml2x (1.0.0-2) unstable; urgency=low
+
+  * Updated catalog files for new location of gtk stylesheets; accordingly
+    versionned the Recommends (Closes: #201330).
+
+ -- Yann Dirson <dirson@debian.org>  Tue, 15 Jul 2003 21:13:38 +0200
+
+sgml2x (1.0.0-1) unstable; urgency=low 
+  
+  * Official Debian package. 
+  * Re-applied dh_installcatalog patch. 
+ 
+ -- Yann Dirson <dirson@debian.org>  Sun, 11 May 2003 21:38:34 +0200
+ 
 sgml2x (1.0.0-0.0upstream) unstable; urgency=low
 
   * Added manpages for runjade and rlatex.
--- sgml2x-1.0.0.orig/debian/compat
+++ sgml2x-1.0.0/debian/compat
@@ -1 +1 @@
-4
+5
--- sgml2x-1.0.0.orig/debian/control
+++ sgml2x-1.0.0/debian/control
@@ -2,17 +2,18 @@
 Section: text
 Priority: optional
 Maintainer: Yann Dirson <dirson@debian.org>
-Build-Depends-Indep: debhelper (>> 4), docbook-to-man, elinks, opensp, openjade1.3
-Standards-Version: 3.5.9
+Build-Depends: debhelper (>> 5.0.0)
+Build-Depends-Indep: docbook-to-man, elinks, opensp, openjade, docbook-dsssl
+Standards-Version: 3.7.3
 
 Package: sgml2x
 Architecture: all
-Depends: opensp, openjade1.3 | openjade | jade, jadetex, ${misc:Depends}
-Recommends: docbook-dsssl | docbook-stylesheets | alcovebook-sgml | sgmltools-lite | gtk-doc-tools
+Depends: opensp, openjade, jadetex, ${misc:Depends}
+Recommends: docbook-dsssl | docbook-stylesheets | alcovebook-sgml | sgmltools-lite | gtk-doc-tools (>= 1.1-1)
 Suggests: docbook-dsssl, sgmltools-lite, gtk-doc-tools, alcovebook-sgml
 Replaces: alcovebook-sgml (<< 0.0.999)
 Conflicts: alcovebook-sgml (<< 0.0.999)
-Description: Generic formatter for SGML/XML documents using DSSSL stylesheets
+Description: generic formatter for SGML/XML documents using DSSSL stylesheets
  sgml2x allows to easily format SGML and XML documents using DSSSL
  stylesheets, and provides the following features:
   * Multiple possible stylesheets per document class
--- sgml2x-1.0.0.orig/debian/copyright
+++ sgml2x-1.0.0/debian/copyright
@@ -19,5 +19,5 @@
 You should have received a copy of the GNU General Public License with
 your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with
 the dpkg source package as the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA.
--- sgml2x-1.0.0.orig/debian/postinst
+++ sgml2x-1.0.0/debian/postinst
@@ -2,7 +2,4 @@
 
 set -e
 
-install-sgmlcatalog --install /usr/share/sgml/misc/sgml2x.catalog \
-    sgml2x
-
 #DEBHELPER#
--- sgml2x-1.0.0.orig/debian/prerm
+++ sgml2x-1.0.0/debian/prerm
@@ -2,6 +2,4 @@
 
 set -e
 
-install-sgmlcatalog --remove sgml2x
-
 #DEBHELPER#
--- sgml2x-1.0.0.orig/debian/rules
+++ sgml2x-1.0.0/debian/rules
@@ -15,7 +15,7 @@
 	dh_testroot
 	rm -f build-stamp
 
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
 	dh_clean
 
@@ -32,8 +32,9 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-#	dh_installcatalogs
+	dh_installcatalogs
 	dh_installdocs
+	dh_installexamples examples/*
 	dh_installchangelogs 
 	dh_compress
 	dh_fixperms
--- sgml2x-1.0.0.orig/debian/semantic.cache
+++ sgml2x-1.0.0/debian/semantic.cache
@@ -0,0 +1,14 @@
+;; Object debian/
+;; SEMANTICDB Tags save file
+(semanticdb-project-database-file "debian/"
+  :tables (list 
+   (semanticdb-table "rules"
+    :major-mode 'makefile-mode
+    :tags 'nil
+    :file "rules"
+    )
+   )
+  :file "semantic.cache"
+  :semantic-tag-version "2.0beta3"
+  :semanticdb-version "2.0beta3"
+  )
--- sgml2x-1.0.0.orig/doc/sgml2x.sgml
+++ sgml2x-1.0.0/doc/sgml2x.sgml
@@ -127,14 +127,7 @@
       </glossentry>
 
       <glossentry>
-	<glossterm><option>-h</>|<option>--help</></glossterm>
-	<glossdef>
-	  <para>Display an help message and exit.</para>
-	</glossdef>
-      </glossentry>
-
-      <glossentry>
-	<glossterm><option>-j</>|<option>--jade</>|<option>--dssslproc</> <replaceable>dsssl-processor</></glossterm>
+	<glossterm><option>-D</>|<option>--dssslproc</> <replaceable>dsssl-processor</></glossterm>
 	<glossdef>
 	  <para>Use <replaceable>dsssl-processor</> to apply the
 	  style-sheet, instead of the default one.  This processor has
@@ -148,6 +141,35 @@
       </glossentry>
 
       <glossentry>
+	<glossterm><option>-h</>|<option>--help</></glossterm>
+	<glossdef>
+	  <para>Display an help message and exit.</para>
+	</glossdef>
+      </glossentry>
+
+      <glossentry>
+	<glossterm><option>-j</>|<option>--jade</> <replaceable>dsssl-processor</></glossterm>
+	<glossdef>
+	  <para>Obsolete synonym for <option>--dssslproc</option>.</para>
+	</glossdef>
+      </glossentry>
+
+      <glossentry> 
+        <glossterm><option>--jadetexfilter</> <replaceable>perl-filter</></glossterm> 
+        <glossdef> 
+          <para>Post-process the jadetex output using a perl filter.</para>
+
+	  <para>This can be useful to force pagebreaks at some
+	  specific places to overcome stylesheet problems, or to force
+	  hyphenations where TeX does not have enough patterns, or do
+	  any other clever transformation you'd think about.</para>
+
+	  <para>See the <filename>examples/command-lines</filename>
+	  file for possible uses.</para>
+	</glossdef>
+      </glossentry>
+
+      <glossentry>
 	<glossterm><option>-n</option>|<option>--no-act</option></glossterm>
 	<glossdef>
 	  <para>Print commands instead of running them.  Useful to
@@ -161,7 +183,7 @@
 	<glossdef>
 	  <para><emphasis role="strong">This option is obsolete</>.
 	  <command>openjade</> is now the default when available.  Use
-	  <option>--jade</> or a <filename>dssslproc</> configuration
+	  <option>--dssslproc</> or a <filename>dssslproc</> configuration
 	  file to force a specific processor.</para>
 
 	  <para>This option used to use <citerefentry>
--- sgml2x-1.0.0.orig/semantic.cache
+++ sgml2x-1.0.0/semantic.cache
@@ -0,0 +1,14 @@
+;; Object sgml2x-1.0.0/
+;; SEMANTICDB Tags save file
+(semanticdb-project-database-file "sgml2x-1.0.0/"
+  :tables (list 
+   (semanticdb-table "Makefile"
+    :major-mode 'makefile-mode
+    :tags 'nil
+    :file "Makefile"
+    )
+   )
+  :file "semantic.cache"
+  :semantic-tag-version "2.0beta3"
+  :semanticdb-version "2.0beta3"
+  )
--- sgml2x-1.0.0.orig/stylesheet/dsssl/docbook/misc/doctype.dsl
+++ sgml2x-1.0.0/stylesheet/dsssl/docbook/misc/doctype.dsl
@@ -7,8 +7,12 @@
 		-//Alcove//DOCUMENT DocBook DocumentClass Stylesheet//EN
 -->
 
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN">
+<!DOCTYPE style-sheet PUBLIC "-//OpenJade//DTD DSSSL Specification//EN">
 <style-sheet>
+  <features>online</features>
+  <features>expression</features>
+  <features>query</features>
+
   <style-specification id="print">
     <style-specification-body>
 
@@ -21,9 +25,11 @@
 		     (attribute-string (general-name-normalize "role"
 							       root-element)
 				       root-element) )))
-      (literal (if role
-		   role
-		   ""))))
+      (make scroll
+	(make paragraph
+	  (literal (if role
+		       role
+		       ""))))))
 
     </style-specification-body>
   </style-specification>