--- asciidoc-8.2.6.orig/debian/copyright +++ asciidoc-8.2.6/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Fredrik Steen 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 + +Upstream Author: Stuart Rackham + +License: + +Copyright: GPL (see /usr/share/common-licenses/GPL) --- asciidoc-8.2.6.orig/debian/docs +++ asciidoc-8.2.6/debian/docs @@ -0,0 +1,2 @@ +README +doc/* --- asciidoc-8.2.6.orig/debian/changelog +++ asciidoc-8.2.6/debian/changelog @@ -0,0 +1,162 @@ +asciidoc (8.2.6-1.1) unstable; urgency=low + + * Non-maintainer upload + * Fixed normalisation of paths for include safety check (Closes: #487962) + + -- Ben Hutchings Sat, 28 Jun 2008 17:00:52 +0100 + +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 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 Sat, 26 Jan 2008 22:30:42 +0100 + +asciidoc (8.2.3-1) unstable; urgency=low + + * New upstream version + + -- Alexander Wirt 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 Tue, 24 Jul 2007 21:29:18 +0200 + +asciidoc (8.2.1-2) unstable; urgency=low + + * Upload to unstable + + -- Alexander Wirt 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 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 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 Mon, 12 Mar 2007 22:05:09 +0100 + +asciidoc (7.1.2-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Steen Fri, 24 Mar 2006 15:14:04 +0100 + +asciidoc (7.1.0-1) unstable; urgency=low + + * New major upstream release + + -- Fredrik 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 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 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 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 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 Thu, 21 Jul 2005 09:34:51 +0200 + +asciidoc (7.0.0-1) unstable; urgency=low + + * New major upstream release Closes:#312725 + + -- Fredrik Steen Wed, 8 Jun 2005 10:30:51 +0200 + +asciidoc (6.0.3-1) unstable; urgency=low + + * New upstream release + + -- Fredrik Steen 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 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 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 Thu, 10 Mar 2005 10:44:56 +0100 + +asciidoc (6.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Fredrik Steen Mon, 28 Feb 2005 15:02:05 +0100 + --- asciidoc-8.2.6.orig/debian/asciidoc.dirs +++ asciidoc-8.2.6/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.2.6.orig/debian/compat +++ asciidoc-8.2.6/debian/compat @@ -0,0 +1 @@ +4 --- asciidoc-8.2.6.orig/debian/watch +++ asciidoc-8.2.6/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.2.6.orig/debian/dirs +++ asciidoc-8.2.6/debian/dirs @@ -0,0 +1,2 @@ +usr/share/vim/addons/syntax +usr/share/vim/addons/ftplugin --- asciidoc-8.2.6.orig/debian/asciidoc.yaml +++ asciidoc-8.2.6/debian/asciidoc.yaml @@ -0,0 +1,5 @@ +addon: asciidoc +description: allow syntax highlighting and autodetection for asciidoc files +files: + - syntax/asciidoc.vim + - ftplugin/asciidoc_filetype.vim --- asciidoc-8.2.6.orig/debian/rules +++ asciidoc-8.2.6/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Written by Fredrik K. Steen tis 2005-03-01 08:18:22 + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +build/asciidoc:: + ./asciidoc.py -e -f asciidoc.conf -f docbook.conf -d manpage -b docbook -o debian/asciidoc.1.xml doc/asciidoc.1.txt + /usr/bin/xmlto -o debian/ man debian/asciidoc.1.xml + ./asciidoc.py -e -f asciidoc.conf -f docbook.conf -d manpage -b docbook -o debian/a2x.1.xml doc/a2x.1.txt + /usr/bin/xmlto -o debian/ man debian/a2x.1.xml + +cleanbuilddir/asciidoc:: + rm -f debian/asciidoc.1.xml + rm -f debian/asciidoc.1 + rm -f debian/a2x.1.xml + rm -f debian/a2x.1 + +binary-post-install/asciidoc:: + install -m0755 asciidoc.py debian/asciidoc/usr/bin/asciidoc + install -m0755 a2x debian/asciidoc/usr/bin/a2x + install -m0755 CHANGELOG debian/asciidoc/usr/share/doc/asciidoc/changelog + gzip -9 debian/asciidoc/usr/share/doc/asciidoc/changelog --- asciidoc-8.2.6.orig/debian/asciidoc.install +++ asciidoc-8.2.6/debian/asciidoc.install @@ -0,0 +1,48 @@ +*.conf /etc/asciidoc/ + +debian/asciidoc.yaml /usr/share/vim/registry +stylesheets /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 + +vim/ftdetect/asciidoc_filetype.vim /usr/share/vim/addons/ftplugin/ +vim/syntax/asciidoc.vim /usr/share/vim/addons/syntax/ + +examples/website/a2x.1.html /usr/share/doc/asciidoc/examples/website +examples/website/asciimath.html /usr/share/doc/asciidoc/examples/website +examples/website/build-website.sh /usr/share/doc/asciidoc/examples/website +examples/website/CHANGELOG.html /usr/share/doc/asciidoc/examples/website +examples/website/downloads.html /usr/share/doc/asciidoc/examples/website +examples/website/downloads.txt /usr/share/doc/asciidoc/examples/website +examples/website/index.html /usr/share/doc/asciidoc/examples/website +examples/website/index.txt /usr/share/doc/asciidoc/examples/website +examples/website/layout1.conf /usr/share/doc/asciidoc/examples/website +examples/website/layout1.css /usr/share/doc/asciidoc/examples/website +examples/website/layout2.conf /usr/share/doc/asciidoc/examples/website +examples/website/layout2.css /usr/share/doc/asciidoc/examples/website +examples/website/manpage.html /usr/share/doc/asciidoc/examples/website +examples/website/README.html /usr/share/doc/asciidoc/examples/website +examples/website/README-website.html /usr/share/doc/asciidoc/examples/website +examples/website/README-website.txt /usr/share/doc/asciidoc/examples/website +examples/website/source-highlight-filter.html /usr/share/doc/asciidoc/examples/website +examples/website/support.html /usr/share/doc/asciidoc/examples/website +examples/website/support.txt /usr/share/doc/asciidoc/examples/website +examples/website/userguide.html /usr/share/doc/asciidoc/examples/website + + + + +examples/website/build-website.sh /usr/share/doc/asciidoc/examples/website +examples/website/downloads.html /usr/share/doc/asciidoc/examples/website +examples/website/downloads.txt /usr/share/doc/asciidoc/examples/website +examples/website/index.html /usr/share/doc/asciidoc/examples/website +examples/website/index.txt /usr/share/doc/asciidoc/examples/website +examples/website/manpage.html /usr/share/doc/asciidoc/examples/website +examples/website/userguide.html /usr/share/doc/asciidoc/examples/website + --- asciidoc-8.2.6.orig/debian/asciidoc.links +++ asciidoc-8.2.6/debian/asciidoc.links @@ -0,0 +1,14 @@ +usr/share/asciidoc/images usr/share/doc/asciidoc/images +/etc/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/asciidoc/docbook-xsl.css +etc/asciidoc/stylesheets usr/share/asciidoc/stylesheets +usr/share/doc/asciidoc/changelog.gz usr/share/doc/asciidoc/examples/website/CHANGELOG.txt.gz +usr/share/doc/asciidoc/README usr/share/doc/asciidoc/examples/website/README.txt +usr/share/doc/asciidoc/customers.csv usr/share/doc/asciidoc/examples/website/customers.csv +usr/share/doc/asciidoc/asciidoc.1.txt usr/share/doc/asciidoc/examples/website/manpage.txt +usr/share/doc/asciidoc/asciidoc.txt.gz usr/share/doc/asciidoc/examples/website/asciidoc.txt.gz +etc/asciidoc/stylesheets/xhtml11-manpage.css usr/share/doc/asciidoc/examples/website/xhtml11-manpage.css +etc/asciidoc/stylesheets/xhtml11-quirks.css usr/share/doc/asciidoc/examples/website/xhtml11-quirks.css +etc/asciidoc/stylesheets/xhtml11.css usr/share/doc/asciidoc/examples/website/xhtml11.css +usr/share/doc/asciidoc/asciimath.txt usr/share/doc/asciidoc/examples/website/asciimath.txt +usr/share/doc/asciidoc/asciimath.html usr/share/doc/asciidoc/examples/website/asciimath.html +usr/share/asciidoc/javascripts /etc/asciidoc/javascripts --- asciidoc-8.2.6.orig/debian/asciidoc.manpages +++ asciidoc-8.2.6/debian/asciidoc.manpages @@ -0,0 +1,2 @@ +debian/asciidoc.1 +debian/a2x.1 --- asciidoc-8.2.6.orig/debian/control +++ asciidoc-8.2.6/debian/control @@ -0,0 +1,24 @@ +Source: asciidoc +Section: text +Priority: optional +Maintainer: Fredrik Steen +Uploaders: Alexander Wirt +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0) +Build-Depends-Indep: patchutils (>= 0.2.25), xmlto, python (>= 2.3) +Standards-Version: 3.8.0 + +Package: asciidoc +Architecture: all +Depends: python (>= 2.3) +Recommends: docbook-utils, xmlto, fop, source-highlight, vim-addon-manager +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.2.6.orig/debian/README.Debian +++ asciidoc-8.2.6/debian/README.Debian @@ -0,0 +1,18 @@ +asciidoc for Debian +------------------- + +- To enable syntax highlighting for asciidoc just execute 'vim-addons install asciidoc' + +- 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). + +- To get odt (Openoffice.org) support you need to install the docbook2odf + package which it not yet in debian. + See http://open.comsultia.com/docbook2odf/download for debian packages + + -- Alexander Wirt Tue, Jul 25 2007 09:29:17 +0200 --- asciidoc-8.2.6.orig/debian/semantic.cache +++ asciidoc-8.2.6/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.2.6.orig/debian/patches/normpath-not-realpath.patch +++ asciidoc-8.2.6/debian/patches/normpath-not-realpath.patch @@ -0,0 +1,11 @@ +--- a/asciidoc.py ++++ b/asciidoc.py +@@ -125,7 +125,7 @@ + else: + assert os.path.isdir(directory) + directory = os.path.abspath(directory) +- fname = os.path.realpath(fname) ++ fname = os.path.normpath(fname) + return os.path.commonprefix((directory, fname)) == directory + + def safe(): --- asciidoc-8.2.6.orig/debian/patches/code-filter.py-python-path.patch +++ asciidoc-8.2.6/debian/patches/code-filter.py-python-path.patch @@ -0,0 +1,8 @@ +--- filters/code-filter.py 2005-01-24 02:26:50.000000000 +0100 ++++ filters/code-filter.py.stone 2005-03-30 08:03:34.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + ''' + code-filter - AsciiDoc filter to highlight language keywords + --- asciidoc-8.2.6.orig/debian/patches/a2x-fop-name-fix.patch +++ asciidoc-8.2.6/debian/patches/a2x-fop-name-fix.patch @@ -0,0 +1,20 @@ +--- a2x 2006-08-22 00:35:47.000000000 +0200 ++++ a2x.stone 2007-02-19 14:18:08.000000000 +0100 +@@ -480,7 +480,7 @@ function to_manpage() + function to_pdf() + { + require "xsltproc" +- require "fop.sh" ++ require "fop" + local xsl xml fo pdf + xsl=$(conf_file docbook-xsl/fo.xsl) + if [ ! -r "$xsl" ]; then +@@ -492,7 +492,7 @@ function to_pdf() + to_docbook + execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \ + \"$xsl\" \"$xml\" >\"$fo\"" +- execute_command_2 "fop.sh \"$fo\" \"$pdf\"" ++ execute_command_2 "fop \"$fo\" \"$pdf\"" + } + + function to_odt() --- asciidoc-8.2.6.orig/debian/patches/a2x-fix-fop-0.95.patch +++ asciidoc-8.2.6/debian/patches/a2x-fix-fop-0.95.patch @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Stuart Rackham +# Date 1211341824 -43200 +# Node ID e1bc93fef5234835ffa0150578c59e9053dcb17c +# Parent 6668cc811844dfb4c4b1b9b77611bf02887a20d1 +Added Mikhail Yakshin's FOP 0.95 patch which fixes a long-standing fo.xsl problem and allows PDF's to be generated with FOP 0.95 (previously had to use FOP 0.20.5). + +--- a/docbook-xsl/common.xsl Sat May 17 15:14:26 2008 +1200 ++++ b/docbook-xsl/common.xsl Wed May 21 15:50:24 2008 +1200 +@@ -18,7 +18,7 @@ + + + 0 +- #E0E0E0 ++ #E0E0E0 + + + +--- a/docbook-xsl/fo.xsl Sat May 17 15:14:26 2008 +1200 ++++ b/docbook-xsl/fo.xsl Wed May 21 15:50:24 2008 +1200 +@@ -14,7 +14,7 @@ + + + +- ++ + + + +