--- asciidoc-8.6.7.orig/debian/watch
+++ asciidoc-8.6.7/debian/watch
@@ -0,0 +1,4 @@
+# format version number, currently 3; this line is compulsory!
+version=3
+
+http://sf.net/asciidoc/asciidoc-(.+)\.tar\.gz
--- asciidoc-8.6.7.orig/debian/asciidoc.links
+++ asciidoc-8.6.7/debian/asciidoc.links
@@ -0,0 +1,4 @@
+/etc/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/asciidoc/docbook-xsl.css
+usr/share/asciidoc/images etc/asciidoc/images
+usr/share/asciidoc/javascripts /etc/asciidoc/javascripts
+/etc/asciidoc/stylesheets usr/share/asciidoc/stylesheets
--- asciidoc-8.6.7.orig/debian/copyright
+++ asciidoc-8.6.7/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Fredrik Steen <stone@debian.org> on
+Mon, 28 Feb 2005 15:02:05 +0100.
+
+It was downloaded from http://www.methods.co.nz/asciidoc/downloads.html
+
+Copyright: 2008 by Stuart Rackham <srackham@methods.co.nz>
+
+Upstream Author: Stuart Rackham <srackham@methods.co.nz>
+
+License:
+
+Copyright: GPL (see /usr/share/common-licenses/GPL)
--- asciidoc-8.6.7.orig/debian/asciidoc.manpages
+++ asciidoc-8.6.7/debian/asciidoc.manpages
@@ -0,0 +1,2 @@
+doc/asciidoc.1
+doc/a2x.1
--- asciidoc-8.6.7.orig/debian/changelog
+++ asciidoc-8.6.7/debian/changelog
@@ -0,0 +1,258 @@
+asciidoc (8.6.7-1) unstable; urgency=low
+
+ * [594ef01] Add homepage field (Closes: #661051)
+ * [446fd0a] Imported Upstream version 8.6.7
+ * [e30e9b7] Refresh testasciidoc_path.dpatch
+ * [f54b4c0] Make asciidoc binary package "Multi-Arch: foreign"
+ (Closes: #665961)
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 31 Mar 2012 09:38:11 +0200
+
+asciidoc (8.6.6-1) unstable; urgency=low
+
+ * [3823948] disable dh_verbose
+ * [974ea1c] Imported Upstream version 8.6.6
+ * [b5d451c] Add vcs headers
+ * [c418563] Remove trailing whitespace in package description
+
+ -- Alexander Wirt <formorer@debian.org> Sun, 23 Oct 2011 21:08:22 +0200
+
+asciidoc (8.6.5-1) unstable; urgency=low
+
+ * New upstream version
+ * Bump standards version (no changes)
+ * Depend on python-support
+ * generate html version of userguide to
+ /usr/share/doc/asciidoc/userguide.html
+ (Closes: #628795)
+ * Install vim filetype to ftdetect directory
+ (Closes: #626495)
+ * Bump debhelper compatibility level to 7.
+ This installs the upstream changelog
+ (Closes: #634251). Thanks to Jonathan Nieder
+
+ -- Alexander Wirt <formorer@debian.org> Fri, 29 Jul 2011 22:22:22 +0200
+
+asciidoc (8.6.4-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Alexander Wirt <formorer@debian.org> Sun, 20 Feb 2011 08:47:09 +0100
+
+asciidoc (8.6.3-1) unstable; urgency=low
+
+ * New upstream version (Closes: #595324)
+ * Support asciidoc API (Closes: #526351)
+ * Depend on python >= 2.4 (Closes: #571303)
+ * Do not compress .txt files (Closes: #592423)
+ * Enhance asciidoc manpage (Closes: #499497)
+ * Move some of the Recommends (vim-addon-manager, source-highlight) to
+ Suggests (Closes: #564015)
+ * Bump standards version (No changes)
+ * Add README.Source file
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 27 Nov 2010 23:19:57 +0100
+
+asciidoc (8.5.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Add libxml2-utils to recommends (Closes: #556970)
+ * Bump standardsversion
+ * Patch a2x to get resource dir and icons dir per default
+ (Closes: #559305, #491187)
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 02 Jan 2010 10:11:17 +0100
+
+asciidoc (8.5.1-1) unstable; urgency=low
+
+ * New upstream version (Closes: #531841)
+ - Latex output fixed (Closes: #487402)
+
+ -- Alexander Wirt <formorer@debian.org> Wed, 10 Jun 2009 21:11:19 +0200
+
+asciidoc (8.4.4-1) unstable; urgency=low
+
+ * New upstream release (Closes: #511332)
+ * Bump standards version (no changes)
+ * Mention docbook2odt (Closes: #524404)
+ * Remove symlink hell (Closes: #524888)
+
+ -- Alexander Wirt <formorer@debian.org> Sun, 26 Apr 2009 13:14:42 +0200
+
+asciidoc (8.2.7-3) unstable; urgency=low
+
+ * Replace fop with dblatex (Closes: #452470)
+ * Install dblatex supportfiles (Closes: #494531, #496987)
+
+ -- Alexander Wirt <formorer@debian.org> Fri, 13 Mar 2009 10:27:10 +0100
+
+asciidoc (8.2.7-2) unstable; urgency=low
+
+ * Reintroduce normpatch-not-realpath.patch which fixes some FTBFS
+ with packages that build there documentation with asciidoc
+ (Closes: #487962). Thanks to Ben Hutchings for the patch.
+
+ -- Alexander Wirt <formorer@debian.org> Tue, 29 Jul 2008 19:26:44 +0200
+
+asciidoc (8.2.7-1) unstable; urgency=low
+
+ * New upstream version
+ * Drop fop fix (included upstream)
+
+ -- Alexander Wirt <formorer@debian.org> Fri, 18 Jul 2008 21:14:17 +0200
+
+asciidoc (8.2.6-1) unstable; urgency=low
+
+ * New upstream release (Closes: #478494)
+ * Add patch for pdf generation with newer fops (Closes: #425064, #475362)
+ * Bump standards version
+
+ -- Alexander Wirt <formorer@debian.org> Tue, 10 Jun 2008 14:29:56 +0200
+
+asciidoc (8.2.5-1) unstable; urgency=low
+
+ * New upstream version
+ * Bumped standards version (no changes)
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 26 Jan 2008 22:30:42 +0100
+
+asciidoc (8.2.3-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Alexander Wirt <formorer@debian.org> Fri, 21 Sep 2007 15:25:39 +0200
+
+asciidoc (8.2.2-1) unstable; urgency=low
+
+ * New upstream version
+ * Install all filters per default
+ * Switch to vim-addons packaging (Closes: #433396)
+
+ -- Alexander Wirt <formorer@debian.org> Tue, 24 Jul 2007 21:29:18 +0200
+
+asciidoc (8.2.1-2) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Alexander Wirt <formorer@debian.org> Thu, 17 May 2007 12:53:39 +0200
+
+asciidoc (8.2.1-1) experimental; urgency=low
+
+ * New upstream release
+ * Move vim files to a better place
+
+ -- Alexander Wirt <formorer@debian.org> Thu, 17 May 2007 11:08:48 +0200
+
+asciidoc (8.2.0-1) experimental; urgency=low
+
+ [ Fredrik Steen ]
+ * Upstream fix for trailing .sp in man-pages (Closes:#386854)
+ * Note about fo.xsl in README.Debian (Closes: #344729)
+ * a2x now search and use fop instead of fop.sh (Closes: #376523)
+
+ [ Alexander Wirt ]
+ * New upstream version (Closes: #395234)
+ - Fixses broken reference in documentation (Closes: #412246)
+ * Bumped standards version
+ * Make fop and xmlto a recommends (Closes: #389829)
+
+ -- Alexander Wirt <formorer@debian.org> Thu, 15 Mar 2007 09:53:18 +0100
+
+asciidoc (7.1.2-2) unstable; urgency=low
+
+ * Add myself to uploaders
+ * Fix fop path in a2x (Closes: #376523)
+ * Remove this bad bad control file generation
+ * Fix cdbs and debhelper dependency
+
+ -- Alexander Wirt <formorer@debian.org> Mon, 12 Mar 2007 22:05:09 +0100
+
+asciidoc (7.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Fredrik Steen <stone@debian.org> Fri, 24 Mar 2006 15:14:04 +0100
+
+asciidoc (7.1.0-1) unstable; urgency=low
+
+ * New major upstream release
+
+ -- Fredrik <stone@debian.org> Mon, 30 Jan 2006 09:12:06 +0100
+
+asciidoc (7.0.2-4) unstable; urgency=low
+
+ * Changed patches to change python path to #!/usr/bin/python
+ (Closes:#337822)
+
+ -- Fredrik Steen <stone@debian.org> Tue, 8 Nov 2005 10:21:36 +0100
+
+asciidoc (7.0.2-3) unstable; urgency=low
+
+ * Fixed typo in debian/control (Depends python (>=2.3) only changed
+ Build-Depends-Indep in my previous upload) (Closes:#337822)
+
+ -- Fredrik <stone@debian.org> Tue, 8 Nov 2005 09:39:15 +0100
+
+asciidoc (7.0.2-2) unstable; urgency=low
+
+ * No real need to depend on python2.4 when asciidoc runs fine under
+ python2.3 (Closes:#337822)
+ * Bumped Standards-Version to latest.
+
+ -- Fredrik Steen <stone@debian.org> Mon, 7 Nov 2005 10:16:56 +0100
+
+asciidoc (7.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed problem reading old configuration file during build. Thanks to
+ Hidetaka Iwai for patch (Closes:#330898)
+
+ -- Fredrik Steen <stone@debian.org> Fri, 14 Oct 2005 11:04:53 +0200
+
+asciidoc (7.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Fix for typo in debian/rules Closes:#318495
+ * Changed package description, I agree with Mr. Wirzenius (Closes:#308331)
+
+ -- Fredrik Steen <stone@debian.org> Thu, 21 Jul 2005 09:34:51 +0200
+
+asciidoc (7.0.0-1) unstable; urgency=low
+
+ * New major upstream release Closes:#312725
+
+ -- Fredrik Steen <stone@debian.org> Wed, 8 Jun 2005 10:30:51 +0200
+
+asciidoc (6.0.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Fredrik Steen <stone@debian.org> Thu, 21 Apr 2005 08:54:56 +0200
+
+asciidoc (6.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Added /etc/asciidoc/filters
+
+ -- Fredrik Steen <stone@debian.org> Wed, 30 Mar 2005 08:00:11 +0200
+
+asciidoc (6.0.1-2) unstable; urgency=low
+
+ * Fixed depends
+ * Added Suggests for docbook-utils and xmlto
+
+ -- Fredrik Steen <stone@debian.org> Sat, 26 Mar 2005 10:58:17 +0100
+
+asciidoc (6.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * First upload to Debian Closes:#249790
+
+ -- Fredrik Steen <stone@debian.org> Thu, 10 Mar 2005 10:44:56 +0100
+
+asciidoc (6.0.0-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Fredrik Steen <stone@debian.org> Mon, 28 Feb 2005 15:02:05 +0100
+
--- asciidoc-8.6.7.orig/debian/asciidoc.doc
+++ asciidoc-8.6.7/debian/asciidoc.doc
@@ -0,0 +1 @@
+CHANGELOG
--- asciidoc-8.6.7.orig/debian/docs
+++ asciidoc-8.6.7/debian/docs
@@ -0,0 +1 @@
+README
--- asciidoc-8.6.7.orig/debian/dirs
+++ asciidoc-8.6.7/debian/dirs
@@ -0,0 +1,2 @@
+usr/share/vim/addons/syntax
+usr/share/vim/addons/ftplugin
--- asciidoc-8.6.7.orig/debian/asciidoc.yaml
+++ asciidoc-8.6.7/debian/asciidoc.yaml
@@ -0,0 +1,5 @@
+addon: asciidoc
+description: allow syntax highlighting and autodetection for asciidoc files
+files:
+ - syntax/asciidoc.vim
+ - ftdetect/asciidoc_filetype.vim
--- asciidoc-8.6.7.orig/debian/asciidoc.dirs
+++ asciidoc-8.6.7/debian/asciidoc.dirs
@@ -0,0 +1,8 @@
+usr/bin
+etc/asciidoc
+etc/asciidoc/filters
+etc/asciidoc/docbook-xsl
+etc/asciidoc/stylesheets
+usr/share/asciidoc
+usr/share/doc/asciidoc
+usr/share/doc/asciidoc/examples
--- asciidoc-8.6.7.orig/debian/asciidoc.install
+++ asciidoc-8.6.7/debian/asciidoc.install
@@ -0,0 +1,19 @@
+*.conf /etc/asciidoc/
+tests/testasciidoc.conf /etc/asciidoc/
+
+debian/asciidoc.yaml /usr/share/vim/registry
+stylesheets /etc/asciidoc/
+dblatex /etc/asciidoc/
+docbook-xsl /etc/asciidoc/
+images /usr/share/asciidoc/
+javascripts /usr/share/asciidoc/
+
+filters/* /etc/asciidoc/filters/
+docbook-xsl/*.xsl /etc/asciidoc/docbook-xsl/
+stylesheets/*.css /etc/asciidoc/stylesheets/
+/images/icons /usr/share/asciidoc
+asciidocapi.py /usr/share/asciidoc
+
+vim/ftdetect/asciidoc_filetype.vim /usr/share/vim/addons/ftdetect/
+vim/syntax/asciidoc.vim /usr/share/vim/addons/syntax/
+
--- asciidoc-8.6.7.orig/debian/rules
+++ asciidoc-8.6.7/debian/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+
+include /usr/share/dpatch/dpatch.make
+
+export DH_VERBOSE=0
+
+
+
+build: patch-stamp
+
+clean: unpatch
+ -rm config.log
+ -rm Makefile
+ -rm config.status
+ -rm debian/asciidoc.1.xml
+ -rm debian/a2x.1.xml
+ dh clean
+
+override_dh_install:
+ dh_install
+ rm debian/asciidoc/usr/bin/a2x
+ mv debian/asciidoc/usr/bin/a2x.py debian/asciidoc/usr/bin/a2x
+ rm debian/asciidoc/usr/bin/asciidoc
+ mv debian/asciidoc/usr/bin/asciidoc.py debian/asciidoc/usr/bin/asciidoc
+ install -m0755 tests/testasciidoc.py debian/asciidoc/usr/bin/testasciidoc
+ cp -aL examples/website/ debian/asciidoc/usr/share/doc/asciidoc/examples/
+ cp -aL doc/ debian/asciidoc/usr/share/doc/asciidoc/
+ ./asciidoc.py -b xhtml11 -o debian/asciidoc/usr/share/doc/asciidoc/userguide.html doc/asciidoc.txt
+ sed -i -e 's#./images/#/usr/share/asciidoc/images/#g' debian/asciidoc/usr/share/doc/asciidoc/userguide.html
+
+override_dh_link:
+ rm -rf debian/asciidoc/etc/asciidoc/javascripts
+ rm -rf debian/asciidoc/etc/asciidoc/icons
+ rm -rf debian/asciidoc/etc/asciidoc/images
+ dh_link
+
+override_dh_compress:
+ dh_compress -X.txt
+
+%:
+ dh $@
--- asciidoc-8.6.7.orig/debian/control
+++ asciidoc-8.6.7/debian/control
@@ -0,0 +1,29 @@
+Source: asciidoc
+Section: text
+Priority: optional
+Maintainer: Fredrik Steen <stone@debian.org>
+Uploaders: Alexander Wirt <formorer@debian.org>
+Build-Depends: debhelper (>= 7.0.50), dpatch
+Build-Depends-Indep: xmlto, python (>= 2.4)
+Standards-Version: 3.9.2
+Vcs-Browser: http://git.debian.org/?p=pkg-asciidoc/pkg-asciidoc.git
+Vcs-Git: git://git.debian.org/pkg-asciidoc/pkg-asciidoc.git
+Homepage: http://www.methods.co.nz/asciidoc/
+
+Package: asciidoc
+Architecture: all
+Depends: python (>= 2.4), ${misc:Depends}, ${python:Depends}
+Recommends: docbook-utils, xmlto, dblatex, libxml2-utils
+Suggests: vim-addon-manager, source-highlight
+Multi-Arch: foreign
+Description: Highly configurable text format for writing documentation
+ AsciiDoc is a text document format for writing articles, books, manuals and
+ UNIX man pages. AsciiDoc files can be translated to HTML (with or without
+ stylesheets), DocBook (articles, books and refentry documents) and LinuxDoc
+ using the asciidoc command. AsciiDoc can also be used to build and maintain
+ websites.
+ .
+ You write an AsciiDoc document the same way you would write a
+ normal text document, there are no markup tags or weird format notations.
+ AsciiDoc files are designed to be viewed, edited and printed directly or
+ translated to other presentation formats
--- asciidoc-8.6.7.orig/debian/README.Debian
+++ asciidoc-8.6.7/debian/README.Debian
@@ -0,0 +1,15 @@
+asciidoc for Debian
+-------------------
+
+- To enable syntax highlighting for asciidoc just execute 'vim-addons install asciidoc'
+
+- If you want to use the asciidoc api don't forget to add '/usr/share/asciidoc' to your sys.path
+- To get the images from asciidoc to show up (css backend) make a symlink called
+ "images" from "/usr/share/asciidoc/images"
+
+ $ ln -s /usr/share/asciidoc/images images
+
+- "userguide.html" talks about a fo.xsl file, this file is located
+ in /etc/asciidoc/docbook-xsl/fo.xsl (Bug:#344729).
+
+ -- Alexander Wirt <formorer@debian.org> Tue, Jul 25 2007 09:29:17 +0200
--- asciidoc-8.6.7.orig/debian/semantic.cache
+++ asciidoc-8.6.7/debian/semantic.cache
@@ -0,0 +1,16 @@
+;; Object debian/
+;; SEMANTICDB Tags save file
+(semanticdb-project-database-file "debian/"
+ :tables (list
+ (semanticdb-table "rules"
+ :major-mode 'makefile-mode
+ :tags '(("DH_VERBOSE" variable (:default-value ("1")) nil [165 178]) ("DEB_AUTO_UPDATE_DEBIAN_CONTROL" variable (:default-value ("yes")) nil [179 217]) ("/usr/share/cdbs/1/rules/debhelper.mk" include nil nil [218 263]) ("/usr/share/cdbs/1/rules/simple-patchsys.mk" include nil nil [263 314]) ("build/asciidoc" function nil nil [315 483]) ("cleanbuilddir/asciidoc" function nil nil [483 563]) ("binary-post-install/asciidoc" function nil nil [563 655]))
+ :file "rules"
+ :pointmax 655
+ :unmatched-syntax 'nil
+ )
+ )
+ :file "semantic.cache"
+ :semantic-tag-version "2.0beta3"
+ :semanticdb-version "2.0beta3"
+ )
--- asciidoc-8.6.7.orig/debian/compat
+++ asciidoc-8.6.7/debian/compat
@@ -0,0 +1 @@
+7
--- asciidoc-8.6.7.orig/debian/NEWS
+++ asciidoc-8.6.7/debian/NEWS
@@ -0,0 +1,6 @@
+asciidoc (8.6.3-1) unstable; urgency=low
+
+ The docbook backend got renamed to docbook45. If you have any user modified docbook.conf
+ or ~/.asciidoc/docbook.conf rename them to docbook45.conf.
+
+ -- Alexander Wirt <formorer@debian.org> Sat, 04 Dec 2010 09:56:46 +0100
--- asciidoc-8.6.7.orig/debian/README.source
+++ asciidoc-8.6.7/debian/README.source
@@ -0,0 +1,38 @@
+This package uses dpatch to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd
+to the root level of the source package and run:
+
+ debian/rules patch
+
+Removing a patch is as simple as removing its entry from the
+debian/patches/00list file, and please also remove the patch file
+itself.
+
+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
+where you should replace XX with a new number and patchname with a
+descriptive shortname of the patch. You can then simply edit all the
+files your patch wants to edit, and then simply "exit 0" from the shell
+to actually create the patch file.
+
+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
+and replace XX_patchname with the actual filename from debian/patches
+you want to use.
+
+To clean up afterwards again, "debian/rules unpatch" will do the
+work for you - or you can of course choose to call
+"fakeroot debian/rules clean" all together.
+
+
+---
+
+this documentation is part of dpatch package, and may be used by
+packages using dpatch to comply with policy on README.source. This
+documentation is meant to be useful to users who are not proficient in
+dpatch in doing work with dpatch-based packages. Please send any
+improvements to the BTS of dpatch package.
+
+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer@debian.org>
+10 Aug 2008.
--- asciidoc-8.6.7.orig/debian/patches/a2x-defaultdirs.dpatch
+++ asciidoc-8.6.7/debian/patches/a2x-defaultdirs.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## a2x-defaultdirs.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use the correct resourcedirs
+
+@DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.6.3//a2x.py asciidoc-8.6.3.new//a2x.py
+--- asciidoc-8.6.3//a2x.py 2010-11-14 00:54:32.000000000 +0100
++++ asciidoc-8.6.3.new//a2x.py 2010-11-27 23:28:58.922601000 +0100
+@@ -764,7 +764,7 @@
+ help='use admonition, callout and navigation icons')
+ parser.add_option('--icons-dir',
+ action='store', dest='icons_dir',
+- default=None, metavar='PATH',
++ default='/etc/asciidoc/images/icons/', metavar='PATH',
+ help='admonition and navigation icon directory')
+ parser.add_option('-k', '--keep-artifacts',
+ action='store_true', dest='keep_artifacts', default=False,
+@@ -779,7 +779,7 @@
+ action='store_true', dest='dry_run', default=False,
+ help='just print the commands that would have been executed')
+ parser.add_option('-r','--resource',
+- action='append', dest='resources', default=[],
++ action='append', dest='resources', default=['/etc/asciidoc'],
+ metavar='PATH',
+ help='resource file or directory containing resource files')
+ parser.add_option('-m', '--resource-manifest',
+@@ -787,7 +787,7 @@
+ help='read resources from FILE')
+ #DEPRECATED
+ parser.add_option('--resource-dir',
+- action='append', dest='resources', default=[],
++ action='append', dest='resources', default=['/etc/asciidoc'],
+ metavar='PATH',
+ help='DEPRECATED: use --resource')
+ #DEPRECATED
--- asciidoc-8.6.7.orig/debian/patches/fix_asciidoc_api_doc.dpatch
+++ asciidoc-8.6.7/debian/patches/fix_asciidoc_api_doc.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_asciidoc_api_doc.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.3~/asciidocapi.py asciidoc-8.6.3/asciidocapi.py
+--- asciidoc-8.6.3~/asciidocapi.py 2010-02-06 04:19:59.000000000 +0100
++++ asciidoc-8.6.3/asciidocapi.py 2010-11-28 14:09:07.002140339 +0100
+@@ -5,6 +5,8 @@
+ The AsciiDocAPI class provides an API for executing asciidoc. Minimal example
+ compiles `mydoc.txt` to `mydoc.html`:
+
++ import sys
++ sys.path.append("/usr/share/asciidoc")
+ import asciidocapi
+ asciidoc = asciidocapi.AsciiDocAPI()
+ asciidoc.execute('mydoc.txt')
+@@ -17,6 +19,8 @@
+ 1. Check execution:
+
+ >>> import StringIO
++ >>> import sys
++ >>> sys.path.append("/usr/share/asciidoc")
+ >>> infile = StringIO.StringIO('Hello *{author}*')
+ >>> outfile = StringIO.StringIO()
+ >>> asciidoc = AsciiDocAPI()
+@@ -36,6 +40,8 @@
+ 2. Check error handling:
+
+ >>> import StringIO
++ >>> import sys
++ >>> sys.path.append("/usr/share/asciidoc")
+ >>> asciidoc = AsciiDocAPI()
+ >>> infile = StringIO.StringIO('---------')
+ >>> outfile = StringIO.StringIO()
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.3~/doc/asciidocapi.txt asciidoc-8.6.3/doc/asciidocapi.txt
+--- asciidoc-8.6.3~/doc/asciidocapi.txt 2009-05-26 01:37:47.000000000 +0200
++++ asciidoc-8.6.3/doc/asciidocapi.txt 2010-11-28 14:10:00.369795845 +0100
+@@ -44,6 +44,8 @@
+
+ [source,python]
+ -------------------------------------------------------------------------------
++import sys
++sys.path.append("/usr/share/asciidoc")
+ from asciidocapi import AsciiDocAPI
+ asciidoc = AsciiDocAPI()
+ asciidoc.execute('mydoc.txt')
+@@ -57,6 +59,8 @@
+ [GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)] on linux2
+ Type "help", "copyright", "credits" or "license" for more information.
+ >>> from asciidocapi import AsciiDocAPI
++>>> import sys
++>>> sys.path.append("/usr/share/asciidoc")
+ >>> import StringIO
+ >>> infile = StringIO.StringIO('Hello *{author}*')
+ >>> outfile = StringIO.StringIO()
+
--- asciidoc-8.6.7.orig/debian/patches/code-filter.py-python-path.dpatch
+++ asciidoc-8.6.7/debian/patches/code-filter.py-python-path.dpatch
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## code-filter.py-python-path.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix shebang
+
+@DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/filters/code/code-filter.py asciidoc-8.4.4.new/filters/code/code-filter.py
+--- asciidoc-8.4.4/filters/code/code-filter.py 2008-12-31 02:37:47.000000000 +0100
++++ asciidoc-8.4.4.new/filters/code/code-filter.py 2009-04-26 13:16:23.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ '''
+ NAME
+ code-filter - AsciiDoc filter to highlight language keywords
--- asciidoc-8.6.7.orig/debian/patches/normpath-not-realpath.dpatch
+++ asciidoc-8.6.7/debian/patches/normpath-not-realpath.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## normpath-not-realpath.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes a python bug with normpath
+
+@DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/asciidoc.py asciidoc-8.4.4.new/asciidoc.py
+--- asciidoc-8.4.4/asciidoc.py 2009-04-26 01:03:14.000000000 +0200
++++ asciidoc-8.4.4.new/asciidoc.py 2009-04-26 13:18:43.000000000 +0200
+@@ -195,7 +195,7 @@
+ else:
+ assert os.path.isdir(directory)
+ directory = os.path.realpath(directory)
+- fname = os.path.realpath(fname)
++ fname = os.path.normpath(fname)
+ return os.path.commonprefix((directory, fname)) == directory
+
+ def safe():
--- asciidoc-8.6.7.orig/debian/patches/testasciidoc_path.dpatch
+++ asciidoc-8.6.7/debian/patches/testasciidoc_path.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testasciidoc_path.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Help testasciidoc to find its libs
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-asciidoc~/tests/testasciidoc.py pkg-asciidoc/tests/testasciidoc.py
+--- pkg-asciidoc~/tests/testasciidoc.py 2012-03-18 17:06:06.000000000 +0100
++++ pkg-asciidoc/tests/testasciidoc.py 2012-03-31 09:28:05.753443111 +0200
+@@ -23,6 +23,8 @@
+
+ import os, sys, re, difflib
+
++sys.path.append('/usr/share/asciidoc/')
++
+ if sys.platform[:4] == 'java':
+ # Jython cStringIO is more compatible with CPython StringIO.
+ import cStringIO as StringIO
--- asciidoc-8.6.7.orig/debian/patches/testasciidoc_usage.dpatch
+++ asciidoc-8.6.7/debian/patches/testasciidoc_usage.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testasciidoc_usage.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove .py extension for usage and tell it where the conf is
+
+@DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.5.2.obsolete.0.391026079728366/tests/testasciidoc.py asciidoc-8.5.2.obsolete.0.391026079728366.new/tests/testasciidoc.py
+--- asciidoc-8.5.2.obsolete.0.391026079728366/tests/testasciidoc.py 2010-01-02 11:29:22.000000000 +0100
++++ asciidoc-8.5.2.obsolete.0.391026079728366.new/tests/testasciidoc.py 2010-01-02 11:30:39.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+
+-USAGE = '''Usage: testasciidoc.py [OPTIONS] COMMAND
++USAGE = '''Usage: testasciidoc [OPTIONS] COMMAND
+
+ Run AsciiDoc conformance tests specified in configuration FILE.
+
+@@ -12,7 +12,7 @@
+ Options:
+ -f, --conf-file=CONF_FILE
+ Use configuration file CONF_FILE (default configuration file is
+- testasciidoc.conf in testasciidoc.py directory)
++ /etc/asciidoc/testasciidoc.conf)
+ --force
+ Update all test data overwriting existing data'''
+
+@@ -377,7 +377,7 @@
+ if len(args) == 0:
+ usage()
+ sys.exit(1)
+- conffile = os.path.join(os.path.dirname(sys.argv[0]), 'testasciidoc.conf')
++ conffile = '/etc/asciidoc/testasciidoc.conf'
+ force = False
+ for o,v in opts:
+ if o == '--force':
--- asciidoc-8.6.7.orig/debian/patches/00list
+++ asciidoc-8.6.7/debian/patches/00list
@@ -0,0 +1,7 @@
+code-filter.py-python-path.dpatch
+normpath-not-realpath.dpatch
+testasciidoc_path.dpatch
+testasciidoc_usage.dpatch
+#enhance_asciidoc_manpage.dpatch
+fix_asciidoc_api_doc.dpatch
+fix_vim_target.dpatch
--- asciidoc-8.6.7.orig/debian/patches/enhance_asciidoc_manpage.dpatch
+++ asciidoc-8.6.7/debian/patches/enhance_asciidoc_manpage.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## enhance_asciidoc_manpage.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.4~/doc/asciidoc.1.txt asciidoc-8.6.4/doc/asciidoc.1.txt
+--- asciidoc-8.6.4~/doc/asciidoc.1.txt 2011-02-19 23:55:46.000000000 +0100
++++ asciidoc-8.6.4/doc/asciidoc.1.txt 2011-02-20 09:02:56.803772922 +0100
+@@ -17,6 +17,7 @@
+ -----------
+ The asciidoc(1) command translates the AsciiDoc text file 'FILE' to
+ DocBook or HTML. If 'FILE' is '-' then the standard input is used.
++See also a2x(1) which can convert e.g. to PDF and and manual page formats.
+
+
+ OPTIONS
+@@ -151,6 +152,10 @@
+ See the AsciiDoc distribution BUGS file.
+
+
++SEE ALSO
++--------
++a2x(1)
++
+ AUTHOR
+ ------
+ AsciiDoc was originally written by Stuart Rackham. Many people have
--- asciidoc-8.6.7.orig/debian/patches/fix_vim_target.dpatch
+++ asciidoc-8.6.7/debian/patches/fix_vim_target.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_vim_target.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: We use the vim addonmanager to install vim stuff
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.3~/Makefile.in asciidoc-8.6.3/Makefile.in
+--- asciidoc-8.6.3~/Makefile.in 2010-11-12 20:41:14.000000000 +0100
++++ asciidoc-8.6.3/Makefile.in 2010-11-28 11:38:06.705796088 +0100
+@@ -158,9 +158,9 @@
+ build: fixconfpath $(manp)
+
+
+-install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
++install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
+
+-uninstall: uninstall-vim
++uninstall:
+ rm -f $(DESTDIR)/$(progdir)/asciidoc
+ rm -f $(DESTDIR)/$(progdir)/asciidoc.py
+ rm -f $(DESTDIR)/$(progdir)/a2x