Package: asciidoc
Version: 8.4.4-1
Severity: normal
Hi,
today Peter Hutterer merged XInput2 [1] into upstream xorg/xserver.
Amongst others a newer libXi (from upstream) is required,
unfortunately the build fails with asciidoc-8.4.4.
>From the libXi config.log:
[...]
configure:11572: result: /usr/bin/asciidoc
configure:11598: WARNING:
*********************************************************
xmlto and asciidoc found. I will be building man
pages. Your asciidoc may not support multiple docbook
targets and building the man pages may fail. See
http://hg.sharesource.org/asciidoc/raw-rev/fc5a653a30a3
*********************************************************
[...]
[1] asciidoc v8.4.5 supports multiple docbook targets
Web-Link [2] says:
[...]
FIXED: Multiple manpage names are now handled correctly when
generating DocBook output, each name now generates a separate DocBook
<refname> element. See
http://groups.google.com/group/asciidoc/browse_thread/thread/c93bb4db025225d8
[...]
Cloning from asciidoc mercurial-repository...
$ hg clone http://hg.sharesource.org/asciidoc
...solved the problem.
Tested & debianized hg-rev:
<http://hg.sharesource.org/asciidoc/rev/cbfb5fb8d05f>
Please, update to new v8.4.5+.
[2] Switch to quilt
My second request is switch to quilt package-management tool!
[3] Add Vcs-Fields in debian/control:
Vcs-Browser: http://hg.sharesource.org/asciidoc/summary
Vcs-Hg: http://hg.sharesource.org/asciidoc
Not sure if there exists "Vcs-Hg" - like Vcs-Git or Vcs-Svn are more
common to me.
[4] Refreshed Patches
I did attach refreshed patches for:
1. a2x-fop-name-fix.patch
2. code-filter.py-python-path.patch
3. normpath-not-realpath.patch
Enjoy!
Kind Regards,
Sedat
Web-Links:
[1] http://who-t.blogspot.com/2009/05/xi2-merge-coming-up.html
[2] http://hg.sharesource.org/asciidoc/raw-rev/fc5a653a30a3
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.30-rc8-iniza-3 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
(ignored: LC_ALL set to de_DE.UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages asciidoc depends on:
ii python 2.5.4-2 An interactive high-level object-o
Versions of packages asciidoc recommends:
pn dblatex <none> (no description available)
ii docbook-utils 0.6.14-1.1 Convert Docbook files to other for
pn source-highlight <none> (no description available)
pn vim-addon-manager <none> (no description available)
ii xmlto 0.0.22-1 XML-to-any converter
asciidoc suggests no packages.
-- no debconf information
Index: asciidoc/a2x
===================================================================
--- asciidoc.orig/a2x
+++ asciidoc/a2x
@@ -16,7 +16,7 @@
REALNAME="$(readlink -f "$REALNAME")"
CONF_DIR=/etc/asciidoc
# FOP executable is named fop on some systems.
-FOP_COMMAND="fop.sh"
+FOP_COMMAND="fop"
if ! which "$FOP_COMMAND" >/dev/null 2>&1; then
FOP_COMMAND="fop"
fi
Index: asciidoc/filters/code/code-filter.py
===================================================================
--- asciidoc.orig/filters/code/code-filter.py
+++ asciidoc/filters/code/code-filter.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
'''
NAME
code-filter - AsciiDoc filter to highlight language keywords
Index: asciidoc/asciidoc.py
===================================================================
--- asciidoc.orig/asciidoc.py
+++ asciidoc/asciidoc.py
@@ -202,7 +202,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():
