On Friday, 19 January 2018 01:43:42 AEDT Stuart Prescott wrote:
> Dear maintainers of plastex,
>
> On Monday, 8 January 2018 23:40:14 AEDT Stuart Prescott wrote:
> > Control: tags -1 patch
> >
> > The attached patch does the minimum that is required to update the
> > package.
> >
> > There's a lot more that could be done with this package (including a new
> > upstream release from a few years ago) but this is a start...
>
> The attached is a patch series that I intend to include in an NMU shortly
> unless someone else beats me to it.
>
> The patches sit on top of the current DMPT git and I would include the
> changes that are sitting there but never uploaded. The source in git does
> not currently build at all (the patches get applied twice which fails) and
> so this is also fixed.
>
> The main objective is, of course, to fix bug #866454.
>
> regards
> Stuart
debdiff of the uploaded NMU attached (includes all the stuff that is in git
since previous uploads, not just my changes); merge request also created on
salsa, since that's probably much more convenient than the debdiff to get a
nice history.
https://salsa.debian.org/python-team/modules/plastex/merge_requests/1
Stuart
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
diff -Nru plastex-0.9.2/debian/changelog plastex-0.9.2/debian/changelog
--- plastex-0.9.2/debian/changelog 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/changelog 2018-02-17 11:31:00.000000000 +1100
@@ -1,3 +1,27 @@
+plastex (0.9.2-1.2) unstable; urgency=low
+
+ [ Stuart Prescott ]
+ * Non-maintainer upload.
+ * Replace python-imaging dependencies with python-pil (Closes: #866454).
+ * Switch to source format 3.0 (quilt) so that the package actually builds
+ following the svn to git-dpm conversion.
+
+ [ Carl Fürstenberg ]
+ * override lintian warning wrong-section-according-to-package-name, we stick
+ in tex as it's 51% tex and 49% python.
+
+ [ Bernd Zeimetz ]
+ * --ignore-theme-extras was renamed to --no-theme-extras, update manpage.
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+ * d/control: Set Vcs-* to salsa.debian.org
+
+ -- Stuart Prescott <stu...@debian.org> Sat, 17 Feb 2018 11:31:00 +1100
+
plastex (0.9.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru plastex-0.9.2/debian/control plastex-0.9.2/debian/control
--- plastex-0.9.2/debian/control 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/control 2018-02-17 11:31:00.000000000 +1100
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Carl Fürstenberg <azat...@gmail.com>
Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org>
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/plastex/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/plastex/trunk/
+Vcs-Git: https://salsa.debian.org/python-team/modules/plastex.git
+Vcs-Browser: https://salsa.debian.org/python-team/modules/plastex
Build-Depends: debhelper (>= 6.0.11),
cdbs (>= 0.4.52),
quilt,
@@ -16,13 +16,13 @@
libxml-libxml-perl,
texlive-base-bin,
dvipng,
- python-imaging
+ python-pil
Standards-Version: 3.8.3
Homepage: http://plastex.sourceforge.net/
Package: python-plastex
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, texlive-latex-base, dvipng, python-imaging
+Depends: ${python:Depends}, ${misc:Depends}, texlive-latex-base, dvipng, python-pil
Recommends: python-kid, python-genshi, python-cheetah
Description: LaTeX document processing framework in Python
plasTeX is a collection of Python frameworks that allow you to process LaTeX
diff -Nru plastex-0.9.2/debian/.git-dpm plastex-0.9.2/debian/.git-dpm
--- plastex-0.9.2/debian/.git-dpm 1970-01-01 10:00:00.000000000 +1000
+++ plastex-0.9.2/debian/.git-dpm 2018-02-17 11:31:00.000000000 +1100
@@ -0,0 +1,11 @@
+# see git-dpm(1) from git-dpm package
+da1f27ed74922546b3d2c24a12b9220286fed09e
+da1f27ed74922546b3d2c24a12b9220286fed09e
+2608b19d80f036aed0b7830cf1e2f6c15a8ce701
+2608b19d80f036aed0b7830cf1e2f6c15a8ce701
+plastex_0.9.2.orig.tar.gz
+0c31769164018961e81276648efcf954419bad72
+865856
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff -Nru plastex-0.9.2/debian/patches/02_shebang.diff plastex-0.9.2/debian/patches/02_shebang.diff
--- plastex-0.9.2/debian/patches/02_shebang.diff 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/patches/02_shebang.diff 2018-02-17 11:31:00.000000000 +1100
@@ -1,1134 +1,1251 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_shebang.dpatch by Carl Fürstenberg <azat...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Removes "shebangs" from non-executable python module files
+From da1f27ed74922546b3d2c24a12b9220286fed09e Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-t...@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:14:25 -0700
+Subject: 02_shebang.diff
@DPATCH@
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Accents.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Accents.py 2007-10-22 22:51:37.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Accents.py 2009-11-17 17:17:04.000000000 +0100
+Patch-Name: 02_shebang.diff
+---
+ plasTeX/Base/LaTeX/Accents.py | 2 +-
+ plasTeX/Base/LaTeX/Alignment.py | 2 +-
+ plasTeX/Base/LaTeX/Arrays.py | 2 +-
+ plasTeX/Base/LaTeX/Bibliography.py | 2 +-
+ plasTeX/Base/LaTeX/Boxes.py | 2 +-
+ plasTeX/Base/LaTeX/Breaking.py | 2 +-
+ plasTeX/Base/LaTeX/Characters.py | 2 +-
+ plasTeX/Base/LaTeX/Crossref.py | 2 +-
+ plasTeX/Base/LaTeX/Declarations.py | 2 +-
+ plasTeX/Base/LaTeX/Definitions.py | 2 +-
+ plasTeX/Base/LaTeX/Document.py | 2 +-
+ plasTeX/Base/LaTeX/Entities.py | 2 +-
+ plasTeX/Base/LaTeX/Environments.py | 2 +-
+ plasTeX/Base/LaTeX/Files.py | 2 +-
+ plasTeX/Base/LaTeX/Floats.py | 2 +-
+ plasTeX/Base/LaTeX/FontSelection.py | 2 +-
+ plasTeX/Base/LaTeX/Footnotes.py | 2 +-
+ plasTeX/Base/LaTeX/Index.py | 2 +-
+ plasTeX/Base/LaTeX/Lengths.py | 2 +-
+ plasTeX/Base/LaTeX/Lists.py | 2 +-
+ plasTeX/Base/LaTeX/Math.py | 2 +-
+ plasTeX/Base/LaTeX/Numbering.py | 2 +-
+ plasTeX/Base/LaTeX/Packages.py | 2 +-
+ plasTeX/Base/LaTeX/Paragraphs.py | 2 +-
+ plasTeX/Base/LaTeX/Pictures.py | 2 +-
+ plasTeX/Base/LaTeX/Quotations.py | 2 +-
+ plasTeX/Base/LaTeX/Sectioning.py | 2 +-
+ plasTeX/Base/LaTeX/Sentences.py | 2 +-
+ plasTeX/Base/LaTeX/Space.py | 2 +-
+ plasTeX/Base/LaTeX/Tabbing.py | 2 +-
+ plasTeX/Base/LaTeX/Verbatim.py | 2 +-
+ plasTeX/Base/LaTeX/__init__.py | 2 +-
+ plasTeX/Base/TeX/Fonts.py | 2 +-
+ plasTeX/Base/TeX/Parameters.py | 2 +-
+ plasTeX/Base/TeX/Primitives.py | 2 +-
+ plasTeX/Base/TeX/Registers.py | 2 +-
+ plasTeX/Base/TeX/Text.py | 2 +-
+ plasTeX/Base/TeX/__init__.py | 2 +-
+ plasTeX/Base/__init__.py | 2 +-
+ plasTeX/Config.py | 2 +-
+ plasTeX/ConfigManager/Boolean.py | 2 +-
+ plasTeX/ConfigManager/Compound.py | 2 +-
+ plasTeX/ConfigManager/Counted.py | 2 +-
+ plasTeX/ConfigManager/Directories.py | 2 +-
+ plasTeX/ConfigManager/Files.py | 2 +-
+ plasTeX/ConfigManager/Float.py | 2 +-
+ plasTeX/ConfigManager/Generic.py | 2 +-
+ plasTeX/ConfigManager/Integer.py | 2 +-
+ plasTeX/ConfigManager/Multi.py | 2 +-
+ plasTeX/ConfigManager/String.py | 2 +-
+ plasTeX/ConfigManager/__init__.py | 2 +-
+ plasTeX/Context.py | 2 +-
+ plasTeX/DOM/__init__.py | 2 +-
+ plasTeX/Filenames.py | 2 +-
+ plasTeX/Imagers/OSXCoreGraphics.py | 2 +-
+ plasTeX/Imagers/__init__.py | 2 +-
+ plasTeX/Imagers/dvi2bitmap.py | 2 +-
+ plasTeX/Imagers/dvipng.py | 2 +-
+ plasTeX/Imagers/dvisvgm.py | 2 +-
+ plasTeX/Imagers/gsdvipng.py | 2 +-
+ plasTeX/Imagers/gspdfpng.py | 2 +-
+ plasTeX/Logging.py | 2 +-
+ plasTeX/Packages/CJK.py | 2 +-
+ plasTeX/Packages/__init__.py | 2 +-
+ plasTeX/Packages/alltt.py | 2 +-
+ plasTeX/Packages/amsart.py | 2 +-
+ plasTeX/Packages/amsfonts.py | 2 +-
+ plasTeX/Packages/amsmath.py | 2 +-
+ plasTeX/Packages/article.py | 2 +-
+ plasTeX/Packages/babel.py | 2 +-
+ plasTeX/Packages/beamer.py | 2 +-
+ plasTeX/Packages/book.py | 2 +-
+ plasTeX/Packages/changebar.py | 2 +-
+ plasTeX/Packages/color.py | 2 +-
+ plasTeX/Packages/comment.py | 2 +-
+ plasTeX/Packages/fancybox.py | 2 +-
+ plasTeX/Packages/fancyhdr.py | 2 +-
+ plasTeX/Packages/fancyvrb.py | 2 +-
+ plasTeX/Packages/float.py | 2 +-
+ plasTeX/Packages/fontenc.py | 2 +-
+ plasTeX/Packages/geometry.py | 2 +-
+ plasTeX/Packages/graphics.py | 2 +-
+ plasTeX/Packages/graphicx.py | 2 +-
+ plasTeX/Packages/hyperref.py | 2 +-
+ plasTeX/Packages/ifpdf.py | 2 +-
+ plasTeX/Packages/ifthen.py | 2 +-
+ plasTeX/Packages/keyval.py | 2 +-
+ plasTeX/Packages/lipsum.py | 2 +-
+ plasTeX/Packages/longtable.py | 2 +-
+ plasTeX/Packages/makeidx.py | 2 +-
+ plasTeX/Packages/memoir.py | 2 +-
+ plasTeX/Packages/minitoc.py | 2 +-
+ plasTeX/Packages/natbib.py | 2 +-
+ plasTeX/Packages/report.py | 2 +-
+ plasTeX/Packages/rotating.py | 2 +-
+ plasTeX/Packages/shortvrb.py | 2 +-
+ plasTeX/Packages/subfig.py | 2 +-
+ plasTeX/Packages/subfigure.py | 2 +-
+ plasTeX/Packages/textcomp.py | 2 +-
+ plasTeX/Packages/url.py | 2 +-
+ plasTeX/Packages/verbatim.py | 2 +-
+ plasTeX/Packages/wrapfig.py | 2 +-
+ plasTeX/Renderers/DocBook/__init__.py | 2 +-
+ plasTeX/Renderers/ManPage/__init__.py | 2 +-
+ plasTeX/Renderers/PageTemplate/__init__.py | 2 +-
+ plasTeX/Renderers/S5/__init__.py | 2 +-
+ plasTeX/Renderers/Text/__init__.py | 2 +-
+ plasTeX/Renderers/XHTML/__init__.py | 2 +-
+ plasTeX/Renderers/ZPT/__init__.py | 2 +-
+ plasTeX/Renderers/__init__.py | 2 +-
+ plasTeX/TeX.py | 2 +-
+ plasTeX/Tokenizer.py | 2 +-
+ plasTeX/__init__.py | 2 +-
+ plasTeX/dictutils.py | 2 +-
+ 114 files changed, 114 insertions(+), 114 deletions(-)
+
+diff --git a/plasTeX/Base/LaTeX/Accents.py b/plasTeX/Base/LaTeX/Accents.py
+index b5694fe..f536098 100644
+--- a/plasTeX/Base/LaTeX/Accents.py
++++ b/plasTeX/Base/LaTeX/Accents.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.3.4 Accents and Special Symbols (p173)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Alignment.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Alignment.py 2006-06-09 21:59:13.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Alignment.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Alignment.py b/plasTeX/Base/LaTeX/Alignment.py
+index ce8c875..f707f9e 100644
+--- a/plasTeX/Base/LaTeX/Alignment.py
++++ b/plasTeX/Base/LaTeX/Alignment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Arrays.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Arrays.py 2007-12-04 04:56:47.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Arrays.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Arrays.py b/plasTeX/Base/LaTeX/Arrays.py
+index 8d6c6b2..d623a0b 100644
+--- a/plasTeX/Base/LaTeX/Arrays.py
++++ b/plasTeX/Base/LaTeX/Arrays.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.10.2 The array and tabular Environments
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Bibliography.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Bibliography.py 2008-07-29 21:20:49.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Bibliography.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Bibliography.py b/plasTeX/Base/LaTeX/Bibliography.py
+index db52223..589ad15 100644
+--- a/plasTeX/Base/LaTeX/Bibliography.py
++++ b/plasTeX/Base/LaTeX/Bibliography.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.11.3 Bibliography and Citation (p208)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Boxes.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Boxes.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Boxes.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Boxes.py b/plasTeX/Base/LaTeX/Boxes.py
+index 434c68e..5b8a8e8 100644
+--- a/plasTeX/Base/LaTeX/Boxes.py
++++ b/plasTeX/Base/LaTeX/Boxes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.13.3 Boxes (p217)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Breaking.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Breaking.py 2005-01-13 22:06:08.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Breaking.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Breaking.py b/plasTeX/Base/LaTeX/Breaking.py
+index 8e1734e..3329c0c 100644
+--- a/plasTeX/Base/LaTeX/Breaking.py
++++ b/plasTeX/Base/LaTeX/Breaking.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.12 Line and Page Breaking (p212)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Characters.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Characters.py 2006-05-22 21:52:04.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Characters.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Characters.py b/plasTeX/Base/LaTeX/Characters.py
+index 66da32a..b6a7f95 100755
+--- a/plasTeX/Base/LaTeX/Characters.py
++++ b/plasTeX/Base/LaTeX/Characters.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
These macros are actually taken from the T1 font encoding package, but
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Crossref.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Crossref.py 2006-09-18 17:21:46.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Crossref.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Crossref.py b/plasTeX/Base/LaTeX/Crossref.py
+index 6538bc1..d98abe4 100644
+--- a/plasTeX/Base/LaTeX/Crossref.py
++++ b/plasTeX/Base/LaTeX/Crossref.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.11.2 Cross-References (p209)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Declarations.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Declarations.py 2005-01-13 22:06:08.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Declarations.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Declarations.py b/plasTeX/Base/LaTeX/Declarations.py
+index 9314b0e..6f4de71 100644
+--- a/plasTeX/Base/LaTeX/Declarations.py
++++ b/plasTeX/Base/LaTeX/Declarations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.1.4 Declarations (p168)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Definitions.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Definitions.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Definitions.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Definitions.py b/plasTeX/Base/LaTeX/Definitions.py
+index 0f72645..6ebf665 100644
+--- a/plasTeX/Base/LaTeX/Definitions.py
++++ b/plasTeX/Base/LaTeX/Definitions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.8 Definitions, Numbering, and Programming
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Document.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Document.py 2008-12-16 20:59:54.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Document.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Document.py b/plasTeX/Base/LaTeX/Document.py
+index bdfd728..3f21492 100644
+--- a/plasTeX/Base/LaTeX/Document.py
++++ b/plasTeX/Base/LaTeX/Document.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.2 The Structure of the Document (p170)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Entities.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Entities.py 2007-09-13 18:17:56.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Entities.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Entities.py b/plasTeX/Base/LaTeX/Entities.py
+index e64141c..d9fd661 100755
+--- a/plasTeX/Base/LaTeX/Entities.py
++++ b/plasTeX/Base/LaTeX/Entities.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
This package is dynamically generated. It loads data from the ent.xml file.
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Environments.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Environments.py 2006-12-07 15:48:32.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Environments.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Environments.py b/plasTeX/Base/LaTeX/Environments.py
+index b0ef160..5c411f5 100644
+--- a/plasTeX/Base/LaTeX/Environments.py
++++ b/plasTeX/Base/LaTeX/Environments.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.1.2 Environments (p167)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Files.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Files.py 2006-11-17 21:59:36.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Files.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Files.py b/plasTeX/Base/LaTeX/Files.py
+index e230195..bead9b4 100644
+--- a/plasTeX/Base/LaTeX/Files.py
++++ b/plasTeX/Base/LaTeX/Files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.11.1 Files (p206)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Floats.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Floats.py 2007-08-16 22:38:15.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Floats.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Floats.py b/plasTeX/Base/LaTeX/Floats.py
+index 6c54ef8..e043623 100644
+--- a/plasTeX/Base/LaTeX/Floats.py
++++ b/plasTeX/Base/LaTeX/Floats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.9 Figures and Other Floating Bodies (p196)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/FontSelection.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/FontSelection.py 2006-06-29 17:00:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/FontSelection.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/FontSelection.py b/plasTeX/Base/LaTeX/FontSelection.py
+index 8c8d222..8b15c71 100644
+--- a/plasTeX/Base/LaTeX/FontSelection.py
++++ b/plasTeX/Base/LaTeX/FontSelection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.15 Font Selection (p225)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Footnotes.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Footnotes.py 2007-11-02 16:06:23.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Footnotes.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Footnotes.py b/plasTeX/Base/LaTeX/Footnotes.py
+index 384d18d..c4e3254 100644
+--- a/plasTeX/Base/LaTeX/Footnotes.py
++++ b/plasTeX/Base/LaTeX/Footnotes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.3.3 Footnotes (p172)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Index.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Index.py 2009-05-15 20:10:36.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Index.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Index.py b/plasTeX/Base/LaTeX/Index.py
+index f700dcf..2bcbf0a 100644
+--- a/plasTeX/Base/LaTeX/Index.py
++++ b/plasTeX/Base/LaTeX/Index.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.11.5 Index and Glossary (p211)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Lengths.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Lengths.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Lengths.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Lengths.py b/plasTeX/Base/LaTeX/Lengths.py
+index 313c720..d39cbe1 100644
+--- a/plasTeX/Base/LaTeX/Lengths.py
++++ b/plasTeX/Base/LaTeX/Lengths.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.13.1 Length (p215)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Lists.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Lists.py 2007-11-06 18:40:40.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Lists.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Lists.py b/plasTeX/Base/LaTeX/Lists.py
+index 546509f..37df880 100644
+--- a/plasTeX/Base/LaTeX/Lists.py
++++ b/plasTeX/Base/LaTeX/Lists.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.6.2 List-Making Environments
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Math.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Math.py 2007-12-13 17:30:23.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Math.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Math.py b/plasTeX/Base/LaTeX/Math.py
+index c403bb7..324ed93 100644
+--- a/plasTeX/Base/LaTeX/Math.py
++++ b/plasTeX/Base/LaTeX/Math.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.7 Mathematical Formulas (p187)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Numbering.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Numbering.py 2006-06-29 17:00:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Numbering.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Numbering.py b/plasTeX/Base/LaTeX/Numbering.py
+index 4963bfd..5896caf 100644
+--- a/plasTeX/Base/LaTeX/Numbering.py
++++ b/plasTeX/Base/LaTeX/Numbering.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.8.4 Numbering (p194)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Packages.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Packages.py 2009-05-12 18:36:14.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Packages.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Packages.py b/plasTeX/Base/LaTeX/Packages.py
+index 6e8208d..c356cd2 100644
+--- a/plasTeX/Base/LaTeX/Packages.py
++++ b/plasTeX/Base/LaTeX/Packages.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.5 Classes, Packages, and Page Styles (p176)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Paragraphs.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Paragraphs.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Paragraphs.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Paragraphs.py b/plasTeX/Base/LaTeX/Paragraphs.py
+index 0aca5b0..42c2143 100644
+--- a/plasTeX/Base/LaTeX/Paragraphs.py
++++ b/plasTeX/Base/LaTeX/Paragraphs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.3.2 Making Paragraphs (p171)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Pictures.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Pictures.py 2007-08-16 22:38:15.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Pictures.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Pictures.py b/plasTeX/Base/LaTeX/Pictures.py
+index 38695b2..8f6bf2c 100644
+--- a/plasTeX/Base/LaTeX/Pictures.py
++++ b/plasTeX/Base/LaTeX/Pictures.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.14.1 The picture Environment (p219)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Quotations.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Quotations.py 2006-06-09 21:59:13.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Quotations.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Quotations.py b/plasTeX/Base/LaTeX/Quotations.py
+index 95a77ef..b598d88 100644
+--- a/plasTeX/Base/LaTeX/Quotations.py
++++ b/plasTeX/Base/LaTeX/Quotations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.6.1 Quotations and Verse (p184)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Sectioning.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Sectioning.py 2007-11-02 16:06:23.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Sectioning.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Sectioning.py b/plasTeX/Base/LaTeX/Sectioning.py
+index 19a4c1c..50ea40f 100644
+--- a/plasTeX/Base/LaTeX/Sectioning.py
++++ b/plasTeX/Base/LaTeX/Sectioning.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.4 Sectioning and Table of Contents (p174)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Sentences.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Sentences.py 2007-08-24 19:51:24.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Sentences.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Sentences.py b/plasTeX/Base/LaTeX/Sentences.py
+index 36ce4da..7850956 100644
+--- a/plasTeX/Base/LaTeX/Sentences.py
++++ b/plasTeX/Base/LaTeX/Sentences.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.3.1 Making Sentences (p170)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Space.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Space.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Space.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Space.py b/plasTeX/Base/LaTeX/Space.py
+index 52e7551..5a07e16 100644
+--- a/plasTeX/Base/LaTeX/Space.py
++++ b/plasTeX/Base/LaTeX/Space.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.13.2 Space (p216)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Tabbing.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Tabbing.py 2006-06-09 21:59:13.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Tabbing.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Tabbing.py b/plasTeX/Base/LaTeX/Tabbing.py
+index cb3366b..2e10918 100644
+--- a/plasTeX/Base/LaTeX/Tabbing.py
++++ b/plasTeX/Base/LaTeX/Tabbing.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.10.1 The tabbing Environment (p201)
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/Verbatim.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/Verbatim.py 2007-08-16 22:38:15.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/Verbatim.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/Verbatim.py b/plasTeX/Base/LaTeX/Verbatim.py
+index f4d7e62..09a7ce4 100644
+--- a/plasTeX/Base/LaTeX/Verbatim.py
++++ b/plasTeX/Base/LaTeX/Verbatim.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
C.6.4 Verbatim
-Index: plastex-0.9.2/plasTeX/Base/LaTeX/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/LaTeX/__init__.py 2006-06-29 17:00:49.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/LaTeX/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/LaTeX/__init__.py b/plasTeX/Base/LaTeX/__init__.py
+index fe0852c..d17e55c 100644
+--- a/plasTeX/Base/LaTeX/__init__.py
++++ b/plasTeX/Base/LaTeX/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Entities import *
-Index: plastex-0.9.2/plasTeX/Base/TeX/Fonts.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/Fonts.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/TeX/Fonts.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/Fonts.py b/plasTeX/Base/TeX/Fonts.py
+index 2e1d3b3..2f1307a 100644
+--- a/plasTeX/Base/TeX/Fonts.py
++++ b/plasTeX/Base/TeX/Fonts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
B.4 Font Information
-Index: plastex-0.9.2/plasTeX/Base/TeX/Parameters.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/Parameters.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/TeX/Parameters.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/Parameters.py b/plasTeX/Base/TeX/Parameters.py
+index c31ec3d..c59ecef 100644
+--- a/plasTeX/Base/TeX/Parameters.py
++++ b/plasTeX/Base/TeX/Parameters.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
B.3 Parameters
-Index: plastex-0.9.2/plasTeX/Base/TeX/Primitives.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/Primitives.py 2007-02-06 23:42:43.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/TeX/Primitives.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/Primitives.py b/plasTeX/Base/TeX/Primitives.py
+index 8b0907f..aaf267e 100644
+--- a/plasTeX/Base/TeX/Primitives.py
++++ b/plasTeX/Base/TeX/Primitives.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import codecs
from plasTeX.Tokenizer import Token, EscapeSequence
-Index: plastex-0.9.2/plasTeX/Base/TeX/Registers.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/Registers.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/TeX/Registers.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/Registers.py b/plasTeX/Base/TeX/Registers.py
+index 3bb2b5e..1fedffb 100644
+--- a/plasTeX/Base/TeX/Registers.py
++++ b/plasTeX/Base/TeX/Registers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
B.2 Allocation of Registers (p346)
-Index: plastex-0.9.2/plasTeX/Base/TeX/Text.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/Text.py 2007-05-29 21:23:15.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Base/TeX/Text.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/Text.py b/plasTeX/Base/TeX/Text.py
+index 54bd081..07bfc86 100644
+--- a/plasTeX/Base/TeX/Text.py
++++ b/plasTeX/Base/TeX/Text.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
B.5 Macros for text
-Index: plastex-0.9.2/plasTeX/Base/TeX/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/TeX/__init__.py 2005-01-14 03:06:19.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/TeX/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/TeX/__init__.py b/plasTeX/Base/TeX/__init__.py
+index 7a0ed32..8f7b7d4 100644
+--- a/plasTeX/Base/TeX/__init__.py
++++ b/plasTeX/Base/TeX/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Fonts import *
from Parameters import *
-Index: plastex-0.9.2/plasTeX/Base/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Base/__init__.py 2005-01-13 22:06:07.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Base/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Base/__init__.py b/plasTeX/Base/__init__.py
+index 219a8dd..6fef030 100644
+--- a/plasTeX/Base/__init__.py
++++ b/plasTeX/Base/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from LaTeX import *
from TeX import *
-Index: plastex-0.9.2/plasTeX/Config.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Config.py 2008-01-09 16:29:33.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Config.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Config.py b/plasTeX/Config.py
+index c9c33a7..4e1f435 100644
+--- a/plasTeX/Config.py
++++ b/plasTeX/Config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from ConfigManager import *
-Index: plastex-0.9.2/plasTeX/ConfigManager/Boolean.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Boolean.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/Boolean.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Boolean.py b/plasTeX/ConfigManager/Boolean.py
+index dcfe26e..ba8bfb2 100644
+--- a/plasTeX/ConfigManager/Boolean.py
++++ b/plasTeX/ConfigManager/Boolean.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Generic import *
from plasTeX.ConfigManager import InvalidOptionError
-Index: plastex-0.9.2/plasTeX/ConfigManager/Compound.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Compound.py 2006-05-05 22:17:23.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/Compound.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Compound.py b/plasTeX/ConfigManager/Compound.py
+index 3ca27be..b2ed636 100644
+--- a/plasTeX/ConfigManager/Compound.py
++++ b/plasTeX/ConfigManager/Compound.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import re
from Generic import GenericArgument
-Index: plastex-0.9.2/plasTeX/ConfigManager/Counted.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Counted.py 2004-11-02 16:14:12.000000000 +0100
-+++ plastex-0.9.2/plasTeX/ConfigManager/Counted.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Counted.py b/plasTeX/ConfigManager/Counted.py
+index e88489d..2b65044 100644
+--- a/plasTeX/ConfigManager/Counted.py
++++ b/plasTeX/ConfigManager/Counted.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Generic import GenericArgument
from Boolean import BooleanOption
-Index: plastex-0.9.2/plasTeX/ConfigManager/Directories.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Directories.py 2004-11-02 16:14:12.000000000 +0100
-+++ plastex-0.9.2/plasTeX/ConfigManager/Directories.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Directories.py b/plasTeX/ConfigManager/Directories.py
+index 50b374f..cde2deb 100644
+--- a/plasTeX/ConfigManager/Directories.py
++++ b/plasTeX/ConfigManager/Directories.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from String import StringOption
-Index: plastex-0.9.2/plasTeX/ConfigManager/Files.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Files.py 2004-11-02 16:14:12.000000000 +0100
-+++ plastex-0.9.2/plasTeX/ConfigManager/Files.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Files.py b/plasTeX/ConfigManager/Files.py
+index 8ca75ff..619e45a 100644
+--- a/plasTeX/ConfigManager/Files.py
++++ b/plasTeX/ConfigManager/Files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from String import StringOption
-Index: plastex-0.9.2/plasTeX/ConfigManager/Float.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Float.py 2004-11-02 16:14:12.000000000 +0100
-+++ plastex-0.9.2/plasTeX/ConfigManager/Float.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Float.py b/plasTeX/ConfigManager/Float.py
+index 03e23c6..2d92378 100644
+--- a/plasTeX/ConfigManager/Float.py
++++ b/plasTeX/ConfigManager/Float.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Generic import GenericOption, GenericParser, GenericArgument
from plasTeX.ConfigManager import InvalidOptionError
-Index: plastex-0.9.2/plasTeX/ConfigManager/Generic.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Generic.py 2009-05-21 21:40:42.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/Generic.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Generic.py b/plasTeX/ConfigManager/Generic.py
+index fcfd23a..83ce7c3 100644
+--- a/plasTeX/ConfigManager/Generic.py
++++ b/plasTeX/ConfigManager/Generic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import re, os, copy
from plasTeX.ConfigManager import BUILTIN, CODE, ENVIRON, ENVIRONMENT
-Index: plastex-0.9.2/plasTeX/ConfigManager/Integer.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Integer.py 2007-08-13 18:23:08.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/Integer.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Integer.py b/plasTeX/ConfigManager/Integer.py
+index 170c3a0..d8eca9a 100644
+--- a/plasTeX/ConfigManager/Integer.py
++++ b/plasTeX/ConfigManager/Integer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from Generic import GenericOption, GenericParser, GenericArgument
from plasTeX.ConfigManager import InvalidOptionError
-Index: plastex-0.9.2/plasTeX/ConfigManager/Multi.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/Multi.py 2009-05-21 21:40:42.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/Multi.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/Multi.py b/plasTeX/ConfigManager/Multi.py
+index 2950b2d..d107d3e 100644
+--- a/plasTeX/ConfigManager/Multi.py
++++ b/plasTeX/ConfigManager/Multi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from Generic import *
-Index: plastex-0.9.2/plasTeX/ConfigManager/String.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/String.py 2007-06-02 00:05:30.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/String.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/String.py b/plasTeX/ConfigManager/String.py
+index 052c32a..26c42d2 100644
+--- a/plasTeX/ConfigManager/String.py
++++ b/plasTeX/ConfigManager/String.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from UserString import UserString
from Generic import GenericOption, DEFAULTS, GenericParser, GenericArgument
-Index: plastex-0.9.2/plasTeX/ConfigManager/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/ConfigManager/__init__.py 2009-05-21 21:40:42.000000000 +0200
-+++ plastex-0.9.2/plasTeX/ConfigManager/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/ConfigManager/__init__.py b/plasTeX/ConfigManager/__init__.py
+index 26c6da9..e89227f 100644
+--- a/plasTeX/ConfigManager/__init__.py
++++ b/plasTeX/ConfigManager/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
ConfigManager
-Index: plastex-0.9.2/plasTeX/Context.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Context.py 2007-10-05 18:40:16.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Context.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Context.py b/plasTeX/Context.py
+index b150062..50df3a8 100644
+--- a/plasTeX/Context.py
++++ b/plasTeX/Context.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import new, os, ConfigParser, re, time, codecs
import plasTeX
-Index: plastex-0.9.2/plasTeX/DOM/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/DOM/__init__.py 2009-05-13 21:43:40.000000000 +0200
-+++ plastex-0.9.2/plasTeX/DOM/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/DOM/__init__.py b/plasTeX/DOM/__init__.py
+index dc9b773..a074e20 100644
+--- a/plasTeX/DOM/__init__.py
++++ b/plasTeX/DOM/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import sys, re
from plasTeX.Logging import getLogger
-Index: plastex-0.9.2/plasTeX/Filenames.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Filenames.py 2008-12-03 18:11:50.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Filenames.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Filenames.py b/plasTeX/Filenames.py
+index 8a396b9..d39c8ec 100644
+--- a/plasTeX/Filenames.py
++++ b/plasTeX/Filenames.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import re, string, os.path
-Index: plastex-0.9.2/plasTeX/Imagers/OSXCoreGraphics.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/OSXCoreGraphics.py 2006-06-29 17:00:50.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Imagers/OSXCoreGraphics.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/OSXCoreGraphics.py b/plasTeX/Imagers/OSXCoreGraphics.py
+index 45c3f0d..6178346 100755
+--- a/plasTeX/Imagers/OSXCoreGraphics.py
++++ b/plasTeX/Imagers/OSXCoreGraphics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import plasTeX.Imagers
-Index: plastex-0.9.2/plasTeX/Imagers/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/__init__.py 2009-01-08 17:18:06.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Imagers/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/__init__.py b/plasTeX/Imagers/__init__.py
+index 199fafe..44f65a3 100644
+--- a/plasTeX/Imagers/__init__.py
++++ b/plasTeX/Imagers/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os, time, tempfile, shutil, re, string, pickle, codecs
try: from hashlib import md5
-Index: plastex-0.9.2/plasTeX/Imagers/dvi2bitmap.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/dvi2bitmap.py 2007-11-27 17:33:25.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Imagers/dvi2bitmap.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/dvi2bitmap.py b/plasTeX/Imagers/dvi2bitmap.py
+index 7afa0cb..78cbba3 100644
+--- a/plasTeX/Imagers/dvi2bitmap.py
++++ b/plasTeX/Imagers/dvi2bitmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import plasTeX.Imagers
-Index: plastex-0.9.2/plasTeX/Imagers/dvipng.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/dvipng.py 2007-11-27 17:33:25.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Imagers/dvipng.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/dvipng.py b/plasTeX/Imagers/dvipng.py
+index 8389cd1..bd863d9 100644
+--- a/plasTeX/Imagers/dvipng.py
++++ b/plasTeX/Imagers/dvipng.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import plasTeX.Imagers
-Index: plastex-0.9.2/plasTeX/Imagers/dvisvgm.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/dvisvgm.py 2006-06-29 17:00:50.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Imagers/dvisvgm.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/dvisvgm.py b/plasTeX/Imagers/dvisvgm.py
+index 63a436e..1d05167 100755
+--- a/plasTeX/Imagers/dvisvgm.py
++++ b/plasTeX/Imagers/dvisvgm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os, re
import plasTeX.Imagers
-Index: plastex-0.9.2/plasTeX/Imagers/gsdvipng.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/gsdvipng.py 2006-08-14 18:02:34.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Imagers/gsdvipng.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/gsdvipng.py b/plasTeX/Imagers/gsdvipng.py
+index 3d57db5..81a777b 100755
+--- a/plasTeX/Imagers/gsdvipng.py
++++ b/plasTeX/Imagers/gsdvipng.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import gspdfpng, os, sys
-Index: plastex-0.9.2/plasTeX/Imagers/gspdfpng.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Imagers/gspdfpng.py 2007-11-27 17:33:25.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Imagers/gspdfpng.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Imagers/gspdfpng.py b/plasTeX/Imagers/gspdfpng.py
+index 6fa2156..0a78471 100644
+--- a/plasTeX/Imagers/gspdfpng.py
++++ b/plasTeX/Imagers/gspdfpng.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Logging import getLogger
import plasTeX.Imagers, glob, sys
-Index: plastex-0.9.2/plasTeX/Logging.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Logging.py 2009-01-08 17:18:06.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Logging.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Logging.py b/plasTeX/Logging.py
+index a545cdd..b1b4deb 100644
+--- a/plasTeX/Logging.py
++++ b/plasTeX/Logging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import textwrap, types
from logging import CRITICAL, DEBUG, INFO, Logger, StreamHandler, Formatter
-Index: plastex-0.9.2/plasTeX/Packages/CJK.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/CJK.py 2006-07-19 21:23:59.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/CJK.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/CJK.py b/plasTeX/Packages/CJK.py
+index 3a172b9..48b6ea4 100644
+--- a/plasTeX/Packages/CJK.py
++++ b/plasTeX/Packages/CJK.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment, log
-Index: plastex-0.9.2/plasTeX/Packages/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/__init__.py 2005-01-13 22:06:13.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/__init__.py b/plasTeX/Packages/__init__.py
+index cf529d7..139597f 100644
+--- a/plasTeX/Packages/__init__.py
++++ b/plasTeX/Packages/__init__.py
@@ -1,2 +1,2 @@
-#!/usr/bin/env python
+
-Index: plastex-0.9.2/plasTeX/Packages/alltt.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/alltt.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/alltt.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/alltt.py b/plasTeX/Packages/alltt.py
+index d3314e9..04e2b67 100644
+--- a/plasTeX/Packages/alltt.py
++++ b/plasTeX/Packages/alltt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Tokenizer import Token
from plasTeX import Command, Environment
-Index: plastex-0.9.2/plasTeX/Packages/amsart.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/amsart.py 2006-11-21 19:26:11.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/amsart.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/amsart.py b/plasTeX/Packages/amsart.py
+index 3d499a8..b165abe 100644
+--- a/plasTeX/Packages/amsart.py
++++ b/plasTeX/Packages/amsart.py
@@ -1,3 +1,3 @@
-#!/usr/bin/env python
+
from article import *
-Index: plastex-0.9.2/plasTeX/Packages/amsfonts.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/amsfonts.py 2006-11-21 19:26:11.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/amsfonts.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/amsfonts.py b/plasTeX/Packages/amsfonts.py
+index c0b8dab..b28b04f 100644
+--- a/plasTeX/Packages/amsfonts.py
++++ b/plasTeX/Packages/amsfonts.py
@@ -1,3 +1,3 @@
-#!/usr/bin/env python
+
-Index: plastex-0.9.2/plasTeX/Packages/amsmath.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/amsmath.py 2007-08-14 19:54:18.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/amsmath.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/amsmath.py b/plasTeX/Packages/amsmath.py
+index c4ef997..723367b 100644
+--- a/plasTeX/Packages/amsmath.py
++++ b/plasTeX/Packages/amsmath.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
from plasTeX.Base.LaTeX.Arrays import Array
-Index: plastex-0.9.2/plasTeX/Packages/article.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/article.py 2007-05-01 23:16:09.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/article.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/article.py b/plasTeX/Packages/article.py
+index 06a96f4..8211ee3 100644
+--- a/plasTeX/Packages/article.py
++++ b/plasTeX/Packages/article.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from report import *
-Index: plastex-0.9.2/plasTeX/Packages/babel.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/babel.py 2007-09-05 16:33:19.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/babel.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/babel.py b/plasTeX/Packages/babel.py
+index ee1ebd1..2742c5e 100644
+--- a/plasTeX/Packages/babel.py
++++ b/plasTeX/Packages/babel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
-Index: plastex-0.9.2/plasTeX/Packages/beamer.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/beamer.py 2006-12-11 15:38:40.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/beamer.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/beamer.py b/plasTeX/Packages/beamer.py
+index 31c9250..54e7a69 100644
+--- a/plasTeX/Packages/beamer.py
++++ b/plasTeX/Packages/beamer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
from plasTeX.Base import textbf, textit, textsl, textrm, textsf
-Index: plastex-0.9.2/plasTeX/Packages/book.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/book.py 2007-10-05 18:40:17.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/book.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/book.py b/plasTeX/Packages/book.py
+index 270b6d8..b76f03c 100644
+--- a/plasTeX/Packages/book.py
++++ b/plasTeX/Packages/book.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os, glob
from plasTeX import Command, Environment, TheCounter
-Index: plastex-0.9.2/plasTeX/Packages/changebar.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/changebar.py 2007-10-22 21:40:56.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/changebar.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/changebar.py b/plasTeX/Packages/changebar.py
+index be2ccbe..c420423 100644
+--- a/plasTeX/Packages/changebar.py
++++ b/plasTeX/Packages/changebar.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment, DimenCommand, Counter
-Index: plastex-0.9.2/plasTeX/Packages/color.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/color.py 2008-09-22 18:38:49.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/color.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/color.py b/plasTeX/Packages/color.py
+index c211652..7b09180 100644
+--- a/plasTeX/Packages/color.py
++++ b/plasTeX/Packages/color.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
-Index: plastex-0.9.2/plasTeX/Packages/comment.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/comment.py 2005-01-18 21:47:54.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/comment.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/comment.py b/plasTeX/Packages/comment.py
+index b9d49b5..366d120 100644
+--- a/plasTeX/Packages/comment.py
++++ b/plasTeX/Packages/comment.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Base.LaTeX.Verbatim import verbatim
-Index: plastex-0.9.2/plasTeX/Packages/fancybox.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/fancybox.py 2006-05-05 22:17:31.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/fancybox.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/fancybox.py b/plasTeX/Packages/fancybox.py
+index 938683c..e469533 100755
+--- a/plasTeX/Packages/fancybox.py
++++ b/plasTeX/Packages/fancybox.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
plasTeX package for fancy boxes
-Index: plastex-0.9.2/plasTeX/Packages/fancyhdr.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/fancyhdr.py 2006-05-05 22:17:31.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/fancyhdr.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/fancyhdr.py b/plasTeX/Packages/fancyhdr.py
+index a0dc376..567ada4 100755
+--- a/plasTeX/Packages/fancyhdr.py
++++ b/plasTeX/Packages/fancyhdr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/fancyvrb.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/fancyvrb.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/fancyvrb.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/fancyvrb.py b/plasTeX/Packages/fancyvrb.py
+index 2ea117e..b7adce9 100644
+--- a/plasTeX/Packages/fancyvrb.py
++++ b/plasTeX/Packages/fancyvrb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
from plasTeX.Base.LaTeX.Verbatim import verbatim
-Index: plastex-0.9.2/plasTeX/Packages/float.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/float.py 2007-08-16 19:12:03.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/float.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/float.py b/plasTeX/Packages/float.py
+index c24b3b1..6ce0b08 100644
+--- a/plasTeX/Packages/float.py
++++ b/plasTeX/Packages/float.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import new
from plasTeX import Command, Environment
-Index: plastex-0.9.2/plasTeX/Packages/fontenc.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/fontenc.py 2006-11-17 21:59:37.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/fontenc.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/fontenc.py b/plasTeX/Packages/fontenc.py
+index 4265cc3..8b13789 100644
+--- a/plasTeX/Packages/fontenc.py
++++ b/plasTeX/Packages/fontenc.py
@@ -1 +1 @@
-#!/usr/bin/env python
+
-Index: plastex-0.9.2/plasTeX/Packages/geometry.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/geometry.py 2006-08-07 16:17:57.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/geometry.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/geometry.py b/plasTeX/Packages/geometry.py
+index 650d76c..b6de8d0 100755
+--- a/plasTeX/Packages/geometry.py
++++ b/plasTeX/Packages/geometry.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/graphics.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/graphics.py 2008-09-22 16:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/graphics.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/graphics.py b/plasTeX/Packages/graphics.py
+index e9e32cf..94e39c8 100755
+--- a/plasTeX/Packages/graphics.py
++++ b/plasTeX/Packages/graphics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/graphicx.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/graphicx.py 2008-09-22 16:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/graphicx.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/graphicx.py b/plasTeX/Packages/graphicx.py
+index af00289..c32ca41 100644
+--- a/plasTeX/Packages/graphicx.py
++++ b/plasTeX/Packages/graphicx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import os
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/hyperref.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/hyperref.py 2007-11-03 17:07:08.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/hyperref.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/hyperref.py b/plasTeX/Packages/hyperref.py
+index 7c54605..33ff0aa 100644
+--- a/plasTeX/Packages/hyperref.py
++++ b/plasTeX/Packages/hyperref.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
Implementation of the hyperref package
-Index: plastex-0.9.2/plasTeX/Packages/ifpdf.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/ifpdf.py 2006-11-17 21:59:37.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/ifpdf.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/ifpdf.py b/plasTeX/Packages/ifpdf.py
+index 904439f..9d7cbe6 100644
+--- a/plasTeX/Packages/ifpdf.py
++++ b/plasTeX/Packages/ifpdf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
This package is intentionally empty. The \ifpdf command is implemented
-Index: plastex-0.9.2/plasTeX/Packages/ifthen.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/ifthen.py 2006-11-17 21:59:37.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/ifthen.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/ifthen.py b/plasTeX/Packages/ifthen.py
+index 3ff406d..363c439 100644
+--- a/plasTeX/Packages/ifthen.py
++++ b/plasTeX/Packages/ifthen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
This package is not properly implemented. The \ifthenelse command simply
-Index: plastex-0.9.2/plasTeX/Packages/keyval.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/keyval.py 2005-02-11 21:48:15.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/keyval.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/keyval.py b/plasTeX/Packages/keyval.py
+index aaa3c54..cc137b0 100644
+--- a/plasTeX/Packages/keyval.py
++++ b/plasTeX/Packages/keyval.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command, Environment
-Index: plastex-0.9.2/plasTeX/Packages/lipsum.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/lipsum.py 2008-01-16 18:57:44.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/lipsum.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/lipsum.py b/plasTeX/Packages/lipsum.py
+index c650d70..82b79fe 100755
+--- a/plasTeX/Packages/lipsum.py
++++ b/plasTeX/Packages/lipsum.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import pickle
from plasTeX import Base
lipsumdefault = [1,7]
-Index: plastex-0.9.2/plasTeX/Packages/longtable.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/longtable.py 2007-08-23 22:01:52.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/longtable.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/longtable.py b/plasTeX/Packages/longtable.py
+index c4a2721..a2546a2 100644
+--- a/plasTeX/Packages/longtable.py
++++ b/plasTeX/Packages/longtable.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import sys
from plasTeX.Base.LaTeX.Arrays import tabular
-Index: plastex-0.9.2/plasTeX/Packages/makeidx.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/makeidx.py 2007-11-08 20:26:30.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/makeidx.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/makeidx.py b/plasTeX/Packages/makeidx.py
+index 97cd98a..ed4cc9b 100644
+--- a/plasTeX/Packages/makeidx.py
++++ b/plasTeX/Packages/makeidx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/memoir.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/memoir.py 2007-11-12 21:29:24.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/memoir.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/memoir.py b/plasTeX/Packages/memoir.py
+index b47fb9a..fa720ca 100755
+--- a/plasTeX/Packages/memoir.py
++++ b/plasTeX/Packages/memoir.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from book import *
-Index: plastex-0.9.2/plasTeX/Packages/minitoc.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/minitoc.py 2006-11-27 17:32:40.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/minitoc.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/minitoc.py b/plasTeX/Packages/minitoc.py
+index b12c0e8..252352e 100644
+--- a/plasTeX/Packages/minitoc.py
++++ b/plasTeX/Packages/minitoc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
This is a huge package! Most of the commands are simply stubbed out
-Index: plastex-0.9.2/plasTeX/Packages/natbib.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/natbib.py 2008-07-29 21:20:49.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/natbib.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/natbib.py b/plasTeX/Packages/natbib.py
+index dfdc81a..4d76701 100644
+--- a/plasTeX/Packages/natbib.py
++++ b/plasTeX/Packages/natbib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
natbib
-Index: plastex-0.9.2/plasTeX/Packages/report.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/report.py 2006-11-21 19:26:11.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/report.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/report.py b/plasTeX/Packages/report.py
+index 9e5f2c8..b793cd4 100755
+--- a/plasTeX/Packages/report.py
++++ b/plasTeX/Packages/report.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from book import *
-Index: plastex-0.9.2/plasTeX/Packages/rotating.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/rotating.py 2007-10-22 22:59:25.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/rotating.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/rotating.py b/plasTeX/Packages/rotating.py
+index 5b7a653..23fb4b0 100644
+--- a/plasTeX/Packages/rotating.py
++++ b/plasTeX/Packages/rotating.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Environment
-Index: plastex-0.9.2/plasTeX/Packages/shortvrb.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/shortvrb.py 2007-08-21 18:49:31.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/shortvrb.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/shortvrb.py b/plasTeX/Packages/shortvrb.py
+index b5f2a59..465c2ba 100644
+--- a/plasTeX/Packages/shortvrb.py
++++ b/plasTeX/Packages/shortvrb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import new
from plasTeX import Command
-Index: plastex-0.9.2/plasTeX/Packages/subfig.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/subfig.py 2006-11-17 21:59:37.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/subfig.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/subfig.py b/plasTeX/Packages/subfig.py
+index bb90d83..a429a8d 100644
+--- a/plasTeX/Packages/subfig.py
++++ b/plasTeX/Packages/subfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
subfig package
-Index: plastex-0.9.2/plasTeX/Packages/subfigure.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/subfigure.py 2007-11-28 22:13:39.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/subfigure.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/subfigure.py b/plasTeX/Packages/subfigure.py
+index 5ed6a40..53e2524 100644
+--- a/plasTeX/Packages/subfigure.py
++++ b/plasTeX/Packages/subfigure.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
subfigure package
-Index: plastex-0.9.2/plasTeX/Packages/textcomp.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/textcomp.py 2007-10-22 22:59:25.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/textcomp.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/textcomp.py b/plasTeX/Packages/textcomp.py
+index 6ad5867..5d2e8c8 100644
+--- a/plasTeX/Packages/textcomp.py
++++ b/plasTeX/Packages/textcomp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Command
from plasTeX.Base.LaTeX import Accents
-Index: plastex-0.9.2/plasTeX/Packages/url.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/url.py 2006-11-17 21:59:37.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/url.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/url.py b/plasTeX/Packages/url.py
+index f831e85..e962f73 100644
+--- a/plasTeX/Packages/url.py
++++ b/plasTeX/Packages/url.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import new
from plasTeX.Base import Command, verb
-Index: plastex-0.9.2/plasTeX/Packages/verbatim.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/verbatim.py 2005-01-18 21:47:54.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Packages/verbatim.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/verbatim.py b/plasTeX/Packages/verbatim.py
+index 4265cc3..8b13789 100644
+--- a/plasTeX/Packages/verbatim.py
++++ b/plasTeX/Packages/verbatim.py
@@ -1 +1 @@
-#!/usr/bin/env python
+
-Index: plastex-0.9.2/plasTeX/Packages/wrapfig.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Packages/wrapfig.py 2006-08-16 15:57:03.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Packages/wrapfig.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Packages/wrapfig.py b/plasTeX/Packages/wrapfig.py
+index badf56e..9b5cc61 100755
+--- a/plasTeX/Packages/wrapfig.py
++++ b/plasTeX/Packages/wrapfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX import Environment
-Index: plastex-0.9.2/plasTeX/Renderers/DocBook/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/DocBook/__init__.py 2008-11-06 22:08:18.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/DocBook/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/DocBook/__init__.py b/plasTeX/Renderers/DocBook/__init__.py
+index b9a2c66..1715235 100644
+--- a/plasTeX/Renderers/DocBook/__init__.py
++++ b/plasTeX/Renderers/DocBook/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import re
from plasTeX.Renderers.PageTemplate import Renderer as _Renderer
-Index: plastex-0.9.2/plasTeX/Renderers/ManPage/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/ManPage/__init__.py 2008-09-04 21:42:47.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Renderers/ManPage/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/ManPage/__init__.py b/plasTeX/Renderers/ManPage/__init__.py
+index 4a11e10..f8be56b 100644
+--- a/plasTeX/Renderers/ManPage/__init__.py
++++ b/plasTeX/Renderers/ManPage/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Renderers import Renderer as BaseRenderer
import textwrap, re, string
-Index: plastex-0.9.2/plasTeX/Renderers/PageTemplate/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/PageTemplate/__init__.py 2009-11-17 17:17:04.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/PageTemplate/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/PageTemplate/__init__.py b/plasTeX/Renderers/PageTemplate/__init__.py
+index 041c051..2853238 100755
+--- a/plasTeX/Renderers/PageTemplate/__init__.py
++++ b/plasTeX/Renderers/PageTemplate/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
Generic Page Template Renderer
-Index: plastex-0.9.2/plasTeX/Renderers/S5/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/S5/__init__.py 2006-12-08 21:46:20.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/S5/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/S5/__init__.py b/plasTeX/Renderers/S5/__init__.py
+index 2a10615..5ec5ece 100755
+--- a/plasTeX/Renderers/S5/__init__.py
++++ b/plasTeX/Renderers/S5/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Renderers.XHTML import Renderer
-Index: plastex-0.9.2/plasTeX/Renderers/Text/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/Text/__init__.py 2008-09-04 21:42:47.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Renderers/Text/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/Text/__init__.py b/plasTeX/Renderers/Text/__init__.py
+index baa8f5f..dc886f9 100644
+--- a/plasTeX/Renderers/Text/__init__.py
++++ b/plasTeX/Renderers/Text/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
from plasTeX.Renderers import Renderer as BaseRenderer
import textwrap, re, string
-Index: plastex-0.9.2/plasTeX/Renderers/XHTML/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/XHTML/__init__.py 2009-05-12 18:36:14.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Renderers/XHTML/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/XHTML/__init__.py b/plasTeX/Renderers/XHTML/__init__.py
+index 34e9aaf..38f428b 100755
+--- a/plasTeX/Renderers/XHTML/__init__.py
++++ b/plasTeX/Renderers/XHTML/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import sys, os, re, codecs, plasTeX
from plasTeX.Renderers.PageTemplate import Renderer as _Renderer
-Index: plastex-0.9.2/plasTeX/Renderers/ZPT/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/ZPT/__init__.py 2006-11-20 17:20:57.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/ZPT/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/ZPT/__init__.py b/plasTeX/Renderers/ZPT/__init__.py
+index acc294f..48a2e0a 100755
+--- a/plasTeX/Renderers/ZPT/__init__.py
++++ b/plasTeX/Renderers/ZPT/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
ZPT - Zope Page Template Renderer
-Index: plastex-0.9.2/plasTeX/Renderers/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/__init__.py 2008-12-03 18:11:50.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Renderers/__init__.py b/plasTeX/Renderers/__init__.py
+index 3e811fc..dcdb363 100644
+--- a/plasTeX/Renderers/__init__.py
++++ b/plasTeX/Renderers/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import codecs, os, shutil, string
from plasTeX.Filenames import Filenames
-Index: plastex-0.9.2/plasTeX/TeX.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/TeX.py 2009-04-19 22:34:10.000000000 +0200
-+++ plastex-0.9.2/plasTeX/TeX.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/TeX.py b/plasTeX/TeX.py
+index f25dd26..a16c319 100644
+--- a/plasTeX/TeX.py
++++ b/plasTeX/TeX.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
"""
TeX
-Index: plastex-0.9.2/plasTeX/Tokenizer.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Tokenizer.py 2007-08-24 19:52:12.000000000 +0200
-+++ plastex-0.9.2/plasTeX/Tokenizer.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/Tokenizer.py b/plasTeX/Tokenizer.py
+index 7b7e38d..0836edd 100644
+--- a/plasTeX/Tokenizer.py
++++ b/plasTeX/Tokenizer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import string
from DOM import Node, Text
-Index: plastex-0.9.2/plasTeX/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/__init__.py 2009-05-12 18:36:14.000000000 +0200
-+++ plastex-0.9.2/plasTeX/__init__.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/__init__.py b/plasTeX/__init__.py
+index 9c47abb..e14d280 100644
+--- a/plasTeX/__init__.py
++++ b/plasTeX/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
import string, re
from DOM import Element, Text, Node, DocumentFragment, Document
-Index: plastex-0.9.2/plasTeX/dictutils.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/dictutils.py 2006-05-19 21:49:48.000000000 +0200
-+++ plastex-0.9.2/plasTeX/dictutils.py 2009-11-17 17:17:04.000000000 +0100
+diff --git a/plasTeX/dictutils.py b/plasTeX/dictutils.py
+index 868a191..9ea60b3 100644
+--- a/plasTeX/dictutils.py
++++ b/plasTeX/dictutils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
diff -Nru plastex-0.9.2/debian/patches/03_template_icon_links.diff plastex-0.9.2/debian/patches/03_template_icon_links.diff
--- plastex-0.9.2/debian/patches/03_template_icon_links.diff 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/patches/03_template_icon_links.diff 2018-02-17 11:31:00.000000000 +1100
@@ -1,8 +1,18 @@
-Index: plastex-0.9.2/plasTeX/Renderers/PageTemplate/__init__.py
-===================================================================
---- plastex-0.9.2.orig/plasTeX/Renderers/PageTemplate/__init__.py 2009-11-17 17:15:13.000000000 +0100
-+++ plastex-0.9.2/plasTeX/Renderers/PageTemplate/__init__.py 2009-11-17 17:15:06.000000000 +0100
-@@ -327,9 +327,9 @@
+From 11e15ea9fd6c107a52b6ec98e932d78f38a99f4e Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-t...@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:14:22 -0700
+Subject: 03_template_icon_links.diff
+
+Patch-Name: 03_template_icon_links.diff
+---
+ plasTeX/Renderers/PageTemplate/__init__.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plasTeX/Renderers/PageTemplate/__init__.py b/plasTeX/Renderers/PageTemplate/__init__.py
+index 9bd7ae1..041c051 100755
+--- a/plasTeX/Renderers/PageTemplate/__init__.py
++++ b/plasTeX/Renderers/PageTemplate/__init__.py
+@@ -327,9 +327,9 @@ class PageTemplate(BaseRenderer):
if os.path.isdir(item):
if not os.path.isdir(os.path.join(cwd,item)):
os.makedirs(os.path.join(cwd,item))
diff -Nru plastex-0.9.2/debian/patches/remove_cgpdfpng.patch.diff plastex-0.9.2/debian/patches/remove_cgpdfpng.patch.diff
--- plastex-0.9.2/debian/patches/remove_cgpdfpng.patch.diff 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/patches/remove_cgpdfpng.patch.diff 2018-02-17 11:31:00.000000000 +1100
@@ -1,15 +1,19 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove_cgpdfpng.patch.dpatch by Carl Fürstenberg <azat...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to remove cgpdfpng from the build procedure as it's not usefull under debian
+From 16d01deb9336067bda0164fa729ff12256b0a1a3 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-t...@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:14:23 -0700
+Subject: remove_cgpdfpng.patch.diff
@DPATCH@
-Index: plastex-0.9.2/setup.py
-===================================================================
---- plastex-0.9.2.orig/setup.py 2009-07-01 17:07:33.000000000 +0200
-+++ plastex-0.9.2/setup.py 2009-11-17 17:17:55.000000000 +0100
-@@ -64,5 +64,5 @@
+Patch-Name: remove_cgpdfpng.patch.diff
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index fbca535..ead62ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -64,5 +64,5 @@ setup(name="plasTeX",
'plasTeX.Renderers.S5.Themes.default': templates,
'plasTeX.Renderers.S5.Themes.default.ui.default': templates+styles+images,
},
diff -Nru plastex-0.9.2/debian/python-plastex.lintian-overrides plastex-0.9.2/debian/python-plastex.lintian-overrides
--- plastex-0.9.2/debian/python-plastex.lintian-overrides 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/python-plastex.lintian-overrides 2018-02-17 11:31:00.000000000 +1100
@@ -1,2 +1,3 @@
#Due to the nature of this package, it was more logical to place it into section 'tex' than 'python'
python-plastex binary: python-package-should-be-section-python
+python-plastex binary: wrong-section-according-to-package-name
diff -Nru plastex-0.9.2/debian/rules plastex-0.9.2/debian/rules
--- plastex-0.9.2/debian/rules 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/rules 2018-02-17 11:31:00.000000000 +1100
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include $(CURDIR)/debian/mk/docbook-xml-manpage.mk
DOCBOOKXML_MANPAGE_SOURCES = debian/xml-man/plastex.xml
diff -Nru plastex-0.9.2/debian/source/format plastex-0.9.2/debian/source/format
--- plastex-0.9.2/debian/source/format 1970-01-01 10:00:00.000000000 +1000
+++ plastex-0.9.2/debian/source/format 2018-02-17 11:31:00.000000000 +1100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru plastex-0.9.2/debian/xml-man/plastex.xml plastex-0.9.2/debian/xml-man/plastex.xml
--- plastex-0.9.2/debian/xml-man/plastex.xml 2018-02-17 11:51:46.000000000 +1100
+++ plastex-0.9.2/debian/xml-man/plastex.xml 2018-02-17 11:31:00.000000000 +1100
@@ -95,7 +95,7 @@
<arg><option>--theme=<replaceable>theme-name</replaceable></option></arg>
<group>
<arg choice="plain"><option>--copy-theme-extras</option></arg>
- <arg choice="plain"><option>--ignore-theme-extras</option></arg>
+ <arg choice="plain"><option>--no-theme-extras</option></arg>
</group>
<arg><option>--base-url=<replaceable>url</replaceable></option></arg>
<arg><option>--index-columns=<replaceable>integer</replaceable></option></arg>
@@ -183,7 +183,7 @@
</varlistentry>
<varlistentry>
<term><option>--copy-theme-extras</option>,
- <option>--ignore-theme-extras</option>
+ <option>--no-theme-extras</option>
</term>
<listitem>
<para>indicates whether or not extra files that belong to a theme (if there are any) should be copied to the output directory.</para>
